5027 files changed, 40061 insertions, 18108 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index b616e2327b..f53995732f 100644..100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -12,6 +12,9 @@
 	 name="EmphasisColor_35"
 	 value="0.38 0.694 0.573 0.35" />
 	<color
+	 name="BeaconColor"
+    value="0.749 0.298 0 1" />	 
+	<color
 	 name="White"
 	 value="1 1 1 1" />
 	<color
@@ -98,6 +101,27 @@
 	<color
 	name="MdBlue"
 	value=".07 .38 .51 1" />
+  <color
+      name="DkBlue"
+      value=".06 .06 .3 1" />
+  <color
+      name="LtRed"
+      value="1 0.2 0.2 1" />
+  <color
+      name="LtGreen"
+      value="0.2 1 0.2 1" />
+  <color
+      name="Red_80"
+      value="1 0 0 0.8" />
+  <color
+      name="DkRed"
+      value="0.3 0.06 0.06 1" />
+  <color
+      name="Green_80"
+      value="0 1 0 0.8" />
+  <color
+      name="Blue_80"
+      value="0 0 1 0.8" />
 
   <!-- This color name makes potentially unused colors show up bright purple.
   Leave this here until all Unused? are removed below, otherwise
@@ -508,6 +532,9 @@
      name="MenuItemHighlightBgColor"
      reference="EmphasisColor_35" />
     <color
+     name="MenuItemFlashBgColor"
+     reference="BeaconColor" />
+    <color
      name="MenuItemHighlightFgColor"
      reference="White" />
     <color
@@ -621,6 +648,36 @@
      name="ParcelHoverColor"
      reference="White" />
     <color
+      name="PathfindingErrorColor"
+      reference="LtRed" />
+  <color
+      name="PathfindingWarningColor"
+      reference="DrYellow" />
+  <color
+      name="PathfindingGoodColor"
+      reference="LtGreen" />
+  <color
+      name="MaterialErrorColor"
+      reference="LtRed" />
+  <color
+      name="MaterialWarningColor"
+      reference="DrYellow" />
+  <color
+      name="MaterialGoodColor"
+      reference="LtGreen" />
+  <color
+      name="PathfindingDefaultBeaconColor"
+      reference="Red_80" />
+  <color
+      name="PathfindingDefaultBeaconTextColor"
+      reference="White" />
+  <color
+      name="PathfindingLinksetBeaconColor"
+      reference="Blue_80" />
+  <color
+      name="PathfindingCharacterBeaconColor"
+      reference="Red_80" />
+  <color
      name="PieMenuBgColor"
      value="0.24 0.24 0.24 0.59" />
     <color
@@ -766,7 +823,7 @@
      reference="LtGray" />
     <color
      name="UserChatColor"
-     reference="White" />
+     reference="Yellow" />
     <color
      name="llOwnerSayChatColor"
      reference="LtYellow" />
@@ -788,9 +845,14 @@
      name="ChatTimestampColor"
      reference="White" />
     <color
+      name="MenuBarBetaBgColor"
+      reference="DkBlue" />
+  <color
      name="MenuBarProjectBgColor"
      reference="MdBlue" />
-  
+  <color
+      name="MenuBarTestBgColor"
+      reference="DkRed" />
     <color
       name="MeshImportTableNormalColor"
       value="1 1 1 1"/>
@@ -822,4 +884,19 @@
   <color
     name="blue"
     value="0 0 1 1"/>
+
+  <!--Resize bar colors -->
+
+  <color
+    name="ResizebarBorderLight"
+    value="0.231 0.231 0.231 1"/>
+
+  <color
+    name="ResizebarBorderDark"
+    value="0.133 0.133 0.133 1"/>
+
+  <color
+    name="ResizebarBody"
+    value="0.208 0.208 0.208 1"/>
+    
 </colors>
diff --git a/indra/newview/skins/default/html/btn_purplepill_bg.png b/indra/newview/skins/default/html/btn_purplepill_bg.png
index b78127ae30..b78127ae30 100644..100755
--- a/indra/newview/skins/default/html/btn_purplepill_bg.png
+++ b/indra/newview/skins/default/html/btn_purplepill_bg.png
diff --git a/indra/newview/skins/default/html/da/loading/loading.html b/indra/newview/skins/default/html/da/loading/loading.html
index 5f3426eb60..5f3426eb60 100644..100755
--- a/indra/newview/skins/default/html/da/loading/loading.html
+++ b/indra/newview/skins/default/html/da/loading/loading.html
diff --git a/indra/newview/skins/default/html/de/loading-error/index.html b/indra/newview/skins/default/html/de/loading-error/index.html
index fbde825b4a..fbde825b4a 100644..100755
--- a/indra/newview/skins/default/html/de/loading-error/index.html
+++ b/indra/newview/skins/default/html/de/loading-error/index.html
diff --git a/indra/newview/skins/default/html/de/loading/loading.html b/indra/newview/skins/default/html/de/loading/loading.html
index 44a621b216..44a621b216 100644..100755
--- a/indra/newview/skins/default/html/de/loading/loading.html
+++ b/indra/newview/skins/default/html/de/loading/loading.html
diff --git a/indra/newview/skins/default/html/en-us/help-offline/index.html b/indra/newview/skins/default/html/en-us/help-offline/index.html
index bf3677603e..bf3677603e 100644..100755
--- a/indra/newview/skins/default/html/en-us/help-offline/index.html
+++ b/indra/newview/skins/default/html/en-us/help-offline/index.html
diff --git a/indra/newview/skins/default/html/en-us/loading-error/index.html b/indra/newview/skins/default/html/en-us/loading-error/index.html
index 71f9c86f76..71f9c86f76 100644..100755
--- a/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/indra/newview/skins/default/html/en-us/loading-error/index.html
diff --git a/indra/newview/skins/default/html/en-us/loading/loading.html b/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f73e..1c62d2f73e 100644..100755
--- a/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/indra/newview/skins/default/html/en-us/loading/loading.html
diff --git a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
index e3ccc7c769..e3ccc7c769 100644..100755
--- a/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
+++ b/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
diff --git a/indra/newview/skins/default/html/es/loading-error/index.html b/indra/newview/skins/default/html/es/loading-error/index.html
index c1e75bc475..c1e75bc475 100644..100755
--- a/indra/newview/skins/default/html/es/loading-error/index.html
+++ b/indra/newview/skins/default/html/es/loading-error/index.html
diff --git a/indra/newview/skins/default/html/es/loading/loading.html b/indra/newview/skins/default/html/es/loading/loading.html
index c4260b34c0..c4260b34c0 100644..100755
--- a/indra/newview/skins/default/html/es/loading/loading.html
+++ b/indra/newview/skins/default/html/es/loading/loading.html
diff --git a/indra/newview/skins/default/html/fr/loading-error/index.html b/indra/newview/skins/default/html/fr/loading-error/index.html
index 69c796cb55..69c796cb55 100644..100755
--- a/indra/newview/skins/default/html/fr/loading-error/index.html
+++ b/indra/newview/skins/default/html/fr/loading-error/index.html
diff --git a/indra/newview/skins/default/html/fr/loading/loading.html b/indra/newview/skins/default/html/fr/loading/loading.html
index b3953448e9..b3953448e9 100644..100755
--- a/indra/newview/skins/default/html/fr/loading/loading.html
+++ b/indra/newview/skins/default/html/fr/loading/loading.html
diff --git a/indra/newview/skins/default/html/hu/loading/loading.html b/indra/newview/skins/default/html/hu/loading/loading.html
index ab15a073ba..ab15a073ba 100644..100755
--- a/indra/newview/skins/default/html/hu/loading/loading.html
+++ b/indra/newview/skins/default/html/hu/loading/loading.html
diff --git a/indra/newview/skins/default/html/it/loading/loading.html b/indra/newview/skins/default/html/it/loading/loading.html
index ab37e41f04..ab37e41f04 100644..100755
--- a/indra/newview/skins/default/html/it/loading/loading.html
+++ b/indra/newview/skins/default/html/it/loading/loading.html
diff --git a/indra/newview/skins/default/html/ja/loading-error/index.html b/indra/newview/skins/default/html/ja/loading-error/index.html
index d969c03098..d969c03098 100644..100755
--- a/indra/newview/skins/default/html/ja/loading-error/index.html
+++ b/indra/newview/skins/default/html/ja/loading-error/index.html
diff --git a/indra/newview/skins/default/html/ja/loading/loading.html b/indra/newview/skins/default/html/ja/loading/loading.html
index 35cf74a35f..35cf74a35f 100644..100755
--- a/indra/newview/skins/default/html/ja/loading/loading.html
+++ b/indra/newview/skins/default/html/ja/loading/loading.html
diff --git a/indra/newview/skins/default/html/ko/loading-error/index.html b/indra/newview/skins/default/html/ko/loading-error/index.html
index 02b87132b9..02b87132b9 100644..100755
--- a/indra/newview/skins/default/html/ko/loading-error/index.html
+++ b/indra/newview/skins/default/html/ko/loading-error/index.html
diff --git a/indra/newview/skins/default/html/nl/loading/loading.html b/indra/newview/skins/default/html/nl/loading/loading.html
index 0215bd7e47..0215bd7e47 100644..100755
--- a/indra/newview/skins/default/html/nl/loading/loading.html
+++ b/indra/newview/skins/default/html/nl/loading/loading.html
diff --git a/indra/newview/skins/default/html/pl/loading/loading.html b/indra/newview/skins/default/html/pl/loading/loading.html
index 50f3dfb0c5..50f3dfb0c5 100644..100755
--- a/indra/newview/skins/default/html/pl/loading/loading.html
+++ b/indra/newview/skins/default/html/pl/loading/loading.html
diff --git a/indra/newview/skins/default/html/pt/loading-error/index.html b/indra/newview/skins/default/html/pt/loading-error/index.html
index 7f17b3a7bf..7f17b3a7bf 100644..100755
--- a/indra/newview/skins/default/html/pt/loading-error/index.html
+++ b/indra/newview/skins/default/html/pt/loading-error/index.html
diff --git a/indra/newview/skins/default/html/pt/loading/loading.html b/indra/newview/skins/default/html/pt/loading/loading.html
index a83e1123d0..a83e1123d0 100644..100755
--- a/indra/newview/skins/default/html/pt/loading/loading.html
+++ b/indra/newview/skins/default/html/pt/loading/loading.html
diff --git a/indra/newview/skins/default/html/ru/loading/loading.html b/indra/newview/skins/default/html/ru/loading/loading.html
index 892c0b9f7f..892c0b9f7f 100644..100755
--- a/indra/newview/skins/default/html/ru/loading/loading.html
+++ b/indra/newview/skins/default/html/ru/loading/loading.html
diff --git a/indra/newview/skins/default/html/tr/loading/loading.html b/indra/newview/skins/default/html/tr/loading/loading.html
index 1ac07bff34..1ac07bff34 100644..100755
--- a/indra/newview/skins/default/html/tr/loading/loading.html
+++ b/indra/newview/skins/default/html/tr/loading/loading.html
diff --git a/indra/newview/skins/default/html/uk/loading/loading.html b/indra/newview/skins/default/html/uk/loading/loading.html
index 3b5b8679b4..3b5b8679b4 100644..100755
--- a/indra/newview/skins/default/html/uk/loading/loading.html
+++ b/indra/newview/skins/default/html/uk/loading/loading.html
diff --git a/indra/newview/skins/default/html/unabletoconnect.png b/indra/newview/skins/default/html/unabletoconnect.png
index 1383516509..1383516509 100644..100755
--- a/indra/newview/skins/default/html/unabletoconnect.png
+++ b/indra/newview/skins/default/html/unabletoconnect.png
diff --git a/indra/newview/skins/default/html/zh/loading-error/index.html b/indra/newview/skins/default/html/zh/loading-error/index.html
index 97201318ff..97201318ff 100644..100755
--- a/indra/newview/skins/default/html/zh/loading-error/index.html
+++ b/indra/newview/skins/default/html/zh/loading-error/index.html
diff --git a/indra/newview/skins/default/html/zh/loading/loading.html b/indra/newview/skins/default/html/zh/loading/loading.html
index d1d5d25c92..d1d5d25c92 100644..100755
--- a/indra/newview/skins/default/html/zh/loading/loading.html
+++ b/indra/newview/skins/default/html/zh/loading/loading.html
diff --git a/indra/newview/skins/default/textures/Blank.png b/indra/newview/skins/default/textures/Blank.png
index f38e9f9100..f38e9f9100 100644..100755
--- a/indra/newview/skins/default/textures/Blank.png
+++ b/indra/newview/skins/default/textures/Blank.png
diff --git a/indra/newview/skins/default/textures/Rounded_Rect.png b/indra/newview/skins/default/textures/Rounded_Rect.png
index c270c28039..c270c28039 100644..100755
--- a/indra/newview/skins/default/textures/Rounded_Rect.png
+++ b/indra/newview/skins/default/textures/Rounded_Rect.png
diff --git a/indra/newview/skins/default/textures/alpha_gradient.tga b/indra/newview/skins/default/textures/alpha_gradient.tga
index 6fdba25d4e..6fdba25d4e 100644..100755
--- a/indra/newview/skins/default/textures/alpha_gradient.tga
+++ b/indra/newview/skins/default/textures/alpha_gradient.tga
diff --git a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
index 5de5a80a65..5de5a80a65 100644..100755
--- a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
+++ b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
diff --git a/indra/newview/skins/default/textures/arrow_down.tga b/indra/newview/skins/default/textures/arrow_down.tga
index 81dc9d3b6c..81dc9d3b6c 100644..100755
--- a/indra/newview/skins/default/textures/arrow_down.tga
+++ b/indra/newview/skins/default/textures/arrow_down.tga
diff --git a/indra/newview/skins/default/textures/arrow_up.tga b/indra/newview/skins/default/textures/arrow_up.tga
index 22195cf7fb..22195cf7fb 100644..100755
--- a/indra/newview/skins/default/textures/arrow_up.tga
+++ b/indra/newview/skins/default/textures/arrow_up.tga
diff --git a/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png
index 84cc2159c1..84cc2159c1 100644..100755
--- a/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png
+++ b/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.png
diff --git a/indra/newview/skins/default/textures/badge_note.j2c b/indra/newview/skins/default/textures/badge_note.j2c
index 1ab5233faf..1ab5233faf 100644..100755
--- a/indra/newview/skins/default/textures/badge_note.j2c
+++ b/indra/newview/skins/default/textures/badge_note.j2c
diff --git a/indra/newview/skins/default/textures/badge_ok.j2c b/indra/newview/skins/default/textures/badge_ok.j2c
index f85b880f1d..f85b880f1d 100644..100755
--- a/indra/newview/skins/default/textures/badge_ok.j2c
+++ b/indra/newview/skins/default/textures/badge_ok.j2c
diff --git a/indra/newview/skins/default/textures/badge_warn.j2c b/indra/newview/skins/default/textures/badge_warn.j2c
index 26437ca426..26437ca426 100644..100755
--- a/indra/newview/skins/default/textures/badge_warn.j2c
+++ b/indra/newview/skins/default/textures/badge_warn.j2c
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png
index 6b725e153a..6b725e153a 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Avatar_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png
index 9f22080d13..9f22080d13 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_FreeCam_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png
index 5b2a8eb339..5b2a8eb339 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Orbit_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png
index 9acf7053d5..9acf7053d5 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Pan_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png
index 00158a7bc2..00158a7bc2 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png
index 3748f5e190..3748f5e190 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Back_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png
index 2b50986780..2b50986780 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Eye_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png
index c49b8f9a27..c49b8f9a27 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png
index bc8c4db04d..bc8c4db04d 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Front_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png
index b919a0a152..b919a0a152 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png
index de9da359a0..de9da359a0 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Preset_Side_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
index c8560c0869..c8560c0869 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png
index b09f7c64d3..b09f7c64d3 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
index ae2c57c207..ae2c57c207 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png
index c5cd8cca92..c5cd8cca92 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png
+++ b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png
diff --git a/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png
index 8b58db0cba..8b58db0cba 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png
+++ b/indra/newview/skins/default/textures/bottomtray/ChatBarHandle.png
diff --git a/indra/newview/skins/default/textures/bottomtray/DownArrow.png b/indra/newview/skins/default/textures/bottomtray/DownArrow.png
index 82f58b22b9..82f58b22b9 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/DownArrow.png
+++ b/indra/newview/skins/default/textures/bottomtray/DownArrow.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png
index 8d32cad95f..8d32cad95f 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png
index 4c98e35868..4c98e35868 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Mouselook_View_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png
index 9e7291d6fb..9e7291d6fb 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png
index e2eb38e12d..e2eb38e12d 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Move_Run_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png
index f314d4e001..f314d4e001 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Move_Walk_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png
index 4dddc2b391..4dddc2b391 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
index 9f31d461b5..9f31d461b5 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png
index 2893c9a9f1..2893c9a9f1 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Down_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
index f7ed4c25fb..f7ed4c25fb 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png
index 80d227b6a7..80d227b6a7 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
index d0a825a682..d0a825a682 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png
index 3602efa9d9..3602efa9d9 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Left_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
index 2f81fb1588..2f81fb1588 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png
index 9c3fc37dfe..9c3fc37dfe 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Right_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
index 4f86e81a15..4f86e81a15 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png
index 282e8d62de..282e8d62de 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
index b211371e64..b211371e64 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png
index 5039e57c32..5039e57c32 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
index e937c3f012..e937c3f012 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png
index a49c43c2cf..a49c43c2cf 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Up_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
index ed4902f3ee..ed4902f3ee 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
index 0ac5b72b8f..0ac5b72b8f 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
+++ b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png
index e9dea7e17e..e9dea7e17e 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Object_View_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png
index 7a348ba22e..7a348ba22e 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Object_View_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/Object_View_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png
index 53efa3a9a9..53efa3a9a9 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/PanOrbit_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png b/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png
index d7ec04237b..d7ec04237b 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/Snapshot_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
index e8fe243dc7..e8fe243dc7 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
+++ b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
deleted file mode 100644
index 5c0c85b864..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
index cd18ae310d..cd18ae310d 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png
deleted file mode 100644
index 857fa1e047..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
index b0ed6ee8eb..b0ed6ee8eb 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png
deleted file mode 100644
index 453bb53673..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png
index 14ec77b99a..14ec77b99a 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png
deleted file mode 100644
index 135a66ca0d..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png
index 48be51e9af..48be51e9af 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png
deleted file mode 100644
index a63aec5e6d..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
index be4881b64c..be4881b64c 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
+++ b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png
diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png
deleted file mode 100644
index 1719eb3e84..0000000000
--- a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.png
+++ /dev/null
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index 6cb33efb93..6cb33efb93 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 6cb33efb93..6cb33efb93 100644..100755
--- a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
+++ b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Cone.png b/indra/newview/skins/default/textures/build/Object_Cone.png
index 5167f1a820..5167f1a820 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Cone.png
+++ b/indra/newview/skins/default/textures/build/Object_Cone.png
diff --git a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
index d50dc69ffe..d50dc69ffe 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Cone_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Cube.png b/indra/newview/skins/default/textures/build/Object_Cube.png
index e82af1ca82..e82af1ca82 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Cube.png
+++ b/indra/newview/skins/default/textures/build/Object_Cube.png
diff --git a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
index 3d6964530d..3d6964530d 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Cube_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Cylinder.png
index fe1041d4c7..fe1041d4c7 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Cylinder.png
+++ b/indra/newview/skins/default/textures/build/Object_Cylinder.png
diff --git a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
index 3ed0389961..3ed0389961 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Cylinder_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Grass.png b/indra/newview/skins/default/textures/build/Object_Grass.png
index a88efd5f3e..a88efd5f3e 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Grass.png
+++ b/indra/newview/skins/default/textures/build/Object_Grass.png
diff --git a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
index 3ebd5ea7a1..3ebd5ea7a1 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Grass_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png
index 595f64d480..595f64d480 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cone.png
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
index 3bdc4d1fd5..3bdc4d1fd5 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cone_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png
index dd41d56fb3..dd41d56fb3 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder.png
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
index 0912442e29..0912442e29 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Cylinder_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png
index 1489630624..1489630624 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere.png
diff --git a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
index 33db4a2de8..33db4a2de8 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Hemi_Sphere_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Prism.png b/indra/newview/skins/default/textures/build/Object_Prism.png
index 51c6c161a0..51c6c161a0 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Prism.png
+++ b/indra/newview/skins/default/textures/build/Object_Prism.png
diff --git a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
index 9e80fe2b84..9e80fe2b84 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Prism_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid.png b/indra/newview/skins/default/textures/build/Object_Pyramid.png
index a147b59553..a147b59553 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Pyramid.png
+++ b/indra/newview/skins/default/textures/build/Object_Pyramid.png
diff --git a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
index d36bfa55d4..d36bfa55d4 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Pyramid_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Ring.png b/indra/newview/skins/default/textures/build/Object_Ring.png
index a9790fd60c..a9790fd60c 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Ring.png
+++ b/indra/newview/skins/default/textures/build/Object_Ring.png
diff --git a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
index 962f6efb93..962f6efb93 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Ring_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Sphere.png b/indra/newview/skins/default/textures/build/Object_Sphere.png
index 8e2dd92a82..8e2dd92a82 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Sphere.png
+++ b/indra/newview/skins/default/textures/build/Object_Sphere.png
diff --git a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
index 715d597144..715d597144 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Sphere_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png
index 23e22b1796..23e22b1796 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Tetrahedron.png
+++ b/indra/newview/skins/default/textures/build/Object_Tetrahedron.png
diff --git a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
index b2ea680f23..b2ea680f23 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Tetrahedron_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Torus.png b/indra/newview/skins/default/textures/build/Object_Torus.png
index 15c62423a9..15c62423a9 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Torus.png
+++ b/indra/newview/skins/default/textures/build/Object_Torus.png
diff --git a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
index 1fc22686eb..1fc22686eb 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Torus_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Tree.png b/indra/newview/skins/default/textures/build/Object_Tree.png
index 82c422419b..82c422419b 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Tree.png
+++ b/indra/newview/skins/default/textures/build/Object_Tree.png
diff --git a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
index 5bd87f8a2f..5bd87f8a2f 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Tree_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Object_Tube.png b/indra/newview/skins/default/textures/build/Object_Tube.png
index e47fce7511..e47fce7511 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Tube.png
+++ b/indra/newview/skins/default/textures/build/Object_Tube.png
diff --git a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
index a4c3f39e14..a4c3f39e14 100644..100755
--- a/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
+++ b/indra/newview/skins/default/textures/build/Object_Tube_Selected.png
diff --git a/indra/newview/skins/default/textures/build/Tool_Create.png b/indra/newview/skins/default/textures/build/Tool_Create.png
index 1f1097def5..1f1097def5 100644..100755
--- a/indra/newview/skins/default/textures/build/Tool_Create.png
+++ b/indra/newview/skins/default/textures/build/Tool_Create.png
diff --git a/indra/newview/skins/default/textures/build/Tool_Dozer.png b/indra/newview/skins/default/textures/build/Tool_Dozer.png
index 61744666f4..61744666f4 100644..100755
--- a/indra/newview/skins/default/textures/build/Tool_Dozer.png
+++ b/indra/newview/skins/default/textures/build/Tool_Dozer.png
diff --git a/indra/newview/skins/default/textures/build/Tool_Face.png b/indra/newview/skins/default/textures/build/Tool_Face.png
index 5ab42a4ad6..5ab42a4ad6 100644..100755
--- a/indra/newview/skins/default/textures/build/Tool_Face.png
+++ b/indra/newview/skins/default/textures/build/Tool_Face.png
diff --git a/indra/newview/skins/default/textures/build/Tool_Grab.png b/indra/newview/skins/default/textures/build/Tool_Grab.png
index 5c58288d5e..5c58288d5e 100644..100755
--- a/indra/newview/skins/default/textures/build/Tool_Grab.png
+++ b/indra/newview/skins/default/textures/build/Tool_Grab.png
diff --git a/indra/newview/skins/default/textures/build/Tool_Zoom.png b/indra/newview/skins/default/textures/build/Tool_Zoom.png
index ad493b0d66..ad493b0d66 100644..100755
--- a/indra/newview/skins/default/textures/build/Tool_Zoom.png
+++ b/indra/newview/skins/default/textures/build/Tool_Zoom.png
diff --git a/indra/newview/skins/default/textures/button_anim_pause.tga b/indra/newview/skins/default/textures/button_anim_pause.tga
index 577f9195d0..577f9195d0 100644..100755
--- a/indra/newview/skins/default/textures/button_anim_pause.tga
+++ b/indra/newview/skins/default/textures/button_anim_pause.tga
diff --git a/indra/newview/skins/default/textures/button_anim_pause_selected.tga b/indra/newview/skins/default/textures/button_anim_pause_selected.tga
index 21384316a8..21384316a8 100644..100755
--- a/indra/newview/skins/default/textures/button_anim_pause_selected.tga
+++ b/indra/newview/skins/default/textures/button_anim_pause_selected.tga
diff --git a/indra/newview/skins/default/textures/button_anim_play.tga b/indra/newview/skins/default/textures/button_anim_play.tga
index 9ed55f829d..9ed55f829d 100644..100755
--- a/indra/newview/skins/default/textures/button_anim_play.tga
+++ b/indra/newview/skins/default/textures/button_anim_play.tga
diff --git a/indra/newview/skins/default/textures/button_anim_play_selected.tga b/indra/newview/skins/default/textures/button_anim_play_selected.tga
index b166a4178d..b166a4178d 100644..100755
--- a/indra/newview/skins/default/textures/button_anim_play_selected.tga
+++ b/indra/newview/skins/default/textures/button_anim_play_selected.tga
diff --git a/indra/newview/skins/default/textures/checker.png b/indra/newview/skins/default/textures/checker.png
index 1ab87e3f02..1ab87e3f02 100644..100755
--- a/indra/newview/skins/default/textures/checker.png
+++ b/indra/newview/skins/default/textures/checker.png
diff --git a/indra/newview/skins/default/textures/cloud-particle.j2c b/indra/newview/skins/default/textures/cloud-particle.j2c
index 6c03bf6d05..6c03bf6d05 100644..100755
--- a/indra/newview/skins/default/textures/cloud-particle.j2c
+++ b/indra/newview/skins/default/textures/cloud-particle.j2c
diff --git a/indra/newview/skins/default/textures/color_swatch_alpha.tga b/indra/newview/skins/default/textures/color_swatch_alpha.tga
index 814a004e62..814a004e62 100644..100755
--- a/indra/newview/skins/default/textures/color_swatch_alpha.tga
+++ b/indra/newview/skins/default/textures/color_swatch_alpha.tga
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
index 19c842b816..19c842b816 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
index b9879dcc8a..b9879dcc8a 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowClosed_Press.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png
index d506cda5c9..d506cda5c9 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
index 08f7493a02..08f7493a02 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_ArrowOpened_Press.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Off.png b/indra/newview/skins/default/textures/containers/Accordion_Off.png
index 414f4509c6..414f4509c6 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_Off.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Over.png b/indra/newview/skins/default/textures/containers/Accordion_Over.png
index 5416d73310..5416d73310 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_Over.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Press.png b/indra/newview/skins/default/textures/containers/Accordion_Press.png
index 1578e0dfc5..1578e0dfc5 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_Press.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_Press.png
diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png
index 0616dea6a3..0616dea6a3 100644..100755
--- a/indra/newview/skins/default/textures/containers/Accordion_Selected.png
+++ b/indra/newview/skins/default/textures/containers/Accordion_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Container.png b/indra/newview/skins/default/textures/containers/Container.png
index 511eb94386..511eb94386 100644..100755
--- a/indra/newview/skins/default/textures/containers/Container.png
+++ b/indra/newview/skins/default/textures/containers/Container.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
index 1951413f8d..1951413f8d 100644..100755
--- a/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
index 8364716e02..8364716e02 100644..100755
--- a/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Left_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
index 21f1c2d8a8..21f1c2d8a8 100644..100755
--- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
index 3946917c7c..3946917c7c 100644..100755
--- a/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
index eeef28e5a5..eeef28e5a5 100644..100755
--- a/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Off.png
diff --git a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
index b0f1f16398..b0f1f16398 100644..100755
--- a/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
+++ b/indra/newview/skins/default/textures/containers/TabTop_Right_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png
index 9f1e2a469d..9f1e2a469d 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Flash.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
index 41b5d24d87..41b5d24d87 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
index 083acc0156..083acc0156 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
index ee4649a8f9..ee4649a8f9 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Left_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png
index dd73d655e9..dd73d655e9 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Flash.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
index 55c02160e3..55c02160e3 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
index 2f6ea90196..2f6ea90196 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
index 642113b135..642113b135 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png
index f6b775c2a0..f6b775c2a0 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Flash.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
index 01fd765c3d..01fd765c3d 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Off.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
index 74e00635f1..74e00635f1 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Over.png
diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
index 8a0d98a780..8a0d98a780 100644..100755
--- a/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
+++ b/indra/newview/skins/default/textures/containers/Toolbar_Right_Selected.png
diff --git a/indra/newview/skins/default/textures/crosshairs.tga b/indra/newview/skins/default/textures/crosshairs.tga
index ac4d63dc59..ac4d63dc59 100644..100755
--- a/indra/newview/skins/default/textures/crosshairs.tga
+++ b/indra/newview/skins/default/textures/crosshairs.tga
diff --git a/indra/newview/skins/default/textures/default_land_picture.j2c b/indra/newview/skins/default/textures/default_land_picture.j2c
index 34df0291ae..34df0291ae 100644..100755
--- a/indra/newview/skins/default/textures/default_land_picture.j2c
+++ b/indra/newview/skins/default/textures/default_land_picture.j2c
diff --git a/indra/newview/skins/default/textures/default_profile_picture.j2c b/indra/newview/skins/default/textures/default_profile_picture.j2c
index f21742cf09..f21742cf09 100644..100755
--- a/indra/newview/skins/default/textures/default_profile_picture.j2c
+++ b/indra/newview/skins/default/textures/default_profile_picture.j2c
diff --git a/indra/newview/skins/default/textures/direction_arrow.tga b/indra/newview/skins/default/textures/direction_arrow.tga
index f3ef1068c4..f3ef1068c4 100644..100755
--- a/indra/newview/skins/default/textures/direction_arrow.tga
+++ b/indra/newview/skins/default/textures/direction_arrow.tga
diff --git a/indra/newview/skins/default/textures/down_arrow.png b/indra/newview/skins/default/textures/down_arrow.png
index 155f80c97e..155f80c97e 100644..100755
--- a/indra/newview/skins/default/textures/down_arrow.png
+++ b/indra/newview/skins/default/textures/down_arrow.png
diff --git a/indra/newview/skins/default/textures/eye_button_active.tga b/indra/newview/skins/default/textures/eye_button_active.tga
index 014f785a7b..014f785a7b 100644..100755
--- a/indra/newview/skins/default/textures/eye_button_active.tga
+++ b/indra/newview/skins/default/textures/eye_button_active.tga
diff --git a/indra/newview/skins/default/textures/eye_button_inactive.tga b/indra/newview/skins/default/textures/eye_button_inactive.tga
index 8666f0bbe6..8666f0bbe6 100644..100755
--- a/indra/newview/skins/default/textures/eye_button_inactive.tga
+++ b/indra/newview/skins/default/textures/eye_button_inactive.tga
diff --git a/indra/newview/skins/default/textures/flatnormal.tga b/indra/newview/skins/default/textures/flatnormal.tga
new file mode 100644
index 0000000000..6d5abd1782
--- /dev/null
+++ b/indra/newview/skins/default/textures/flatnormal.tga
diff --git a/indra/newview/skins/default/textures/folder_arrow.tga b/indra/newview/skins/default/textures/folder_arrow.tga
index 77d470731b..77d470731b 100644..100755
--- a/indra/newview/skins/default/textures/folder_arrow.tga
+++ b/indra/newview/skins/default/textures/folder_arrow.tga
diff --git a/indra/newview/skins/default/textures/foot_shadow.j2c b/indra/newview/skins/default/textures/foot_shadow.j2c
index f9ce9da7d1..f9ce9da7d1 100644..100755
--- a/indra/newview/skins/default/textures/foot_shadow.j2c
+++ b/indra/newview/skins/default/textures/foot_shadow.j2c
diff --git a/indra/newview/skins/default/textures/green_checkmark.png b/indra/newview/skins/default/textures/green_checkmark.png
index d2a5b348dc..d2a5b348dc 100644..100755
--- a/indra/newview/skins/default/textures/green_checkmark.png
+++ b/indra/newview/skins/default/textures/green_checkmark.png
diff --git a/indra/newview/skins/default/textures/icn_media_movie.tga b/indra/newview/skins/default/textures/icn_media_movie.tga
index 43dd342c9d..43dd342c9d 100644..100755
--- a/indra/newview/skins/default/textures/icn_media_movie.tga
+++ b/indra/newview/skins/default/textures/icn_media_movie.tga
diff --git a/indra/newview/skins/default/textures/icn_media_web.tga b/indra/newview/skins/default/textures/icn_media_web.tga
index 7c9131dfff..7c9131dfff 100644..100755
--- a/indra/newview/skins/default/textures/icn_media_web.tga
+++ b/indra/newview/skins/default/textures/icn_media_web.tga
diff --git a/indra/newview/skins/default/textures/icon_avatar_offline.tga b/indra/newview/skins/default/textures/icon_avatar_offline.tga
index cfa95eb00e..cfa95eb00e 100644..100755
--- a/indra/newview/skins/default/textures/icon_avatar_offline.tga
+++ b/indra/newview/skins/default/textures/icon_avatar_offline.tga
diff --git a/indra/newview/skins/default/textures/icon_avatar_online.tga b/indra/newview/skins/default/textures/icon_avatar_online.tga
index 45221213eb..45221213eb 100644..100755
--- a/indra/newview/skins/default/textures/icon_avatar_online.tga
+++ b/indra/newview/skins/default/textures/icon_avatar_online.tga
diff --git a/indra/newview/skins/default/textures/icon_diurnal.tga b/indra/newview/skins/default/textures/icon_diurnal.tga
index fc720c8269..fc720c8269 100644..100755
--- a/indra/newview/skins/default/textures/icon_diurnal.tga
+++ b/indra/newview/skins/default/textures/icon_diurnal.tga
diff --git a/indra/newview/skins/default/textures/icon_for_sale_adult.tga b/indra/newview/skins/default/textures/icon_for_sale_adult.tga
index 6a99188f87..6a99188f87 100644..100755
--- a/indra/newview/skins/default/textures/icon_for_sale_adult.tga
+++ b/indra/newview/skins/default/textures/icon_for_sale_adult.tga
diff --git a/indra/newview/skins/default/textures/icon_top_pick.tga b/indra/newview/skins/default/textures/icon_top_pick.tga
index 0b34882d2f..0b34882d2f 100644..100755
--- a/indra/newview/skins/default/textures/icon_top_pick.tga
+++ b/indra/newview/skins/default/textures/icon_top_pick.tga
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Disabled.png b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png
index cf88c89ae5..cf88c89ae5 100644..100755
--- a/indra/newview/skins/default/textures/icons/AddItem_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/AddItem_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Off.png b/indra/newview/skins/default/textures/icons/AddItem_Off.png
index 52d4f9bc80..52d4f9bc80 100644..100755
--- a/indra/newview/skins/default/textures/icons/AddItem_Off.png
+++ b/indra/newview/skins/default/textures/icons/AddItem_Off.png
diff --git a/indra/newview/skins/default/textures/icons/AddItem_Press.png b/indra/newview/skins/default/textures/icons/AddItem_Press.png
index acc898e5f4..acc898e5f4 100644..100755
--- a/indra/newview/skins/default/textures/icons/AddItem_Press.png
+++ b/indra/newview/skins/default/textures/icons/AddItem_Press.png
diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Off.png b/indra/newview/skins/default/textures/icons/AudioMute_Off.png
index 938aaef491..938aaef491 100644..100755
--- a/indra/newview/skins/default/textures/icons/AudioMute_Off.png
+++ b/indra/newview/skins/default/textures/icons/AudioMute_Off.png
diff --git a/indra/newview/skins/default/textures/icons/AudioMute_Over.png b/indra/newview/skins/default/textures/icons/AudioMute_Over.png
index 7bd1b12aae..7bd1b12aae 100644..100755
--- a/indra/newview/skins/default/textures/icons/AudioMute_Over.png
+++ b/indra/newview/skins/default/textures/icons/AudioMute_Over.png
diff --git a/indra/newview/skins/default/textures/icons/Audio_Off.png b/indra/newview/skins/default/textures/icons/Audio_Off.png
index ef746aab92..ef746aab92 100644..100755
--- a/indra/newview/skins/default/textures/icons/Audio_Off.png
+++ b/indra/newview/skins/default/textures/icons/Audio_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Audio_Press.png b/indra/newview/skins/default/textures/icons/Audio_Press.png
index 25a669224a..25a669224a 100644..100755
--- a/indra/newview/skins/default/textures/icons/Audio_Press.png
+++ b/indra/newview/skins/default/textures/icons/Audio_Press.png
diff --git a/indra/newview/skins/default/textures/icons/BackArrow_Off.png b/indra/newview/skins/default/textures/icons/BackArrow_Off.png
index ff32192856..ff32192856 100644..100755
--- a/indra/newview/skins/default/textures/icons/BackArrow_Off.png
+++ b/indra/newview/skins/default/textures/icons/BackArrow_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_log_inbox.png b/indra/newview/skins/default/textures/icons/Conv_log_inbox.png
new file mode 100755
index 0000000000..bb6ca28147
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_log_inbox.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png
new file mode 100644
index 0000000000..0631f16f3b
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png
new file mode 100644
index 0000000000..578482f5ed
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png
new file mode 100644
index 0000000000..7676131790
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png
new file mode 100644
index 0000000000..2880eb766a
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png
new file mode 100644
index 0000000000..d009c8f446
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png
new file mode 100644
index 0000000000..8d82960e28
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png
new file mode 100644
index 0000000000..f718d3fc60
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png
new file mode 100644
index 0000000000..315e2c581a
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png
new file mode 100644
index 0000000000..732ab02a20
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png
new file mode 100644
index 0000000000..25a32cb2ba
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png
diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png
new file mode 100644
index 0000000000..08debeb91f
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png
diff --git a/indra/newview/skins/default/textures/icons/Copy.png b/indra/newview/skins/default/textures/icons/Copy.png
index d45134e9dd..d45134e9dd 100644..100755
--- a/indra/newview/skins/default/textures/icons/Copy.png
+++ b/indra/newview/skins/default/textures/icons/Copy.png
diff --git a/indra/newview/skins/default/textures/icons/DownArrow_Off.png b/indra/newview/skins/default/textures/icons/DownArrow_Off.png
index 60f62eed4a..60f62eed4a 100644..100755
--- a/indra/newview/skins/default/textures/icons/DownArrow_Off.png
+++ b/indra/newview/skins/default/textures/icons/DownArrow_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Edit_Wrench.png b/indra/newview/skins/default/textures/icons/Edit_Wrench.png
index edb40b9c96..edb40b9c96 100644..100755
--- a/indra/newview/skins/default/textures/icons/Edit_Wrench.png
+++ b/indra/newview/skins/default/textures/icons/Edit_Wrench.png
diff --git a/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png
index 69646ce473..69646ce473 100644..100755
--- a/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png
+++ b/indra/newview/skins/default/textures/icons/ExternalBrowser_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Facebook.png b/indra/newview/skins/default/textures/icons/Facebook.png
new file mode 100644
index 0000000000..8287d56f88
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Facebook.png
diff --git a/indra/newview/skins/default/textures/icons/Female.png b/indra/newview/skins/default/textures/icons/Female.png
index 67b5653a94..67b5653a94 100644..100755
--- a/indra/newview/skins/default/textures/icons/Female.png
+++ b/indra/newview/skins/default/textures/icons/Female.png
diff --git a/indra/newview/skins/default/textures/icons/ForSale_Badge.png b/indra/newview/skins/default/textures/icons/ForSale_Badge.png
index 5bee570cee..5bee570cee 100644..100755
--- a/indra/newview/skins/default/textures/icons/ForSale_Badge.png
+++ b/indra/newview/skins/default/textures/icons/ForSale_Badge.png
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
index e9b72b0401..e9b72b0401 100644..100755
--- a/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
+++ b/indra/newview/skins/default/textures/icons/ForwardArrow_Off.png
diff --git a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
index c7b2c769ae..c7b2c769ae 100644..100755
--- a/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
+++ b/indra/newview/skins/default/textures/icons/ForwardArrow_Press.png
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group.png b/indra/newview/skins/default/textures/icons/Generic_Group.png
index 9d76f75d0f..9d76f75d0f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Generic_Group.png
+++ b/indra/newview/skins/default/textures/icons/Generic_Group.png
diff --git a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png
index 75833eccf3..75833eccf3 100644..100755
--- a/indra/newview/skins/default/textures/icons/Generic_Group_Large.png
+++ b/indra/newview/skins/default/textures/icons/Generic_Group_Large.png
diff --git a/indra/newview/skins/default/textures/icons/Generic_Object_Small.png b/indra/newview/skins/default/textures/icons/Generic_Object_Small.png
index 223874e631..223874e631 100644..100755
--- a/indra/newview/skins/default/textures/icons/Generic_Object_Small.png
+++ b/indra/newview/skins/default/textures/icons/Generic_Object_Small.png
diff --git a/indra/newview/skins/default/textures/icons/Generic_Person.png b/indra/newview/skins/default/textures/icons/Generic_Person.png
index 45b491ab59..45b491ab59 100644..100755
--- a/indra/newview/skins/default/textures/icons/Generic_Person.png
+++ b/indra/newview/skins/default/textures/icons/Generic_Person.png
diff --git a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png
index 532288b430..532288b430 100644..100755
--- a/indra/newview/skins/default/textures/icons/Generic_Person_Large.png
+++ b/indra/newview/skins/default/textures/icons/Generic_Person_Large.png
diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png
index fb370f98d5..fb370f98d5 100644..100755
--- a/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/Hierarchy_View_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png
index 296311e797..296311e797 100644..100755
--- a/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png
+++ b/indra/newview/skins/default/textures/icons/Hierarchy_View_On.png
diff --git a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
index 3dec6b989c..3dec6b989c 100644..100755
--- a/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
+++ b/indra/newview/skins/default/textures/icons/Icon_For_Sale.png
diff --git a/indra/newview/skins/default/textures/icons/Info.png b/indra/newview/skins/default/textures/icons/Info.png
index e52560281b..e52560281b 100644..100755
--- a/indra/newview/skins/default/textures/icons/Info.png
+++ b/indra/newview/skins/default/textures/icons/Info.png
diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png
index be1cd0706f..be1cd0706f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Info_Over.png
+++ b/indra/newview/skins/default/textures/icons/Info_Over.png
diff --git a/indra/newview/skins/default/textures/icons/Info_Small.png b/indra/newview/skins/default/textures/icons/Info_Small.png
index 81078c32dc..81078c32dc 100644..100755
--- a/indra/newview/skins/default/textures/icons/Info_Small.png
+++ b/indra/newview/skins/default/textures/icons/Info_Small.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Alpha.png b/indra/newview/skins/default/textures/icons/Inv_Alpha.png
index b65dc1929d..b65dc1929d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Alpha.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Alpha.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Animation.png b/indra/newview/skins/default/textures/icons/Inv_Animation.png
index ab42c61a92..ab42c61a92 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Animation.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Animation.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_BodyShape.png b/indra/newview/skins/default/textures/icons/Inv_BodyShape.png
index 97e874d70d..97e874d70d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_BodyShape.png
+++ b/indra/newview/skins/default/textures/icons/Inv_BodyShape.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_CallingCard.png b/indra/newview/skins/default/textures/icons/Inv_CallingCard.png
index 1de96475f7..1de96475f7 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_CallingCard.png
+++ b/indra/newview/skins/default/textures/icons/Inv_CallingCard.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Clothing.png b/indra/newview/skins/default/textures/icons/Inv_Clothing.png
index e8d246c6fa..e8d246c6fa 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Clothing.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Clothing.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Eye.png b/indra/newview/skins/default/textures/icons/Inv_Eye.png
index e619f56c2b..e619f56c2b 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Eye.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Eye.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png
index 342a973d00..342a973d00 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png
+++ b/indra/newview/skins/default/textures/icons/Inv_FolderClosed.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png
index 0507c2cbaf..0507c2cbaf 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png
+++ b/indra/newview/skins/default/textures/icons/Inv_FolderOpen.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gesture.png b/indra/newview/skins/default/textures/icons/Inv_Gesture.png
index 52695ec19b..52695ec19b 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Gesture.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Gesture.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Gloves.png b/indra/newview/skins/default/textures/icons/Inv_Gloves.png
index d6a2113aaf..d6a2113aaf 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Gloves.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Gloves.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Hair.png b/indra/newview/skins/default/textures/icons/Inv_Hair.png
index ae941b0dd5..ae941b0dd5 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Hair.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Hair.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Invalid.png b/indra/newview/skins/default/textures/icons/Inv_Invalid.png
index 328be104ee..328be104ee 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Invalid.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Invalid.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Jacket.png b/indra/newview/skins/default/textures/icons/Inv_Jacket.png
index 3859666f7c..3859666f7c 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Jacket.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Jacket.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Landmark.png b/indra/newview/skins/default/textures/icons/Inv_Landmark.png
index 76df984596..76df984596 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Landmark.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Landmark.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Link.png b/indra/newview/skins/default/textures/icons/Inv_Link.png
index c1543dacb5..c1543dacb5 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Link.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Link.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png
index 73a708782c..73a708782c 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png
+++ b/indra/newview/skins/default/textures/icons/Inv_LinkFolder.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_LinkItem.png b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png
index 73a708782c..73a708782c 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_LinkItem.png
+++ b/indra/newview/skins/default/textures/icons/Inv_LinkItem.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png b/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png
index f2ae828efc..f2ae828efc 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png
+++ b/indra/newview/skins/default/textures/icons/Inv_LookFolderClosed.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png b/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png
index d454d4cd48..d454d4cd48 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png
+++ b/indra/newview/skins/default/textures/icons/Inv_LookFolderOpen.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_LostClosed.png b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png
index a800217e0d..a800217e0d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_LostClosed.png
+++ b/indra/newview/skins/default/textures/icons/Inv_LostClosed.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_LostOpen.png b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png
index 8c4a1a9ac0..8c4a1a9ac0 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_LostOpen.png
+++ b/indra/newview/skins/default/textures/icons/Inv_LostOpen.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Mesh.png b/indra/newview/skins/default/textures/icons/Inv_Mesh.png
index f1f21f7941..f1f21f7941 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Mesh.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Mesh.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Notecard.png b/indra/newview/skins/default/textures/icons/Inv_Notecard.png
index 4645ab8e91..4645ab8e91 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Notecard.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Notecard.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Object.png b/indra/newview/skins/default/textures/icons/Inv_Object.png
index f883696a82..f883696a82 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Object.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Object.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png
index 11f4871ad8..11f4871ad8 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Object_Multi.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Pants.png b/indra/newview/skins/default/textures/icons/Inv_Pants.png
index fe2389f074..fe2389f074 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Pants.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Pants.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Physics.png b/indra/newview/skins/default/textures/icons/Inv_Physics.png
index 360baec46d..360baec46d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Physics.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Physics.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Script.png b/indra/newview/skins/default/textures/icons/Inv_Script.png
index 0fba27a7aa..0fba27a7aa 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Script.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Script.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Shirt.png b/indra/newview/skins/default/textures/icons/Inv_Shirt.png
index 81c1538dd2..81c1538dd2 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Shirt.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Shirt.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Shoe.png b/indra/newview/skins/default/textures/icons/Inv_Shoe.png
index 1f52b0a6b6..1f52b0a6b6 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Shoe.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Shoe.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Skin.png b/indra/newview/skins/default/textures/icons/Inv_Skin.png
index b7da922046..b7da922046 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Skin.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Skin.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Skirt.png b/indra/newview/skins/default/textures/icons/Inv_Skirt.png
index 246e9a87aa..246e9a87aa 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Skirt.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Skirt.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Snapshot.png b/indra/newview/skins/default/textures/icons/Inv_Snapshot.png
index 39efd2be1b..39efd2be1b 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Snapshot.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Snapshot.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Socks.png b/indra/newview/skins/default/textures/icons/Inv_Socks.png
index 30d7d7c239..30d7d7c239 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Socks.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Socks.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Sound.png b/indra/newview/skins/default/textures/icons/Inv_Sound.png
index 44c271c868..44c271c868 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Sound.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Sound.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
index dcf998449f..dcf998449f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
index 0efd403c95..0efd403c95 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
+++ b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png
index a632197eb5..a632197eb5 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Tattoo.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Tattoo.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Texture.png b/indra/newview/skins/default/textures/icons/Inv_Texture.png
index dbc41c5e99..dbc41c5e99 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Texture.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Texture.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png
index c5201e6f9a..c5201e6f9a 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png
+++ b/indra/newview/skins/default/textures/icons/Inv_TrashClosed.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png
index 4a886a3f37..4a886a3f37 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png
+++ b/indra/newview/skins/default/textures/icons/Inv_TrashOpen.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Underpants.png b/indra/newview/skins/default/textures/icons/Inv_Underpants.png
index b1e7c2a55f..b1e7c2a55f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Underpants.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Underpants.png
diff --git a/indra/newview/skins/default/textures/icons/Inv_Undershirt.png b/indra/newview/skins/default/textures/icons/Inv_Undershirt.png
index 9340dbb975..9340dbb975 100644..100755
--- a/indra/newview/skins/default/textures/icons/Inv_Undershirt.png
+++ b/indra/newview/skins/default/textures/icons/Inv_Undershirt.png
diff --git a/indra/newview/skins/default/textures/icons/List_View_Disabled.png b/indra/newview/skins/default/textures/icons/List_View_Disabled.png
index 155dee5047..155dee5047 100644..100755
--- a/indra/newview/skins/default/textures/icons/List_View_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/List_View_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/List_View_On.png b/indra/newview/skins/default/textures/icons/List_View_On.png
index 9127c92c3b..9127c92c3b 100644..100755
--- a/indra/newview/skins/default/textures/icons/List_View_On.png
+++ b/indra/newview/skins/default/textures/icons/List_View_On.png
diff --git a/indra/newview/skins/default/textures/icons/Lock.png b/indra/newview/skins/default/textures/icons/Lock.png
index eb5b5ae7a9..eb5b5ae7a9 100644..100755
--- a/indra/newview/skins/default/textures/icons/Lock.png
+++ b/indra/newview/skins/default/textures/icons/Lock.png
diff --git a/indra/newview/skins/default/textures/icons/Locked_Icon.png b/indra/newview/skins/default/textures/icons/Locked_Icon.png
index 8ead280794..8ead280794 100644..100755
--- a/indra/newview/skins/default/textures/icons/Locked_Icon.png
+++ b/indra/newview/skins/default/textures/icons/Locked_Icon.png
diff --git a/indra/newview/skins/default/textures/icons/Male.png b/indra/newview/skins/default/textures/icons/Male.png
index f3fad77fd0..f3fad77fd0 100644..100755
--- a/indra/newview/skins/default/textures/icons/Male.png
+++ b/indra/newview/skins/default/textures/icons/Male.png
diff --git a/indra/newview/skins/default/textures/icons/Microphone_On.png b/indra/newview/skins/default/textures/icons/Microphone_On.png
index c96b500fa1..c96b500fa1 100644..100755
--- a/indra/newview/skins/default/textures/icons/Microphone_On.png
+++ b/indra/newview/skins/default/textures/icons/Microphone_On.png
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
index 75bd73cef1..75bd73cef1 100644..100755
--- a/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/MinusItem_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Off.png b/indra/newview/skins/default/textures/icons/MinusItem_Off.png
index 6f285f3546..6f285f3546 100644..100755
--- a/indra/newview/skins/default/textures/icons/MinusItem_Off.png
+++ b/indra/newview/skins/default/textures/icons/MinusItem_Off.png
diff --git a/indra/newview/skins/default/textures/icons/MinusItem_Press.png b/indra/newview/skins/default/textures/icons/MinusItem_Press.png
index 50f65765d5..50f65765d5 100644..100755
--- a/indra/newview/skins/default/textures/icons/MinusItem_Press.png
+++ b/indra/newview/skins/default/textures/icons/MinusItem_Press.png
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png
index fb341e9c83..fb341e9c83 100644..100755
--- a/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png
index 25b055bfc0..25b055bfc0 100644..100755
--- a/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png
+++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Off.png
diff --git a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png
index 6e91dd7159..6e91dd7159 100644..100755
--- a/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png
+++ b/indra/newview/skins/default/textures/icons/OptionsMenu_Press.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
index be58114aa1..be58114aa1 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
index e6b9480ab1..e6b9480ab1 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Off.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On.png b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
index ffda2e92d4..ffda2e92d4 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_On.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_On.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
index 6b5911014f..6b5911014f 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_On_Over.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
index 9c26b92e73..9c26b92e73 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Over.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
index 3b5d462975..3b5d462975 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Press.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
index f85be047b0..f85be047b0 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_1.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
index cd4e482216..cd4e482216 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_2.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
index d212a871ce..d212a871ce 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_3.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
index e5b6023e36..e5b6023e36 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_4.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
index e1911a092f..e1911a092f 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_5.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
index 9e59f7843a..9e59f7843a 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Progress_6.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
index 51e8bff646..51e8bff646 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
index 300e2e69e1..300e2e69e1 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
index 32fb236381..32fb236381 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
index 827f343b1e..827f343b1e 100644..100755
--- a/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
+++ b/indra/newview/skins/default/textures/icons/OutboxPush_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png
index fb1f7d3a6d..fb1f7d3a6d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png
index e6f614b844..e6f614b844 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_BuildNo_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png
index 84a96a60cb..84a96a60cb 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Build_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png
index d55ebd7c67..d55ebd7c67 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_DamageNo_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png
index ae4077488b..ae4077488b 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Damage_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png
index 4813d37198..4813d37198 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Exp_Color.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png
index e0b18b2451..e0b18b2451 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png
index 101aaa42b1..101aaa42b1 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png
index c27f18e3c7..c27f18e3c7 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png
index d28e5357df..d28e5357df 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_ForSale_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png
index d72f02f708..d72f02f708 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Health_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png
index 60e6a00a25..60e6a00a25 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png
index 55f97f3b4e..55f97f3b4e 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png
index 11ab1f1e60..11ab1f1e60 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png
index b536762ddc..b536762ddc 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png
index 8f0fe6a04d..8f0fe6a04d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png
index eba7070b4d..eba7070b4d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_PushNo_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png
index 08c2a18ac3..08c2a18ac3 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Push_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png
index bf618752f6..bf618752f6 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png
index a67bbd0cc5..a67bbd0cc5 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png
index 8f9f37a1bf..8f9f37a1bf 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_ScriptsNo_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png
index 8b1d6c5e14..8b1d6c5e14 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Scripts_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
index 956e02b14d..956e02b14d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
index 434caeda8b..434caeda8b 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
index 064687ed0f..064687ed0f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
index 5465650d0c..5465650d0c 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png
index eace54ae79..eace54ae79 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png
index 0d07e552b1..0d07e552b1 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_VoiceNo_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png
index b36a9bd2f0..b36a9bd2f0 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Voice_Dark.png
diff --git a/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png
index 86ce19474a..86ce19474a 100644..100755
--- a/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png
+++ b/indra/newview/skins/default/textures/icons/Parcel_Voice_Light.png
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png
new file mode 100755
index 0000000000..cfa12cb7cc
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
new file mode 100755
index 0000000000..0622141848
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/Pause_Off.png b/indra/newview/skins/default/textures/icons/Pause_Off.png
index 77f6be569d..77f6be569d 100644..100755
--- a/indra/newview/skins/default/textures/icons/Pause_Off.png
+++ b/indra/newview/skins/default/textures/icons/Pause_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Pause_Over.png b/indra/newview/skins/default/textures/icons/Pause_Over.png
index 580808bf7e..580808bf7e 100644..100755
--- a/indra/newview/skins/default/textures/icons/Pause_Over.png
+++ b/indra/newview/skins/default/textures/icons/Pause_Over.png
diff --git a/indra/newview/skins/default/textures/icons/Pause_Press.png b/indra/newview/skins/default/textures/icons/Pause_Press.png
index 859db34cae..859db34cae 100644..100755
--- a/indra/newview/skins/default/textures/icons/Pause_Press.png
+++ b/indra/newview/skins/default/textures/icons/Pause_Press.png
diff --git a/indra/newview/skins/default/textures/icons/Person_Check.png b/indra/newview/skins/default/textures/icons/Person_Check.png
index f8638540d4..f8638540d4 100644..100755
--- a/indra/newview/skins/default/textures/icons/Person_Check.png
+++ b/indra/newview/skins/default/textures/icons/Person_Check.png
diff --git a/indra/newview/skins/default/textures/icons/Person_Star.png b/indra/newview/skins/default/textures/icons/Person_Star.png
index ad10580ac4..ad10580ac4 100644..100755
--- a/indra/newview/skins/default/textures/icons/Person_Star.png
+++ b/indra/newview/skins/default/textures/icons/Person_Star.png
diff --git a/indra/newview/skins/default/textures/icons/Play_Off.png b/indra/newview/skins/default/textures/icons/Play_Off.png
index e594c1a4cb..e594c1a4cb 100644..100755
--- a/indra/newview/skins/default/textures/icons/Play_Off.png
+++ b/indra/newview/skins/default/textures/icons/Play_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Play_Over.png b/indra/newview/skins/default/textures/icons/Play_Over.png
index 70ab94e8c2..70ab94e8c2 100644..100755
--- a/indra/newview/skins/default/textures/icons/Play_Over.png
+++ b/indra/newview/skins/default/textures/icons/Play_Over.png
diff --git a/indra/newview/skins/default/textures/icons/Play_Press.png b/indra/newview/skins/default/textures/icons/Play_Press.png
index b52742c6da..b52742c6da 100644..100755
--- a/indra/newview/skins/default/textures/icons/Play_Press.png
+++ b/indra/newview/skins/default/textures/icons/Play_Press.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_1.png b/indra/newview/skins/default/textures/icons/Progress_1.png
index 5d6efbfa2a..5d6efbfa2a 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_1.png
+++ b/indra/newview/skins/default/textures/icons/Progress_1.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_10.png b/indra/newview/skins/default/textures/icons/Progress_10.png
index 28203324f1..28203324f1 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_10.png
+++ b/indra/newview/skins/default/textures/icons/Progress_10.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_11.png b/indra/newview/skins/default/textures/icons/Progress_11.png
index 6b87be0c3f..6b87be0c3f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_11.png
+++ b/indra/newview/skins/default/textures/icons/Progress_11.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_12.png b/indra/newview/skins/default/textures/icons/Progress_12.png
index 089d58b090..089d58b090 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_12.png
+++ b/indra/newview/skins/default/textures/icons/Progress_12.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_2.png b/indra/newview/skins/default/textures/icons/Progress_2.png
index 94cb73b1f7..94cb73b1f7 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_2.png
+++ b/indra/newview/skins/default/textures/icons/Progress_2.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_3.png b/indra/newview/skins/default/textures/icons/Progress_3.png
index a04a5b5263..a04a5b5263 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_3.png
+++ b/indra/newview/skins/default/textures/icons/Progress_3.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_4.png b/indra/newview/skins/default/textures/icons/Progress_4.png
index a467098d82..a467098d82 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_4.png
+++ b/indra/newview/skins/default/textures/icons/Progress_4.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_5.png b/indra/newview/skins/default/textures/icons/Progress_5.png
index ea64f1d907..ea64f1d907 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_5.png
+++ b/indra/newview/skins/default/textures/icons/Progress_5.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_6.png b/indra/newview/skins/default/textures/icons/Progress_6.png
index fe4447935f..fe4447935f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_6.png
+++ b/indra/newview/skins/default/textures/icons/Progress_6.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_7.png b/indra/newview/skins/default/textures/icons/Progress_7.png
index 64fa294771..64fa294771 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_7.png
+++ b/indra/newview/skins/default/textures/icons/Progress_7.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_8.png b/indra/newview/skins/default/textures/icons/Progress_8.png
index a1c9a7f2eb..a1c9a7f2eb 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_8.png
+++ b/indra/newview/skins/default/textures/icons/Progress_8.png
diff --git a/indra/newview/skins/default/textures/icons/Progress_9.png b/indra/newview/skins/default/textures/icons/Progress_9.png
index f3e9723184..f3e9723184 100644..100755
--- a/indra/newview/skins/default/textures/icons/Progress_9.png
+++ b/indra/newview/skins/default/textures/icons/Progress_9.png
diff --git a/indra/newview/skins/default/textures/icons/Refresh_Off.png b/indra/newview/skins/default/textures/icons/Refresh_Off.png
index a8acfda741..a8acfda741 100644..100755
--- a/indra/newview/skins/default/textures/icons/Refresh_Off.png
+++ b/indra/newview/skins/default/textures/icons/Refresh_Off.png
diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png
index 8342d7cfee..8342d7cfee 100644..100755
--- a/indra/newview/skins/default/textures/icons/SL_Logo.png
+++ b/indra/newview/skins/default/textures/icons/SL_Logo.png
diff --git a/indra/newview/skins/default/textures/icons/Search_Icon.png b/indra/newview/skins/default/textures/icons/Search_Icon.png
index 541aa8f52a..541aa8f52a 100644..100755
--- a/indra/newview/skins/default/textures/icons/Search_Icon.png
+++ b/indra/newview/skins/default/textures/icons/Search_Icon.png
diff --git a/indra/newview/skins/default/textures/icons/Shirt_Large.png b/indra/newview/skins/default/textures/icons/Shirt_Large.png
index 0f3846bccc..0f3846bccc 100644..100755
--- a/indra/newview/skins/default/textures/icons/Shirt_Large.png
+++ b/indra/newview/skins/default/textures/icons/Shirt_Large.png
diff --git a/indra/newview/skins/default/textures/icons/Shop.png b/indra/newview/skins/default/textures/icons/Shop.png
index 81c13eeabd..81c13eeabd 100644..100755
--- a/indra/newview/skins/default/textures/icons/Shop.png
+++ b/indra/newview/skins/default/textures/icons/Shop.png
diff --git a/indra/newview/skins/default/textures/icons/SkipBackward_Off.png b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png
index 8fc10e6583..8fc10e6583 100644..100755
--- a/indra/newview/skins/default/textures/icons/SkipBackward_Off.png
+++ b/indra/newview/skins/default/textures/icons/SkipBackward_Off.png
diff --git a/indra/newview/skins/default/textures/icons/SkipForward_Off.png b/indra/newview/skins/default/textures/icons/SkipForward_Off.png
index 2892e3cfa9..2892e3cfa9 100644..100755
--- a/indra/newview/skins/default/textures/icons/SkipForward_Off.png
+++ b/indra/newview/skins/default/textures/icons/SkipForward_Off.png
diff --git a/indra/newview/skins/default/textures/icons/StopReload_Off.png b/indra/newview/skins/default/textures/icons/StopReload_Off.png
index 698569a540..698569a540 100644..100755
--- a/indra/newview/skins/default/textures/icons/StopReload_Off.png
+++ b/indra/newview/skins/default/textures/icons/StopReload_Off.png
diff --git a/indra/newview/skins/default/textures/icons/StopReload_Over.png b/indra/newview/skins/default/textures/icons/StopReload_Over.png
index 251b38630a..251b38630a 100644..100755
--- a/indra/newview/skins/default/textures/icons/StopReload_Over.png
+++ b/indra/newview/skins/default/textures/icons/StopReload_Over.png
diff --git a/indra/newview/skins/default/textures/icons/Stop_Off.png b/indra/newview/skins/default/textures/icons/Stop_Off.png
index 3ee215d36f..3ee215d36f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Stop_Off.png
+++ b/indra/newview/skins/default/textures/icons/Stop_Off.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Disabled.png b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
index ca2e8def97..ca2e8def97 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Enabled.png b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
index bc236c8b98..bc236c8b98 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Enabled.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Enabled.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
index 624e556376..624e556376 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_1.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
index 5769803b3f..5769803b3f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_2.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
index 92d4bfb020..92d4bfb020 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_3.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
index 6d43eb3a9f..6d43eb3a9f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_4.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
index 766d063c99..766d063c99 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_5.png
diff --git a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
index dfe7f68b72..dfe7f68b72 100644..100755
--- a/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
+++ b/indra/newview/skins/default/textures/icons/Sync_Progress_6.png
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png
index caaf45a99f..caaf45a99f 100644..100755
--- a/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png
+++ b/indra/newview/skins/default/textures/icons/TrashItem_Disabled.png
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Off.png b/indra/newview/skins/default/textures/icons/TrashItem_Off.png
index bb64920ec4..bb64920ec4 100644..100755
--- a/indra/newview/skins/default/textures/icons/TrashItem_Off.png
+++ b/indra/newview/skins/default/textures/icons/TrashItem_Off.png
diff --git a/indra/newview/skins/default/textures/icons/TrashItem_Press.png b/indra/newview/skins/default/textures/icons/TrashItem_Press.png
index c62f833d86..c62f833d86 100644..100755
--- a/indra/newview/skins/default/textures/icons/TrashItem_Press.png
+++ b/indra/newview/skins/default/textures/icons/TrashItem_Press.png
diff --git a/indra/newview/skins/default/textures/icons/UnZoom_Off.png b/indra/newview/skins/default/textures/icons/UnZoom_Off.png
index c794113755..c794113755 100644..100755
--- a/indra/newview/skins/default/textures/icons/UnZoom_Off.png
+++ b/indra/newview/skins/default/textures/icons/UnZoom_Off.png
diff --git a/indra/newview/skins/default/textures/icons/UpArrow_Off.png b/indra/newview/skins/default/textures/icons/UpArrow_Off.png
index 00015bce20..00015bce20 100644..100755
--- a/indra/newview/skins/default/textures/icons/UpArrow_Off.png
+++ b/indra/newview/skins/default/textures/icons/UpArrow_Off.png
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png
index cd18ae310d..cd18ae310d 100644..100755
--- a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png
+++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl1.png
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png
index b0ed6ee8eb..b0ed6ee8eb 100644..100755
--- a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png
+++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl2.png
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png
index 14ec77b99a..14ec77b99a 100644..100755
--- a/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png
+++ b/indra/newview/skins/default/textures/icons/VoicePTT_Lvl3.png
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png
index 48be51e9af..48be51e9af 100644..100755
--- a/indra/newview/skins/default/textures/icons/VoicePTT_Off.png
+++ b/indra/newview/skins/default/textures/icons/VoicePTT_Off.png
diff --git a/indra/newview/skins/default/textures/icons/VoicePTT_On.png b/indra/newview/skins/default/textures/icons/VoicePTT_On.png
index be4881b64c..be4881b64c 100644..100755
--- a/indra/newview/skins/default/textures/icons/VoicePTT_On.png
+++ b/indra/newview/skins/default/textures/icons/VoicePTT_On.png
diff --git a/indra/newview/skins/default/textures/icons/Web_Profile_Off.png b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png
index f5fb774a6f..f5fb774a6f 100644..100755
--- a/indra/newview/skins/default/textures/icons/Web_Profile_Off.png
+++ b/indra/newview/skins/default/textures/icons/Web_Profile_Off.png
diff --git a/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png
index c057e9743d..c057e9743d 100644..100755
--- a/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png
+++ b/indra/newview/skins/default/textures/icons/YouAreHere_Badge.png
diff --git a/indra/newview/skins/default/textures/icons/Zoom_Off.png b/indra/newview/skins/default/textures/icons/Zoom_Off.png
index d096720c9c..d096720c9c 100644..100755
--- a/indra/newview/skins/default/textures/icons/Zoom_Off.png
+++ b/indra/newview/skins/default/textures/icons/Zoom_Off.png
diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
index 3bb7f7183c..3bb7f7183c 100644..100755
--- a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
+++ b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png
index 422f67cf83..422f67cf83 100644..100755
--- a/indra/newview/skins/default/textures/icons/back_arrow_off.png
+++ b/indra/newview/skins/default/textures/icons/back_arrow_off.png
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png
index b4cc170f37..b4cc170f37 100644..100755
--- a/indra/newview/skins/default/textures/icons/back_arrow_over.png
+++ b/indra/newview/skins/default/textures/icons/back_arrow_over.png
diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png
index a9e2f326a7..a9e2f326a7 100644..100755
--- a/indra/newview/skins/default/textures/icons/back_arrow_press.png
+++ b/indra/newview/skins/default/textures/icons/back_arrow_press.png
diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png
index 2c05297f4f..2c05297f4f 100644..100755
--- a/indra/newview/skins/default/textures/icons/check_mark.png
+++ b/indra/newview/skins/default/textures/icons/check_mark.png
diff --git a/indra/newview/skins/default/textures/icons/collapse_to_one_line.png b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png
new file mode 100755
index 0000000000..d57144a645
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/collapse_to_one_line.png
diff --git a/indra/newview/skins/default/textures/icons/edit_mine.png b/indra/newview/skins/default/textures/icons/edit_mine.png
index a0bc7efd25..a0bc7efd25 100644..100755
--- a/indra/newview/skins/default/textures/icons/edit_mine.png
+++ b/indra/newview/skins/default/textures/icons/edit_mine.png
diff --git a/indra/newview/skins/default/textures/icons/edit_theirs.png b/indra/newview/skins/default/textures/icons/edit_theirs.png
index ed36ad7cfc..ed36ad7cfc 100644..100755
--- a/indra/newview/skins/default/textures/icons/edit_theirs.png
+++ b/indra/newview/skins/default/textures/icons/edit_theirs.png
diff --git a/indra/newview/skins/default/textures/icons/expand_one_liner.png b/indra/newview/skins/default/textures/icons/expand_one_liner.png
new file mode 100755
index 0000000000..58b7d90131
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/expand_one_liner.png
diff --git a/indra/newview/skins/default/textures/icons/map_placeholder.png b/indra/newview/skins/default/textures/icons/map_placeholder.png
new file mode 100644
index 0000000000..31e457aa75
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/map_placeholder.png
diff --git a/indra/newview/skins/default/textures/icons/nearby_chat_icon.png b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
new file mode 100755
index 0000000000..5ac4258b9d
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/nearby_chat_icon.png
diff --git a/indra/newview/skins/default/textures/icons/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png
index 223874e631..223874e631 100644..100755
--- a/indra/newview/skins/default/textures/icons/object_icon.png
+++ b/indra/newview/skins/default/textures/icons/object_icon.png
diff --git a/indra/newview/skins/default/textures/icons/pop_up_caution.png b/indra/newview/skins/default/textures/icons/pop_up_caution.png
index 78b681cb33..78b681cb33 100644..100755
--- a/indra/newview/skins/default/textures/icons/pop_up_caution.png
+++ b/indra/newview/skins/default/textures/icons/pop_up_caution.png
diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png
index 52dc2ae74f..52dc2ae74f 100644..100755
--- a/indra/newview/skins/default/textures/icons/see_me_online.png
+++ b/indra/newview/skins/default/textures/icons/see_me_online.png
diff --git a/indra/newview/skins/default/textures/icons/see_on_map.png b/indra/newview/skins/default/textures/icons/see_on_map.png
index 200e649818..200e649818 100644..100755
--- a/indra/newview/skins/default/textures/icons/see_on_map.png
+++ b/indra/newview/skins/default/textures/icons/see_on_map.png
diff --git a/indra/newview/skins/default/textures/icons/unknown_icon.png b/indra/newview/skins/default/textures/icons/unknown_icon.png
index 8441d86596..8441d86596 100644..100755
--- a/indra/newview/skins/default/textures/icons/unknown_icon.png
+++ b/indra/newview/skins/default/textures/icons/unknown_icon.png
diff --git a/indra/newview/skins/default/textures/jump_left_in.tga b/indra/newview/skins/default/textures/jump_left_in.tga
index e0656c901d..e0656c901d 100644..100755
--- a/indra/newview/skins/default/textures/jump_left_in.tga
+++ b/indra/newview/skins/default/textures/jump_left_in.tga
diff --git a/indra/newview/skins/default/textures/jump_left_out.tga b/indra/newview/skins/default/textures/jump_left_out.tga
index fb6dac0c3d..fb6dac0c3d 100644..100755
--- a/indra/newview/skins/default/textures/jump_left_out.tga
+++ b/indra/newview/skins/default/textures/jump_left_out.tga
diff --git a/indra/newview/skins/default/textures/jump_right_in.tga b/indra/newview/skins/default/textures/jump_right_in.tga
index 010c748c2a..010c748c2a 100644..100755
--- a/indra/newview/skins/default/textures/jump_right_in.tga
+++ b/indra/newview/skins/default/textures/jump_right_in.tga
diff --git a/indra/newview/skins/default/textures/jump_right_out.tga b/indra/newview/skins/default/textures/jump_right_out.tga
index 33355262d4..33355262d4 100644..100755
--- a/indra/newview/skins/default/textures/jump_right_out.tga
+++ b/indra/newview/skins/default/textures/jump_right_out.tga
diff --git a/indra/newview/skins/default/textures/lag_status_critical.tga b/indra/newview/skins/default/textures/lag_status_critical.tga
index bbc71d9e77..bbc71d9e77 100644..100755
--- a/indra/newview/skins/default/textures/lag_status_critical.tga
+++ b/indra/newview/skins/default/textures/lag_status_critical.tga
diff --git a/indra/newview/skins/default/textures/lag_status_good.tga b/indra/newview/skins/default/textures/lag_status_good.tga
index 680ba90f17..680ba90f17 100644..100755
--- a/indra/newview/skins/default/textures/lag_status_good.tga
+++ b/indra/newview/skins/default/textures/lag_status_good.tga
diff --git a/indra/newview/skins/default/textures/lag_status_warning.tga b/indra/newview/skins/default/textures/lag_status_warning.tga
index 13ce3cc396..13ce3cc396 100644..100755
--- a/indra/newview/skins/default/textures/lag_status_warning.tga
+++ b/indra/newview/skins/default/textures/lag_status_warning.tga
diff --git a/indra/newview/skins/default/textures/legend.tga b/indra/newview/skins/default/textures/legend.tga
index 0dbb8fda4f..0dbb8fda4f 100644..100755
--- a/indra/newview/skins/default/textures/legend.tga
+++ b/indra/newview/skins/default/textures/legend.tga
diff --git a/indra/newview/skins/default/textures/locked_image.j2c b/indra/newview/skins/default/textures/locked_image.j2c
index 9e8998d675..9e8998d675 100644..100755
--- a/indra/newview/skins/default/textures/locked_image.j2c
+++ b/indra/newview/skins/default/textures/locked_image.j2c
diff --git a/indra/newview/skins/default/textures/map_avatar_16.tga b/indra/newview/skins/default/textures/map_avatar_16.tga
index f59e9e9193..f59e9e9193 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_16.tga
+++ b/indra/newview/skins/default/textures/map_avatar_16.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_32.tga b/indra/newview/skins/default/textures/map_avatar_32.tga
index aebeab4093..aebeab4093 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_32.tga
+++ b/indra/newview/skins/default/textures/map_avatar_32.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_8.tga b/indra/newview/skins/default/textures/map_avatar_8.tga
index 8500eadeba..8500eadeba 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_8.tga
+++ b/indra/newview/skins/default/textures/map_avatar_8.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_above_32.tga b/indra/newview/skins/default/textures/map_avatar_above_32.tga
index 65bd0561a7..65bd0561a7 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_above_32.tga
+++ b/indra/newview/skins/default/textures/map_avatar_above_32.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_below_32.tga b/indra/newview/skins/default/textures/map_avatar_below_32.tga
index 496c44b369..496c44b369 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_below_32.tga
+++ b/indra/newview/skins/default/textures/map_avatar_below_32.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_unknown_32.tga b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga
index d1192478c6..d1192478c6 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_unknown_32.tga
+++ b/indra/newview/skins/default/textures/map_avatar_unknown_32.tga
diff --git a/indra/newview/skins/default/textures/map_avatar_you_32.tga b/indra/newview/skins/default/textures/map_avatar_you_32.tga
index 782207efd6..782207efd6 100644..100755
--- a/indra/newview/skins/default/textures/map_avatar_you_32.tga
+++ b/indra/newview/skins/default/textures/map_avatar_you_32.tga
diff --git a/indra/newview/skins/default/textures/map_event.tga b/indra/newview/skins/default/textures/map_event.tga
index 2c06d08fd2..2c06d08fd2 100644..100755
--- a/indra/newview/skins/default/textures/map_event.tga
+++ b/indra/newview/skins/default/textures/map_event.tga
diff --git a/indra/newview/skins/default/textures/map_home.tga b/indra/newview/skins/default/textures/map_home.tga
index acaaa3db44..acaaa3db44 100644..100755
--- a/indra/newview/skins/default/textures/map_home.tga
+++ b/indra/newview/skins/default/textures/map_home.tga
diff --git a/indra/newview/skins/default/textures/map_infohub.tga b/indra/newview/skins/default/textures/map_infohub.tga
index d0134fa5fe..d0134fa5fe 100644..100755
--- a/indra/newview/skins/default/textures/map_infohub.tga
+++ b/indra/newview/skins/default/textures/map_infohub.tga
diff --git a/indra/newview/skins/default/textures/map_telehub.tga b/indra/newview/skins/default/textures/map_telehub.tga
index 545b8e532c..545b8e532c 100644..100755
--- a/indra/newview/skins/default/textures/map_telehub.tga
+++ b/indra/newview/skins/default/textures/map_telehub.tga
diff --git a/indra/newview/skins/default/textures/map_track_16.tga b/indra/newview/skins/default/textures/map_track_16.tga
index 451ce24cf0..451ce24cf0 100644..100755
--- a/indra/newview/skins/default/textures/map_track_16.tga
+++ b/indra/newview/skins/default/textures/map_track_16.tga
diff --git a/indra/newview/skins/default/textures/materials_ui_x_24.png b/indra/newview/skins/default/textures/materials_ui_x_24.png
new file mode 100644
index 0000000000..6d88554914
--- /dev/null
+++ b/indra/newview/skins/default/textures/materials_ui_x_24.png
diff --git a/indra/newview/skins/default/textures/menu_separator.png b/indra/newview/skins/default/textures/menu_separator.png
index 89dcdcdff5..89dcdcdff5 100644..100755
--- a/indra/newview/skins/default/textures/menu_separator.png
+++ b/indra/newview/skins/default/textures/menu_separator.png
diff --git a/indra/newview/skins/default/textures/missing_asset.tga b/indra/newview/skins/default/textures/missing_asset.tga
index 9a43f4db5d..9a43f4db5d 100644..100755
--- a/indra/newview/skins/default/textures/missing_asset.tga
+++ b/indra/newview/skins/default/textures/missing_asset.tga
diff --git a/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png
index d0b213cdc5..d0b213cdc5 100644..100755
--- a/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png
+++ b/indra/newview/skins/default/textures/model_wizard/progress_bar_bg.png
diff --git a/indra/newview/skins/default/textures/model_wizard/progress_light.png b/indra/newview/skins/default/textures/model_wizard/progress_light.png
index 019344f812..019344f812 100644..100755
--- a/indra/newview/skins/default/textures/model_wizard/progress_light.png
+++ b/indra/newview/skins/default/textures/model_wizard/progress_light.png
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
index 19569501fe..19569501fe 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
+++ b/indra/newview/skins/default/textures/navbar/Arrow_Left_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
index 3648c42656..3648c42656 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
+++ b/indra/newview/skins/default/textures/navbar/Arrow_Right_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
index 0b3f252ccf..0b3f252ccf 100644..100755
--- a/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
+++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png
index 5c4c150bed..5c4c150bed 100644..100755
--- a/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png
+++ b/indra/newview/skins/default/textures/navbar/BuyArrow_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png
index d4f126f969..d4f126f969 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Link_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
index e27dbe2cad..e27dbe2cad 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
index 82d044d817..82d044d817 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
index 7909d54f2b..7909d54f2b 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
index 6670667022..6670667022 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
+++ b/indra/newview/skins/default/textures/navbar/Favorite_Star_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
index 5ab4abc5b8..5ab4abc5b8 100644..100755
--- a/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
+++ b/indra/newview/skins/default/textures/navbar/FileMenu_Divider.png
diff --git a/indra/newview/skins/default/textures/navbar/Flag.png b/indra/newview/skins/default/textures/navbar/Flag.png
index df53c89224..df53c89224 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Flag.png
+++ b/indra/newview/skins/default/textures/navbar/Flag.png
diff --git a/indra/newview/skins/default/textures/navbar/Help_Press.png b/indra/newview/skins/default/textures/navbar/Help_Press.png
index ed3695f9d5..ed3695f9d5 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Help_Press.png
+++ b/indra/newview/skins/default/textures/navbar/Help_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/Home_Off.png b/indra/newview/skins/default/textures/navbar/Home_Off.png
index fe3bc63b77..fe3bc63b77 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Home_Off.png
+++ b/indra/newview/skins/default/textures/navbar/Home_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Off.png b/indra/newview/skins/default/textures/navbar/Info_Off.png
index 64722255a3..64722255a3 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Info_Off.png
+++ b/indra/newview/skins/default/textures/navbar/Info_Off.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Over.png b/indra/newview/skins/default/textures/navbar/Info_Over.png
index 84f1d03129..84f1d03129 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Info_Over.png
+++ b/indra/newview/skins/default/textures/navbar/Info_Over.png
diff --git a/indra/newview/skins/default/textures/navbar/Info_Press.png b/indra/newview/skins/default/textures/navbar/Info_Press.png
index 169105829e..169105829e 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Info_Press.png
+++ b/indra/newview/skins/default/textures/navbar/Info_Press.png
diff --git a/indra/newview/skins/default/textures/navbar/Lock.png b/indra/newview/skins/default/textures/navbar/Lock.png
index cf569d6ad2..cf569d6ad2 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Lock.png
+++ b/indra/newview/skins/default/textures/navbar/Lock.png
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG.png b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
index 38eea783e6..38eea783e6 100644..100755
--- a/indra/newview/skins/default/textures/navbar/NavBar_BG.png
+++ b/indra/newview/skins/default/textures/navbar/NavBar_BG.png
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png
index a79d999932..a79d999932 100644..100755
--- a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png
+++ b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoFav_Bevel.png
diff --git a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png
index b692ed92da..b692ed92da 100644..100755
--- a/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png
+++ b/indra/newview/skins/default/textures/navbar/NavBar_BG_NoNav_Bevel.png
diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png
index fc4f0c07ef..fc4f0c07ef 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Row_Selection.png
+++ b/indra/newview/skins/default/textures/navbar/Row_Selection.png
diff --git a/indra/newview/skins/default/textures/navbar/Search.png b/indra/newview/skins/default/textures/navbar/Search.png
index 0d0e330bc7..0d0e330bc7 100644..100755
--- a/indra/newview/skins/default/textures/navbar/Search.png
+++ b/indra/newview/skins/default/textures/navbar/Search.png
diff --git a/indra/newview/skins/default/textures/navbar/separator.png b/indra/newview/skins/default/textures/navbar/separator.png
index b93e5791a7..b93e5791a7 100644..100755
--- a/indra/newview/skins/default/textures/navbar/separator.png
+++ b/indra/newview/skins/default/textures/navbar/separator.png
diff --git a/indra/newview/skins/default/textures/notify_caution_icon.tga b/indra/newview/skins/default/textures/notify_caution_icon.tga
index abc23d1d7a..abc23d1d7a 100644..100755
--- a/indra/newview/skins/default/textures/notify_caution_icon.tga
+++ b/indra/newview/skins/default/textures/notify_caution_icon.tga
diff --git a/indra/newview/skins/default/textures/pixiesmall.j2c b/indra/newview/skins/default/textures/pixiesmall.j2c
index a1ff64014b..a1ff64014b 100644..100755
--- a/indra/newview/skins/default/textures/pixiesmall.j2c
+++ b/indra/newview/skins/default/textures/pixiesmall.j2c
diff --git a/indra/newview/skins/default/textures/red_x.png b/indra/newview/skins/default/textures/red_x.png
index a61202f09b..a61202f09b 100644..100755
--- a/indra/newview/skins/default/textures/red_x.png
+++ b/indra/newview/skins/default/textures/red_x.png
diff --git a/indra/newview/skins/default/textures/rounded_square.j2c b/indra/newview/skins/default/textures/rounded_square.j2c
index c8bb572fa9..c8bb572fa9 100644..100755
--- a/indra/newview/skins/default/textures/rounded_square.j2c
+++ b/indra/newview/skins/default/textures/rounded_square.j2c
diff --git a/indra/newview/skins/default/textures/script_error.j2c b/indra/newview/skins/default/textures/script_error.j2c
index 893cb642e7..893cb642e7 100644..100755
--- a/indra/newview/skins/default/textures/script_error.j2c
+++ b/indra/newview/skins/default/textures/script_error.j2c
diff --git a/indra/newview/skins/default/textures/silhouette.j2c b/indra/newview/skins/default/textures/silhouette.j2c
index 3859d4cb34..3859d4cb34 100644..100755
--- a/indra/newview/skins/default/textures/silhouette.j2c
+++ b/indra/newview/skins/default/textures/silhouette.j2c
diff --git a/indra/newview/skins/default/textures/slim_icon_16_viewer.tga b/indra/newview/skins/default/textures/slim_icon_16_viewer.tga
index 552181d36a..552181d36a 100644..100755
--- a/indra/newview/skins/default/textures/slim_icon_16_viewer.tga
+++ b/indra/newview/skins/default/textures/slim_icon_16_viewer.tga
diff --git a/indra/newview/skins/default/textures/snapshot_download.png b/indra/newview/skins/default/textures/snapshot_download.png
index 6aa1abded5..6aa1abded5 100644..100755
--- a/indra/newview/skins/default/textures/snapshot_download.png
+++ b/indra/newview/skins/default/textures/snapshot_download.png
diff --git a/indra/newview/skins/default/textures/snapshot_email.png b/indra/newview/skins/default/textures/snapshot_email.png
index dee784a9bf..dee784a9bf 100644..100755
--- a/indra/newview/skins/default/textures/snapshot_email.png
+++ b/indra/newview/skins/default/textures/snapshot_email.png
diff --git a/indra/newview/skins/default/textures/spacer24.tga b/indra/newview/skins/default/textures/spacer24.tga
index c7cab6b38c..c7cab6b38c 100644..100755
--- a/indra/newview/skins/default/textures/spacer24.tga
+++ b/indra/newview/skins/default/textures/spacer24.tga
diff --git a/indra/newview/skins/default/textures/tabarea.tga b/indra/newview/skins/default/textures/tabarea.tga
index 5517aebfc8..5517aebfc8 100644..100755
--- a/indra/newview/skins/default/textures/tabarea.tga
+++ b/indra/newview/skins/default/textures/tabarea.tga
diff --git a/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png
index 213acbe87b..213acbe87b 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png
+++ b/indra/newview/skins/default/textures/taskpanel/Activate_Checkmark.png
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
index 50c01062a5..50c01062a5 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
+++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Foreground.png
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
index bf2065cd37..bf2065cd37 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
+++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Dock_Press.png
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
index 8b48258142..8b48258142 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
+++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Foreground.png
diff --git a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png
index 09efe779fe..09efe779fe 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png
+++ b/indra/newview/skins/default/textures/taskpanel/Sidebar_Icon_Undock_Press.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png
index bc4e00c646..bc4e00c646 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Close_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png
index 293aeef5e6..293aeef5e6 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Home_Selected.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
index 760db9360d..760db9360d 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Me_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png
index 4556602f58..4556602f58 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Open_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
index 691b600510..691b600510 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_People_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
index f5a5f7a846..f5a5f7a846 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Places_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png
index e56eda9802..e56eda9802 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TabIcon_Things_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
index 4ed7a2b183..4ed7a2b183 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
+++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Off.png
diff --git a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
index b3316386b9..b3316386b9 100644..100755
--- a/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
+++ b/indra/newview/skins/default/textures/taskpanel/TaskPanel_Tab_Selected.png
diff --git a/indra/newview/skins/default/textures/tearoff_pressed.tga b/indra/newview/skins/default/textures/tearoff_pressed.tga
index 620d109de0..620d109de0 100644..100755
--- a/indra/newview/skins/default/textures/tearoff_pressed.tga
+++ b/indra/newview/skins/default/textures/tearoff_pressed.tga
diff --git a/indra/newview/skins/default/textures/tearoffbox.tga b/indra/newview/skins/default/textures/tearoffbox.tga
index 0670d2e91b..0670d2e91b 100644..100755
--- a/indra/newview/skins/default/textures/tearoffbox.tga
+++ b/indra/newview/skins/default/textures/tearoffbox.tga
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index eabcc68916..bb891996c9 100644..100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -54,6 +54,8 @@ with the same filename but different name
 
   <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png"	preload="true" />
   <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
+  <texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" />
+  <texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" />
 
   <texture name="AudioMute_Off" file_name="icons/AudioMute_Off.png" preload="false" />
   <texture name="AudioMute_Over" file_name="icons/AudioMute_Over.png" preload="false" />
@@ -146,10 +148,13 @@ with the same filename but different name
   <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
   <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png"      preload="true" />
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
+  <texture name="Command_Social_Icon"       file_name="toolbar_icons/facebook.png"     preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
+  <texture name="Command_Highlighting_Icon" file_name="toolbar_icons/highlighting.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+  <texture name="Command_Highlighting_Selected_Icon" file_name="toolbar_icons/highlighting_selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
   <texture name="Caret_Bottom_Icon"         file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" />
   <texture name="Caret_Right_Icon"          file_name="toolbar_icons/caret_right.png"  preload="true" scale.left="5" scale.top="15" scale.right="28" scale.bottom="1" />
   <texture name="Caret_Left_Icon"           file_name="toolbar_icons/caret_left.png"   preload="true" scale.left="1" scale.top="15" scale.right="23" scale.bottom="1" />
@@ -160,7 +165,25 @@ with the same filename but different name
   <texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
   <texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+  <texture name="ComboButton_Hovered" file_name="widgets/ComboButton_Hover.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
+
   <texture name="Container" file_name="containers/Container.png" preload="false" />
+
+  <texture name="Conv_toolbar_add_person" file_name="icons/Conv_toolbar_add_person.png" preload="false" />
+  <texture name="Conv_toolbar_arrow_ne" file_name="icons/Conv_toolbar_arrow_ne.png" preload="false" />
+  <texture name="Conv_toolbar_arrow_sw" file_name="icons/Conv_toolbar_arrow_sw.png" preload="false" />
+  <texture name="Conv_toolbar_call_log" file_name="icons/Conv_toolbar_call_log.png" preload="false" />
+  <texture name="Conv_toolbar_close" file_name="icons/Conv_toolbar_close.png" preload="false" />
+  <texture name="Conv_toolbar_collapse" file_name="icons/Conv_toolbar_collapse.png" preload="false" />
+  <texture name="Conv_collapse_to_one_line" file_name="icons/collapse_to_one_line.png" preload="false" />
+  <texture name="Conv_expand_one_line" file_name="icons/expand_one_liner.png" preload="false" />
+  <texture name="Conv_toolbar_expand" file_name="icons/Conv_toolbar_expand.png" preload="false" />
+  <texture name="Conv_toolbar_hang_up" file_name="icons/Conv_toolbar_hang_up.png" preload="false" />
+  <texture name="Conv_toolbar_open_call" file_name="icons/Conv_toolbar_open_call.png" preload="false" />
+  <texture name="Conv_toolbar_plus" file_name="icons/Conv_toolbar_plus.png" preload="false" />
+  <texture name="Conv_toolbar_sort" file_name="icons/Conv_toolbar_sort.png" preload="false" />
+  <texture name="Conv_log_inbox" file_name="icons/Conv_log_inbox.png" preload="false" />
+
   <texture name="Copy" file_name="icons/Copy.png" preload="false" />
   
   <texture name="DisclosureArrow_Opened_Off" file_name="widgets/DisclosureArrow_Opened_Off.png" preload="true" />
@@ -180,6 +203,8 @@ with the same filename but different name
   <texture name="ExternalBrowser_Off" file_name="icons/ExternalBrowser_Off.png" preload="false" />
   <texture name="Edit_Wrench" file_name="icons/Edit_Wrench.png" preload="false" />
 
+  <texture name="Facebook_Icon" file_name="icons/Facebook.png" preload="false" />
+
   <texture name="Favorite_Star_Active" file_name="navbar/Favorite_Star_Active.png" preload="false" />
   <texture name="Favorite_Star_Off" file_name="navbar/Favorite_Star_Off.png" preload="false" />
   <texture name="Favorite_Star_Press" file_name="navbar/Favorite_Star_Press.png" preload="false" />
@@ -304,6 +329,8 @@ with the same filename but different name
 
   <texture name="Locked_Icon" file_name="icons/Locked_Icon.png" preload="false" />
 
+  <texture name="Map_Placeholder_Icon" file_name="icons/map_placeholder.png" preload="true" />
+    
   <texture name="MarketplaceBtn_Off" file_name="widgets/MarketplaceBtn_Off.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
   <texture name="MarketplaceBtn_Selected" file_name="widgets/MarketplaceBtn_Selected.png" preload="true" scale.left="30" scale.top="19" scale.right="35" scale.bottom="4" />
 
@@ -346,6 +373,8 @@ with the same filename but different name
   <texture name="NavBar_BG_NoFav_Bevel" file_name="navbar/NavBar_BG_NoFav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
   <texture name="NavBar_BG_NoNav_Bevel" file_name="navbar/NavBar_BG_NoNav_Bevel.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
 
+  <texture name="Nearby_chat_icon" file_name="icons/nearby_chat_icon.png" preload="false" />
+
   <texture name="Notices_Unread" file_name="bottomtray/Notices_Unread.png" preload="true" />
 
   <texture name="NoEntryLines" file_name="world/NoEntryLines.png" use_mips="true" preload="false" />
@@ -429,6 +458,9 @@ with the same filename but different name
  <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
  <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
 
+  <texture name="Pathfinding_Dirty" file_name="icons/Pathfinding_Dirty.png" preload="false" />
+  <texture name="Pathfinding_Disabled" file_name="icons/Pathfinding_Disabled.png" preload="false" />
+
   <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
   <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
   <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
@@ -541,6 +573,7 @@ with the same filename but different name
   <texture name="Snapshot_Email" file_name="snapshot_email.png" preload="false" />
   <texture name="Snapshot_Inventory" file_name="toolbar_icons/inventory.png" preload="false" />
   <texture name="Snapshot_Profile" file_name="toolbar_icons/profile.png" preload="false" />
+  <texture name="Snapshot_Facebook" file_name="toolbar_icons/facebook.png" preload="false" />
 
   <texture name="startup_logo"  file_name="windows/startup_logo.png" preload="true" />
 
@@ -620,7 +653,6 @@ with the same filename but different name
   <texture name="TrashItem_Press" file_name="icons/TrashItem_Press.png" preload="false" />
 
   <texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
-  <texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
 
   <texture name="UpArrow_Off" file_name="icons/UpArrow_Off.png" preload="false" />
 
@@ -633,12 +665,6 @@ with the same filename but different name
   <texture name="VoicePTT_Off" file_name="bottomtray/VoicePTT_Off.png" preload="false" />
   <texture name="VoicePTT_On" file_name="bottomtray/VoicePTT_On.png" preload="false" />
   
-  <texture name="VoicePTT_Lvl1_Dark" file_name="bottomtray/VoicePTT_Lvl1_Dark.png" preload="false" />
-  <texture name="VoicePTT_Lvl2_Dark" file_name="bottomtray/VoicePTT_Lvl2_Dark.png" preload="false" />
-  <texture name="VoicePTT_Lvl3_Dark" file_name="bottomtray/VoicePTT_Lvl3_Dark.png" preload="false" />
-  <texture name="VoicePTT_Off_Dark" file_name="bottomtray/VoicePTT_Off_Dark.png" preload="false" />
-  <texture name="VoicePTT_On_Dark" file_name="bottomtray/VoicePTT_On_Dark.png" preload="false" />
-
   <texture name="Wearables_Divider" file_name="windows/Wearables_Divider.png" preload="false" />
 
   <texture name="Web_Profile_Off" file_name="icons/Web_Profile_Off.png" preload="false" />
@@ -707,9 +733,6 @@ with the same filename but different name
   <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" />
   <texture name="icon_top_pick.tga" />
 
-  <texture name="inv_folder_mesh.tga"/>
-  <texture name="inv_item_mesh.tga"/>
-
   <texture name="lag_status_critical.tga" />
   <texture name="lag_status_good.tga" />
   <texture name="lag_status_warning.tga" />
@@ -729,6 +752,7 @@ with the same filename but different name
   <texture name="default_land_picture.j2c" />
   <texture name="default_profile_picture.j2c" />
   <texture name="locked_image.j2c" />
+  <texture name="materials_ui_x_24.png" />
 
   <texture name="Progress_1" file_name="icons/Progress_1.png" preload="true" />
   <texture name="Progress_2" file_name="icons/Progress_2.png" preload="true" />
@@ -759,4 +783,7 @@ with the same filename but different name
   <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
   <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
   <texture name="NavBar Separator" file_name="navbar/separator.png"/>
+
+  <texture name="Horizontal Drag Handle" file_name="widgets/horizontal_drag_handle.png"/>
+  <texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png"/>
 </textures>
diff --git a/indra/newview/skins/default/textures/toolbar_icons/appearance.png b/indra/newview/skins/default/textures/toolbar_icons/appearance.png
index e6b1365388..e6b1365388 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/appearance.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/appearance.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/avatars.png b/indra/newview/skins/default/textures/toolbar_icons/avatars.png
index 8fa0600cee..8fa0600cee 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/avatars.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/avatars.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/build.png b/indra/newview/skins/default/textures/toolbar_icons/build.png
index e21ab3f0e4..e21ab3f0e4 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/build.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/build.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
index 5f6a01eaa1..5f6a01eaa1 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/caret_bottom.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png
index 0b8090314c..0b8090314c 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/caret_left.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/caret_left.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png
index 044751560f..044751560f 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/caret_right.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/caret_right.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/chat.png b/indra/newview/skins/default/textures/toolbar_icons/chat.png
index e0dbac495f..e0dbac495f 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/chat.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/chat.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/destinations.png b/indra/newview/skins/default/textures/toolbar_icons/destinations.png
index e2325f083a..e2325f083a 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/destinations.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/destinations.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/facebook.png b/indra/newview/skins/default/textures/toolbar_icons/facebook.png
new file mode 100644
index 0000000000..b960b834dc
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/facebook.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/gestures.png b/indra/newview/skins/default/textures/toolbar_icons/gestures.png
index 2404bb4e25..2404bb4e25 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/gestures.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/gestures.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/highlighting.png b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png
new file mode 100644
index 0000000000..c227f07513
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/highlighting_selected.png b/indra/newview/skins/default/textures/toolbar_icons/highlighting_selected.png
new file mode 100644
index 0000000000..aa1bb26a56
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/highlighting_selected.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/howto.png b/indra/newview/skins/default/textures/toolbar_icons/howto.png
index 8594d71113..8594d71113 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/howto.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/howto.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/inventory.png b/indra/newview/skins/default/textures/toolbar_icons/inventory.png
index ab3191255e..ab3191255e 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/inventory.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/inventory.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/land.png b/indra/newview/skins/default/textures/toolbar_icons/land.png
index 89ea7604a4..89ea7604a4 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/land.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/land.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/map.png b/indra/newview/skins/default/textures/toolbar_icons/map.png
index ed1049b7db..ed1049b7db 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/map.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/map.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/marketplace.png b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png
index 62bad20be6..62bad20be6 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/marketplace.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/marketplace.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
index 9fcf46794d..9fcf46794d 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/mini_cart.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png
index ab0a654056..ab0a654056 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/mini_map.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/mini_map.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/move.png b/indra/newview/skins/default/textures/toolbar_icons/move.png
index 5c2ced7375..5c2ced7375 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/move.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/move.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
index 77a7cd5f44..77a7cd5f44 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/nearbyvoice.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/outbox.png b/indra/newview/skins/default/textures/toolbar_icons/outbox.png
index 0f3db1c47c..0f3db1c47c 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/outbox.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/outbox.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/people.png b/indra/newview/skins/default/textures/toolbar_icons/people.png
index 7228ae8e2f..7228ae8e2f 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/people.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/people.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/picks.png b/indra/newview/skins/default/textures/toolbar_icons/picks.png
index befda04b42..befda04b42 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/picks.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/picks.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/places.png b/indra/newview/skins/default/textures/toolbar_icons/places.png
index 97d9fa066c..97d9fa066c 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/places.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/places.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/preferences.png b/indra/newview/skins/default/textures/toolbar_icons/preferences.png
index 4ccd7b8ae1..4ccd7b8ae1 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/preferences.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/preferences.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/profile.png b/indra/newview/skins/default/textures/toolbar_icons/profile.png
index 32fe2bf8ac..32fe2bf8ac 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/profile.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/profile.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/search.png b/indra/newview/skins/default/textures/toolbar_icons/search.png
index bcb11e950d..bcb11e950d 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/search.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/search.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/snapshot.png b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png
index d26da9b1d2..d26da9b1d2 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/snapshot.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/snapshot.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/speak.png b/indra/newview/skins/default/textures/toolbar_icons/speak.png
index 10cd354c5c..10cd354c5c 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/speak.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/speak.png
diff --git a/indra/newview/skins/default/textures/toolbar_icons/view.png b/indra/newview/skins/default/textures/toolbar_icons/view.png
index ddf0df7c26..ddf0df7c26 100644..100755
--- a/indra/newview/skins/default/textures/toolbar_icons/view.png
+++ b/indra/newview/skins/default/textures/toolbar_icons/view.png
diff --git a/indra/newview/skins/default/textures/transparent.j2c b/indra/newview/skins/default/textures/transparent.j2c
index 1068e940b9..1068e940b9 100644..100755
--- a/indra/newview/skins/default/textures/transparent.j2c
+++ b/indra/newview/skins/default/textures/transparent.j2c
diff --git a/indra/newview/skins/default/textures/up_arrow.png b/indra/newview/skins/default/textures/up_arrow.png
index fe68ad49dc..fe68ad49dc 100644..100755
--- a/indra/newview/skins/default/textures/up_arrow.png
+++ b/indra/newview/skins/default/textures/up_arrow.png
diff --git a/indra/newview/skins/default/textures/uv_test1.j2c b/indra/newview/skins/default/textures/uv_test1.j2c
index 3d5b541796..3d5b541796 100644..100755
--- a/indra/newview/skins/default/textures/uv_test1.j2c
+++ b/indra/newview/skins/default/textures/uv_test1.j2c
diff --git a/indra/newview/skins/default/textures/uv_test2.tga b/indra/newview/skins/default/textures/uv_test2.tga
index a16000d1e4..a16000d1e4 100644..100755
--- a/indra/newview/skins/default/textures/uv_test2.tga
+++ b/indra/newview/skins/default/textures/uv_test2.tga
diff --git a/indra/newview/skins/default/textures/voice_meter_dot.j2c b/indra/newview/skins/default/textures/voice_meter_dot.j2c
index e536c3338a..e536c3338a 100644..100755
--- a/indra/newview/skins/default/textures/voice_meter_dot.j2c
+++ b/indra/newview/skins/default/textures/voice_meter_dot.j2c
diff --git a/indra/newview/skins/default/textures/voice_meter_rings.j2c b/indra/newview/skins/default/textures/voice_meter_rings.j2c
index 17e7c6c6a1..17e7c6c6a1 100644..100755
--- a/indra/newview/skins/default/textures/voice_meter_rings.j2c
+++ b/indra/newview/skins/default/textures/voice_meter_rings.j2c
diff --git a/indra/newview/skins/default/textures/white.tga b/indra/newview/skins/default/textures/white.tga
index 9fe68631cf..9fe68631cf 100644..100755
--- a/indra/newview/skins/default/textures/white.tga
+++ b/indra/newview/skins/default/textures/white.tga
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Down.png b/indra/newview/skins/default/textures/widgets/Arrow_Down.png
index e10f6472eb..e10f6472eb 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Arrow_Down.png
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Down.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Left.png
new file mode 100755
index 0000000000..a424282839
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Left.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Right.png
new file mode 100755
index 0000000000..e32bee8f34
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Right.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png
index 2d624c3779..2d624c3779 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Small_Left.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png
index 91c03c426e..91c03c426e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Small_Right.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png
index 38aac0e5ca..38aac0e5ca 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Small_Up.png
diff --git a/indra/newview/skins/default/textures/widgets/Arrow_Up.png b/indra/newview/skins/default/textures/widgets/Arrow_Up.png
index 48df69d82e..48df69d82e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Arrow_Up.png
+++ b/indra/newview/skins/default/textures/widgets/Arrow_Up.png
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background.png b/indra/newview/skins/default/textures/widgets/Badge_Background.png
index 5089c30312..5089c30312 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Badge_Background.png
+++ b/indra/newview/skins/default/textures/widgets/Badge_Background.png
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Border.png b/indra/newview/skins/default/textures/widgets/Badge_Border.png
index 4b086a63fb..4b086a63fb 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Badge_Border.png
+++ b/indra/newview/skins/default/textures/widgets/Badge_Border.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png
index c7c0eaa96b..c7c0eaa96b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png
index 4a73c254fc..4a73c254fc 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png
index 6fb5c432de..6fb5c432de 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png
index fa18517933..fa18517933 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Left_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png
index bed1a701bd..bed1a701bd 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png
index 57ce9af574..57ce9af574 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png
index 2c43022f0e..2c43022f0e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png
index 6b8c1baca4..6b8c1baca4 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Middle_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png
index 51505e80c5..51505e80c5 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png
index 9f93efbd93..9f93efbd93 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png
index 3a4ec1a315..3a4ec1a315 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png
index 1f1b4c2ed5..1f1b4c2ed5 100644..100755
--- a/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png
+++ b/indra/newview/skins/default/textures/widgets/BreadCrumbBtn_Right_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
index c1ee210099..c1ee210099 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
index 2525405f37..2525405f37 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
index 2d9dba1592..2d9dba1592 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
index beaa7bcbf6..beaa7bcbf6 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
index 5bced95a89..5bced95a89 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
index 44be193678..44be193678 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
index d0fff1b3c3..d0fff1b3c3 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Hover.png b/indra/newview/skins/default/textures/widgets/ComboButton_Hover.png
new file mode 100644
index 0000000000..d492b30b40
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Hover.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
index 80402458b7..80402458b7 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_On.png b/indra/newview/skins/default/textures/widgets/ComboButton_On.png
index b42cc7542e..b42cc7542e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ComboButton_On.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
index bbc0657487..bbc0657487 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
index 2330cb420b..2330cb420b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png
diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
index b7b5c2e1d4..b7b5c2e1d4 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
+++ b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png
diff --git a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png
index 75057938d2..75057938d2 100644..100755
--- a/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png
+++ b/indra/newview/skins/default/textures/widgets/DisclosureArrow_Opened_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
index b295752ea9..b295752ea9 100644..100755
--- a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
index 4764ed4ee2..4764ed4ee2 100644..100755
--- a/indra/newview/skins/default/textures/widgets/DropDown_Off.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png
index 10262d3979..10262d3979 100644..100755
--- a/indra/newview/skins/default/textures/widgets/DropDown_On.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_On.png
diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
index 16cb25cc77..16cb25cc77 100644..100755
--- a/indra/newview/skins/default/textures/widgets/DropDown_Press.png
+++ b/indra/newview/skins/default/textures/widgets/DropDown_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/DropTarget.png b/indra/newview/skins/default/textures/widgets/DropTarget.png
index 3740c98cbc..3740c98cbc 100644..100755
--- a/indra/newview/skins/default/textures/widgets/DropTarget.png
+++ b/indra/newview/skins/default/textures/widgets/DropTarget.png
diff --git a/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png b/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png
index c8dbc8e87a..c8dbc8e87a 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png
+++ b/indra/newview/skins/default/textures/widgets/Error_Tag_Background.png
diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png
index a1f21e8194..a1f21e8194 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png
+++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Alert.png
diff --git a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
index 61f9b076ce..61f9b076ce 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
+++ b/indra/newview/skins/default/textures/widgets/Linden_Dollar_Background.png
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png
index 4b2b9ab3e5..4b2b9ab3e5 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ListItem_Over.png
+++ b/indra/newview/skins/default/textures/widgets/ListItem_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png
index 317c672441..317c672441 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ListItem_Select.png
+++ b/indra/newview/skins/default/textures/widgets/ListItem_Select.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
index e603c44384..e603c44384 100644..100755
--- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
index fbc164123f..fbc164123f 100644..100755
--- a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Background.png b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png
index cd639dd80f..cd639dd80f 100644..100755
--- a/indra/newview/skins/default/textures/widgets/New_Tag_Background.png
+++ b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png
diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Border.png b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png
index 56df0d0127..56df0d0127 100644..100755
--- a/indra/newview/skins/default/textures/widgets/New_Tag_Border.png
+++ b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png
diff --git a/indra/newview/skins/default/textures/widgets/ProgressBar.png b/indra/newview/skins/default/textures/widgets/ProgressBar.png
index 3f0e4eba28..3f0e4eba28 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ProgressBar.png
+++ b/indra/newview/skins/default/textures/widgets/ProgressBar.png
diff --git a/indra/newview/skins/default/textures/widgets/ProgressTrack.png b/indra/newview/skins/default/textures/widgets/ProgressTrack.png
index bb6d9f4144..bb6d9f4144 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ProgressTrack.png
+++ b/indra/newview/skins/default/textures/widgets/ProgressTrack.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
index 04e91bdaab..04e91bdaab 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
index 1ee0329e66..1ee0329e66 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Off.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png
index 661d1c5611..661d1c5611 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_On.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
index 48e8aa2eab..48e8aa2eab 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_On_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
index c227f07513..c227f07513 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Over.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
index 0a4a3a6ad9..0a4a3a6ad9 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Press.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
index 0a4a3a6ad9..0a4a3a6ad9 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
index 661d1c5611..661d1c5611 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
index 48e8aa2eab..48e8aa2eab 100644..100755
--- a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
+++ b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
index a1052684b9..a1052684b9 100644..100755
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
index c58e0305ef..c58e0305ef 100644..100755
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
index c09a2197c7..c09a2197c7 100644..100755
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
index d7d444fd0c..d7d444fd0c 100644..100755
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
index a707e8ceb8..a707e8ceb8 100644..100755
--- a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
index 33eaa14030..33eaa14030 100644..100755
--- a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
+++ b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
index 186822da43..186822da43 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png
index a396380fb2..a396380fb2 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png
index 9568dea78a..9568dea78a 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Down_Over_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
index 42f999a451..42f999a451 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
index 549b3980f6..549b3980f6 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
index a74abd5d8a..a74abd5d8a 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Left_Over_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
index 176ffcdbb9..176ffcdbb9 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
index 36056d0ad9..36056d0ad9 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
index 0c1fd6956b..0c1fd6956b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Right_Over_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
index 4d245eb57a..4d245eb57a 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png
index 67a7a5568b..67a7a5568b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png
index 0cc8c4404b..0cc8c4404b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollArrow_Up_Over_Opaque.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
index 8a085aa966..8a085aa966 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
index fc7fd93e7a..fc7fd93e7a 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
index 4f31c48c02..4f31c48c02 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
index f89ee3f68f..f89ee3f68f 100644..100755
--- a/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
+++ b/indra/newview/skins/default/textures/widgets/ScrollTrack_Vert.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
index 3b39c51a77..3b39c51a77 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
index 57ed79d733..57ed79d733 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
index 5b8878e0cb..5b8878e0cb 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
index 379953216b..379953216b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
index 379953216b..379953216b 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
index 77c4224539..77c4224539 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
index 8b93dd551e..8b93dd551e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
index 3f207cbea2..3f207cbea2 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Left_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
index deb87c8489..deb87c8489 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
index ca7027da91..ca7027da91 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
index 220df9db25..220df9db25 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
index dde367f05e..dde367f05e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
index 8e6b9c8c6f..8e6b9c8c6f 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
index b1521199ff..b1521199ff 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
index 1574f48b28..1574f48b28 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_On_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
index 2717e7d7b0..2717e7d7b0 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Over.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
index 3883518033..3883518033 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
index 3883518033..3883518033 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
index ab31f6ded7..ab31f6ded7 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
index 1574f48b28..1574f48b28 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Right_Selected_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
index b627232012..b627232012 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
index b627232012..b627232012 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
index 7081f9cfe0..7081f9cfe0 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
+++ b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
index 232006ee5a..232006ee5a 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
+++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png
diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
index cd002b3973..cd002b3973 100644..100755
--- a/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
+++ b/indra/newview/skins/default/textures/widgets/SliderTrack_Vert.png
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
index cf0d8ee2c1..cf0d8ee2c1 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
index fe3a7beafd..fe3a7beafd 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
index 133589b8a6..133589b8a6 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
index e83babc519..e83babc519 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
+++ b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Active.png
index ca6daab4e0..ca6daab4e0 100644..100755
--- a/indra/newview/skins/default/textures/widgets/TextField_Active.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Active.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
index 3d205a3f2e..3d205a3f2e 100644..100755
--- a/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Off.png
index 911d907acc..911d907acc 100644..100755
--- a/indra/newview/skins/default/textures/widgets/TextField_Off.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
index fa79cb6260..fa79cb6260 100644..100755
--- a/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Active.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
index 8b504af101..8b504af101 100644..100755
--- a/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Disabled.png
diff --git a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
index 862b13d219..862b13d219 100644..100755
--- a/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
+++ b/indra/newview/skins/default/textures/widgets/TextField_Search_Off.png
diff --git a/indra/newview/skins/default/textures/widgets/Tooltip.png b/indra/newview/skins/default/textures/widgets/Tooltip.png
index f989ac9083..f989ac9083 100644..100755
--- a/indra/newview/skins/default/textures/widgets/Tooltip.png
+++ b/indra/newview/skins/default/textures/widgets/Tooltip.png
diff --git a/indra/newview/skins/default/textures/widgets/bevel_background.png b/indra/newview/skins/default/textures/widgets/bevel_background.png
index fb5067503d..fb5067503d 100644..100755
--- a/indra/newview/skins/default/textures/widgets/bevel_background.png
+++ b/indra/newview/skins/default/textures/widgets/bevel_background.png
diff --git a/indra/newview/skins/default/textures/widgets/buy_off.png b/indra/newview/skins/default/textures/widgets/buy_off.png
index ee5979046f..ee5979046f 100644..100755
--- a/indra/newview/skins/default/textures/widgets/buy_off.png
+++ b/indra/newview/skins/default/textures/widgets/buy_off.png
diff --git a/indra/newview/skins/default/textures/widgets/buy_over.png b/indra/newview/skins/default/textures/widgets/buy_over.png
index 93adb68c86..93adb68c86 100644..100755
--- a/indra/newview/skins/default/textures/widgets/buy_over.png
+++ b/indra/newview/skins/default/textures/widgets/buy_over.png
diff --git a/indra/newview/skins/default/textures/widgets/buy_press.png b/indra/newview/skins/default/textures/widgets/buy_press.png
index 3f442d6eaa..3f442d6eaa 100644..100755
--- a/indra/newview/skins/default/textures/widgets/buy_press.png
+++ b/indra/newview/skins/default/textures/widgets/buy_press.png
diff --git a/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png b/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png
new file mode 100644
index 0000000000..642eac4065
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/horizontal_drag_handle.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_in.png b/indra/newview/skins/default/textures/widgets/jump_left_in.png
index a1425ccfa0..a1425ccfa0 100644..100755
--- a/indra/newview/skins/default/textures/widgets/jump_left_in.png
+++ b/indra/newview/skins/default/textures/widgets/jump_left_in.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_left_out.png b/indra/newview/skins/default/textures/widgets/jump_left_out.png
index 38edf47d19..38edf47d19 100644..100755
--- a/indra/newview/skins/default/textures/widgets/jump_left_out.png
+++ b/indra/newview/skins/default/textures/widgets/jump_left_out.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_in.png b/indra/newview/skins/default/textures/widgets/jump_right_in.png
index 39359ab2e2..39359ab2e2 100644..100755
--- a/indra/newview/skins/default/textures/widgets/jump_right_in.png
+++ b/indra/newview/skins/default/textures/widgets/jump_right_in.png
diff --git a/indra/newview/skins/default/textures/widgets/jump_right_out.png b/indra/newview/skins/default/textures/widgets/jump_right_out.png
index 3f76bbffac..3f76bbffac 100644..100755
--- a/indra/newview/skins/default/textures/widgets/jump_right_out.png
+++ b/indra/newview/skins/default/textures/widgets/jump_right_out.png
diff --git a/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png b/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png
new file mode 100644
index 0000000000..b06b70cf36
--- /dev/null
+++ b/indra/newview/skins/default/textures/widgets/vertical_drag_handle.png
diff --git a/indra/newview/skins/default/textures/windows/Dragbar.png b/indra/newview/skins/default/textures/windows/Dragbar.png
index d94dda1aae..d94dda1aae 100644..100755
--- a/indra/newview/skins/default/textures/windows/Dragbar.png
+++ b/indra/newview/skins/default/textures/windows/Dragbar.png
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Left.png b/indra/newview/skins/default/textures/windows/Flyout_Left.png
index 6ac9fe2efd..6ac9fe2efd 100644..100755
--- a/indra/newview/skins/default/textures/windows/Flyout_Left.png
+++ b/indra/newview/skins/default/textures/windows/Flyout_Left.png
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
index 69fc08ceaa..69fc08ceaa 100644..100755
--- a/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
+++ b/indra/newview/skins/default/textures/windows/Flyout_Pointer.png
diff --git a/indra/newview/skins/default/textures/windows/Flyout_Right.png b/indra/newview/skins/default/textures/windows/Flyout_Right.png
index aa1f0625aa..aa1f0625aa 100644..100755
--- a/indra/newview/skins/default/textures/windows/Flyout_Right.png
+++ b/indra/newview/skins/default/textures/windows/Flyout_Right.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
index 2292b79eda..2292b79eda 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Close_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
index ea547fca6f..ea547fca6f 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Close_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
index ecf01c617a..ecf01c617a 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Close_Toast.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
index 4207ba68e5..4207ba68e5 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
index 2d09475783..2d09475783 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Dock_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
index 93d62a8d4f..93d62a8d4f 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
index b2b2a77a88..b2b2a77a88 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
index 6fc3744d6b..6fc3744d6b 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
index 1a514742d3..1a514742d3 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Help_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
index 7478644b6a..7478644b6a 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Help_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
index 9f72a5422b..9f72a5422b 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Minimize_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
index 07db8be1b0..07db8be1b0 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Minimize_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png
index 1e753aaf1d..1e753aaf1d 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png
index be66b05230..be66b05230 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Restore_Press.png
diff --git a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
index 9a71d16a3f..9a71d16a3f 100644..100755
--- a/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Icon_Undock_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_Background.png b/indra/newview/skins/default/textures/windows/Inspector_Background.png
index 4c2a728ac5..4c2a728ac5 100644..100755
--- a/indra/newview/skins/default/textures/windows/Inspector_Background.png
+++ b/indra/newview/skins/default/textures/windows/Inspector_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_Hover.png b/indra/newview/skins/default/textures/windows/Inspector_Hover.png
index feeee78033..feeee78033 100644..100755
--- a/indra/newview/skins/default/textures/windows/Inspector_Hover.png
+++ b/indra/newview/skins/default/textures/windows/Inspector_Hover.png
diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png
index b4875fd638..b4875fd638 100644..100755
--- a/indra/newview/skins/default/textures/windows/Inspector_I.png
+++ b/indra/newview/skins/default/textures/windows/Inspector_I.png
diff --git a/indra/newview/skins/default/textures/windows/Resize_Corner.png b/indra/newview/skins/default/textures/windows/Resize_Corner.png
index 16ed63e428..16ed63e428 100644..100755
--- a/indra/newview/skins/default/textures/windows/Resize_Corner.png
+++ b/indra/newview/skins/default/textures/windows/Resize_Corner.png
diff --git a/indra/newview/skins/default/textures/windows/Toast_Background.png b/indra/newview/skins/default/textures/windows/Toast_Background.png
index f27d1a12ec..f27d1a12ec 100644..100755
--- a/indra/newview/skins/default/textures/windows/Toast_Background.png
+++ b/indra/newview/skins/default/textures/windows/Toast_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
index 78b137cdaf..78b137cdaf 100644..100755
--- a/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
+++ b/indra/newview/skins/default/textures/windows/Toast_CloseBtn.png
diff --git a/indra/newview/skins/default/textures/windows/Toast_Over.png b/indra/newview/skins/default/textures/windows/Toast_Over.png
index 807e8e553c..807e8e553c 100644..100755
--- a/indra/newview/skins/default/textures/windows/Toast_Over.png
+++ b/indra/newview/skins/default/textures/windows/Toast_Over.png
diff --git a/indra/newview/skins/default/textures/windows/Volume_Background.png b/indra/newview/skins/default/textures/windows/Volume_Background.png
index 43aaa441f5..43aaa441f5 100644..100755
--- a/indra/newview/skins/default/textures/windows/Volume_Background.png
+++ b/indra/newview/skins/default/textures/windows/Volume_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Wearables_Divider.png b/indra/newview/skins/default/textures/windows/Wearables_Divider.png
index 9dce7bf45c..9dce7bf45c 100644..100755
--- a/indra/newview/skins/default/textures/windows/Wearables_Divider.png
+++ b/indra/newview/skins/default/textures/windows/Wearables_Divider.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
index db253900af..db253900af 100644..100755
--- a/indra/newview/skins/default/textures/windows/Window_Background.png
+++ b/indra/newview/skins/default/textures/windows/Window_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
index b81ec5b43c..b81ec5b43c 100644..100755
--- a/indra/newview/skins/default/textures/windows/Window_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
index a570ac06bd..a570ac06bd 100644..100755
--- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
+++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
index d573e8c69a..d573e8c69a 100644..100755
--- a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_down.png b/indra/newview/skins/default/textures/windows/hint_arrow_down.png
index ddadef0978..ddadef0978 100644..100755
--- a/indra/newview/skins/default/textures/windows/hint_arrow_down.png
+++ b/indra/newview/skins/default/textures/windows/hint_arrow_down.png
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_left.png
index 2794b967e8..2794b967e8 100644..100755
--- a/indra/newview/skins/default/textures/windows/hint_arrow_left.png
+++ b/indra/newview/skins/default/textures/windows/hint_arrow_left.png
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png
index 0dfc99898d..0dfc99898d 100644..100755
--- a/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png
+++ b/indra/newview/skins/default/textures/windows/hint_arrow_lower_left.png
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_right.png b/indra/newview/skins/default/textures/windows/hint_arrow_right.png
index 7ac57f805b..7ac57f805b 100644..100755
--- a/indra/newview/skins/default/textures/windows/hint_arrow_right.png
+++ b/indra/newview/skins/default/textures/windows/hint_arrow_right.png
diff --git a/indra/newview/skins/default/textures/windows/hint_arrow_up.png b/indra/newview/skins/default/textures/windows/hint_arrow_up.png
index bb3e1c07fa..bb3e1c07fa 100644..100755
--- a/indra/newview/skins/default/textures/windows/hint_arrow_up.png
+++ b/indra/newview/skins/default/textures/windows/hint_arrow_up.png
diff --git a/indra/newview/skins/default/textures/windows/hint_background.png b/indra/newview/skins/default/textures/windows/hint_background.png
index cfac5deacb..cfac5deacb 100644..100755
--- a/indra/newview/skins/default/textures/windows/hint_background.png
+++ b/indra/newview/skins/default/textures/windows/hint_background.png
diff --git a/indra/newview/skins/default/textures/windows/startup_logo.png b/indra/newview/skins/default/textures/windows/startup_logo.png
index b89449692b..b89449692b 100644..100755
--- a/indra/newview/skins/default/textures/windows/startup_logo.png
+++ b/indra/newview/skins/default/textures/windows/startup_logo.png
diff --git a/indra/newview/skins/default/textures/windows/yellow_gradient.png b/indra/newview/skins/default/textures/windows/yellow_gradient.png
index 5fd847aaef..5fd847aaef 100644..100755
--- a/indra/newview/skins/default/textures/windows/yellow_gradient.png
+++ b/indra/newview/skins/default/textures/windows/yellow_gradient.png
diff --git a/indra/newview/skins/default/textures/world/BeaconArrow.png b/indra/newview/skins/default/textures/world/BeaconArrow.png
index 54934f738a..54934f738a 100644..100755
--- a/indra/newview/skins/default/textures/world/BeaconArrow.png
+++ b/indra/newview/skins/default/textures/world/BeaconArrow.png
diff --git a/indra/newview/skins/default/textures/world/CameraDragDot.png b/indra/newview/skins/default/textures/world/CameraDragDot.png
index 57698e1956..57698e1956 100644..100755
--- a/indra/newview/skins/default/textures/world/CameraDragDot.png
+++ b/indra/newview/skins/default/textures/world/CameraDragDot.png
diff --git a/indra/newview/skins/default/textures/world/NoEntryLines.png b/indra/newview/skins/default/textures/world/NoEntryLines.png
index 18e270bde5..18e270bde5 100644..100755
--- a/indra/newview/skins/default/textures/world/NoEntryLines.png
+++ b/indra/newview/skins/default/textures/world/NoEntryLines.png
diff --git a/indra/newview/skins/default/textures/world/NoEntryPassLines.png b/indra/newview/skins/default/textures/world/NoEntryPassLines.png
index e4b8fc6ae2..e4b8fc6ae2 100644..100755
--- a/indra/newview/skins/default/textures/world/NoEntryPassLines.png
+++ b/indra/newview/skins/default/textures/world/NoEntryPassLines.png
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index fc8bc33096..9206690c8f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -8,7 +8,7 @@
 		Bygget med [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Du er ved [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Du er ved [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 5b9e618666..5b9e618666 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
diff --git a/indra/newview/skins/default/xui/da/floater_activeim.xml b/indra/newview/skins/default/xui/da/floater_activeim.xml
index 6fdac8d880..6fdac8d880 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/da/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index adf96841c0..adf96841c0 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml
index e74e8a991b..e74e8a991b 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_auction.xml
+++ b/indra/newview/skins/default/xui/da/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
index e97089f61e..e97089f61e 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
index d0d766eaab..d0d766eaab 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
index 5100a6df1f..5100a6df1f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
index d3c3ac1899..d3c3ac1899 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/da/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
index 58a1c1b73e..58a1c1b73e 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/da/floater_bulk_perms.xml
diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml
index 6b265832cd..6b265832cd 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/da/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
index 085fa2f9cc..085fa2f9cc 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index 3c0428b2b0..3c0428b2b0 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
index e32b25ca17..e32b25ca17 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index f6ee78fa6d..f6ee78fa6d 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml
index 7eb4787139..7eb4787139 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
index b5d5e8bc08..b5d5e8bc08 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_camera.xml
+++ b/indra/newview/skins/default/xui/da/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml
index 1ccda4f1d7..1ccda4f1d7 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/da/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
index f744b06277..f744b06277 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml
index 8c2672f39f..8c2672f39f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_critical.xml
+++ b/indra/newview/skins/default/xui/da/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/da/floater_display_name.xml b/indra/newview/skins/default/xui/da/floater_display_name.xml
index e848006d8b..e848006d8b 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/da/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/da/floater_event.xml b/indra/newview/skins/default/xui/da/floater_event.xml
index a9eddaaf8d..a9eddaaf8d 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_event.xml
+++ b/indra/newview/skins/default/xui/da/floater_event.xml
diff --git a/indra/newview/skins/default/xui/da/floater_font_test.xml b/indra/newview/skins/default/xui/da/floater_font_test.xml
index 591d07188c..591d07188c 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/da/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/da/floater_gesture.xml b/indra/newview/skins/default/xui/da/floater_gesture.xml
index b7075e356a..b7075e356a 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/da/floater_god_tools.xml b/indra/newview/skins/default/xui/da/floater_god_tools.xml
index 5d3453e327..5d3453e327 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
index a5942eb625..a5942eb625 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_hardware_settings.xml
diff --git a/indra/newview/skins/default/xui/da/floater_help_browser.xml b/indra/newview/skins/default/xui/da/floater_help_browser.xml
index 4eba4aee1f..4eba4aee1f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/da/floater_hud.xml b/indra/newview/skins/default/xui/da/floater_hud.xml
index c70da45955..c70da45955 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_hud.xml
+++ b/indra/newview/skins/default/xui/da/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/da/floater_im_container.xml b/indra/newview/skins/default/xui/da/floater_im_container.xml
index 28b2f7f7eb..28b2f7f7eb 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/da/floater_im_container.xml
diff --git a/indra/newview/skins/default/xui/da/floater_im_session.xml b/indra/newview/skins/default/xui/da/floater_im_session.xml
index 16df7e4b03..16df7e4b03 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/da/floater_im_session.xml
diff --git a/indra/newview/skins/default/xui/da/floater_image_preview.xml b/indra/newview/skins/default/xui/da/floater_image_preview.xml
index 5355127ef5..5355127ef5 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/da/floater_import_collada.xml b/indra/newview/skins/default/xui/da/floater_import_collada.xml
index ebc7c86388..ebc7c86388 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/da/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/da/floater_incoming_call.xml b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
index dd8cb6f97a..dd8cb6f97a 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/da/floater_incoming_call.xml
diff --git a/indra/newview/skins/default/xui/da/floater_inspect.xml b/indra/newview/skins/default/xui/da/floater_inspect.xml
index d0dca8863a..d0dca8863a 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/da/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
index 3a4b0fbd6b..3a4b0fbd6b 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory.xml
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
index 59dcc87140..59dcc87140 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
index 655701bb96..655701bb96 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 49e1397e9f..49e1397e9f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
index 149d174c34..149d174c34 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
index b3c12627f7..b3c12627f7 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
index 0cc13fd736..0cc13fd736 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
index 2594d6bb9d..2594d6bb9d 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/da/floater_map.xml b/indra/newview/skins/default/xui/da/floater_map.xml
index 4912d73ba0..4912d73ba0 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_map.xml
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
index d3028c32f9..d3028c32f9 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/da/floater_media_settings.xml b/indra/newview/skins/default/xui/da/floater_media_settings.xml
index 67c122b9d5..67c122b9d5 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml
index 60bb3149a5..60bb3149a5 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/da/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/da/floater_model_preview.xml b/indra/newview/skins/default/xui/da/floater_model_preview.xml
index a98c70ff52..a98c70ff52 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_model_preview.xml
diff --git a/indra/newview/skins/default/xui/da/floater_model_wizard.xml b/indra/newview/skins/default/xui/da/floater_model_wizard.xml
deleted file mode 100644
index 8ad443581a..0000000000
--- a/indra/newview/skins/default/xui/da/floater_model_wizard.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="UPLOAD MODEL WIZARD">
-	<button label="5. Upload" name="upload_btn"/>
-	<button label="4. Review" name="review_btn"/>
-	<button label="3. Physics" name="physics2_btn"/>
-	<button label="3. Physics" name="physics_btn"/>
-	<button label="2. Optimize" name="optimize_btn"/>
-	<button label="1. Choose File" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Upload Model
-			</text>
-		</panel>
-		<text name="description">
-			This wizard will help you import mesh models to Second Life.  First specify a file containing the model you wish to import.  Second Life supports COLLADA (.dae) files.
-		</text>
-		<panel name="content">
-			<text name="Cache location">
-				Filename:
-			</text>
-			<button label="Browse..." label_selected="Browse..." name="browse"/>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Optimize
-			</text>
-		</panel>
-		<text name="description">
-			This wizard has optimized your model to improve performance. You may adjust the results of the optimization process bellow or click Next to continue.
-		</text>
-		<panel name="content">
-			<text name="high_detail_text">
-				Generate Level of Detail: High
-			</text>
-			<text name="medium_detail_text">
-				Generate Level of Detail: Medium
-			</text>
-			<text name="low_detail_text">
-				Generate Level of Detail: Low
-			</text>
-			<text name="lowest_detail_text">
-				Generate Level of Detail: Lowest
-			</text>
-		</panel>
-		<panel name="content2">
-			<text name="lod_label">
-				Model Preview:
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
-				</combo_item>
-				<combo_item name="medium">
-					Medium
-				</combo_item>
-				<combo_item name="low">
-					Low
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest
-				</combo_item>
-			</combo_box>
-			<text name="streaming cost">
-				Resource Cost:    [COST]
-			</text>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Physics
-			</text>
-		</panel>
-		<text name="description">
-			The wizard will create a physical shape, which determines how the object interacts with other objects and avatars. Set the slider to the detail level most appropriate for how your object will be used:
-		</text>
-		<panel name="content">
-			<text name="streaming cost">
-				Resource Cost:       [COST]
-			</text>
-		</panel>
-	</panel>
-	<panel name="physics2_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Physics
-			</text>
-		</panel>
-		<text name="description">
-			Preview the physics shape below then click Next to continue.  To modify the physics shape, click the Back button.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Model Preview:
-			</text>
-			<combo_box name="preview_lod_combo3" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
-				</combo_item>
-				<combo_item name="medium">
-					Medium
-				</combo_item>
-				<combo_item name="low">
-					Low
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-			<text name="streaming cost">
-				Resource Cost:       [COST]
-			</text>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Review
-			</text>
-		</panel>
-		<text name="description">
-			Review the details below then click. Upload to upload your model. Your L$ balance will be charged when you click Upload.
-		</text>
-		<panel name="content">
-			<text name="lod_label">
-				Model Preview:
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High
-				</combo_item>
-				<combo_item name="medium">
-					Medium
-				</combo_item>
-				<combo_item name="low">
-					Low
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest
-				</combo_item>
-			</combo_box>
-			<text name="dimensions">
-				X:         Y:         Z:
-			</text>
-			<text name="dimension_dividers">
-				|               |
-			</text>
-		</panel>
-		<text name="streaming cost">
-			Resource Cost:         [COST]
-		</text>
-		<text name="physics cost">
-			Physics Cost:        [COST]
-		</text>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="header_panel">
-			<text name="header_text">
-				Upload Complete!
-			</text>
-		</panel>
-		<text name="description">
-			Congratulations! Your model has been sucessfully uploaded.  You will find the model in the Objects folder in your inventory.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Back" name="back"/>
-	<button label="Next &gt;&gt;" name="next"/>
-	<button label="Upload" name="upload" tool_tip="Upload to simulator"/>
-	<button label="Cancel" name="cancel"/>
-	<button label="Close" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Idle
-	</string>
-	<string name="status_reading_file">
-		Loading...
-	</string>
-	<string name="status_generating_meshes">
-		Generating Meshes...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Error: Vertex number is more than 65534, aborted!
-	</string>
-	<string name="high">
-		High
-	</string>
-	<string name="medium">
-		Medium
-	</string>
-	<string name="low">
-		Low
-	</string>
-	<string name="lowest">
-		Lowest
-	</string>
-	<string name="mesh_status_good">
-		Ship it!
-	</string>
-	<string name="mesh_status_na">
-		N/A
-	</string>
-	<string name="mesh_status_none">
-		None
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Levels of detail have a different number of textureable faces.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Levels of detail have a different number of mesh instances.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		Level of detail has too many vertices.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Missing required level of detail.
-	</string>
-	<string name="layer_all">
-		All
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
index 14d3604b43..14d3604b43 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/da/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
index 3b3f670792..3b3f670792 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
index 76bc40edac..76bc40edac 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/da/floater_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml
index 92fdd1e0a6..92fdd1e0a6 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/da/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
index a5545668a2..a5545668a2 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/da/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml
index 96ec106803..96ec106803 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_pay.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
index 260b257c33..260b257c33 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
index eecddbcdb0..eecddbcdb0 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/da/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml
index 44b0fd4faa..44b0fd4faa 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/da/floater_postcard.xml
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
index 6caac14cf5..6caac14cf5 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/da/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
index 436843decc..436843decc 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index bd2b194717..bd2b194717 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index 5a0f5a32c0..5a0f5a32c0 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
index 21f7656462..21f7656462 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
index 48cf53f563..48cf53f563 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
index b091fa09b5..b091fa09b5 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/da/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/da/floater_publish_classified.xml b/indra/newview/skins/default/xui/da/floater_publish_classified.xml
index 0f65e6c18a..0f65e6c18a 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/da/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml
index 71313f4fea..71313f4fea 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/da/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/da/floater_region_info.xml b/indra/newview/skins/default/xui/da/floater_region_info.xml
index ae00f90f16..ae00f90f16 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/da/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index 07978792b9..07978792b9 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml
index df60a2e23f..df60a2e23f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/da/floater_script_limits.xml b/indra/newview/skins/default/xui/da/floater_script_limits.xml
index a7f86a782a..a7f86a782a 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
index 1aacab6915..1aacab6915 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml
index 1ff5494458..1ff5494458 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml
index f1605cac34..f1605cac34 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/da/floater_search.xml b/indra/newview/skins/default/xui/da/floater_search.xml
index 80a30b1aa1..80a30b1aa1 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_search.xml
+++ b/indra/newview/skins/default/xui/da/floater_search.xml
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
index 9f7aad5e03..9f7aad5e03 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/da/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
index 873e6d7995..873e6d7995 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index f7eda56e48..f7eda56e48 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 926c2429ac..926c2429ac 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
index cb4cbba570..cb4cbba570 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
index 5f74f28a23..5f74f28a23 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
index fe3fa9626e..fe3fa9626e 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_stats.xml
+++ b/indra/newview/skins/default/xui/da/floater_stats.xml
diff --git a/indra/newview/skins/default/xui/da/floater_sys_well.xml b/indra/newview/skins/default/xui/da/floater_sys_well.xml
index f203c2504f..f203c2504f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/da/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
index 5a0e89aa98..5a0e89aa98 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/da/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
index fbc7fe2319..fbc7fe2319 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 815bde456e..9be129bbf6 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -462,10 +462,6 @@
 				<combo_box.item label="Rør" name="suction"/>
 				<combo_box.item label="Væv" name="weave"/>
 			</combo_box>
-			<check_box initial_value="falsk" label="Flugt planare overflader" name="checkbox planar align" tool_tip="Flugt teksuter på alle valgte overflader med den sidst valgte overflade. Kræver at planar tekstur-mapning er valgt."/>
-			<text name="rpt">
-				Gentagelser / overflade
-			</text>
 			<spinner label="Vandret (U)" name="TexScaleU"/>
 			<check_box label="Vend" name="checkbox flip s"/>
 			<spinner label="Lodret (V)" name="TexScaleV"/>
diff --git a/indra/newview/skins/default/xui/da/floater_top_objects.xml b/indra/newview/skins/default/xui/da/floater_top_objects.xml
index 86c24d2c19..86c24d2c19 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/da/floater_top_objects.xml
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index af9ee0bd06..af9ee0bd06 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/da/floater_url_entry.xml b/indra/newview/skins/default/xui/da/floater_url_entry.xml
index 30b3b7184b..30b3b7184b 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/da/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/da/floater_voice_controls.xml b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
index 69de696bf5..69de696bf5 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/da/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
index 86ad251103..86ad251103 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/da/floater_web_content.xml b/indra/newview/skins/default/xui/da/floater_web_content.xml
index 74092e88ec..74092e88ec 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/da/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
index 443e84b64a..443e84b64a 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/da/floater_window_size.xml b/indra/newview/skins/default/xui/da/floater_window_size.xml
index db8ead21bd..db8ead21bd 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/da/floater_window_size.xml
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index 97364e0f9f..97364e0f9f 100644..100755
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/da/inspect_avatar.xml b/indra/newview/skins/default/xui/da/inspect_avatar.xml
index dc1ed562eb..dc1ed562eb 100644..100755
--- a/indra/newview/skins/default/xui/da/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/da/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/da/inspect_group.xml b/indra/newview/skins/default/xui/da/inspect_group.xml
index 486c5d8784..486c5d8784 100644..100755
--- a/indra/newview/skins/default/xui/da/inspect_group.xml
+++ b/indra/newview/skins/default/xui/da/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/da/inspect_object.xml b/indra/newview/skins/default/xui/da/inspect_object.xml
index 78ccc5b869..78ccc5b869 100644..100755
--- a/indra/newview/skins/default/xui/da/inspect_object.xml
+++ b/indra/newview/skins/default/xui/da/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/da/inspect_remote_object.xml b/indra/newview/skins/default/xui/da/inspect_remote_object.xml
index a06452afe6..a06452afe6 100644..100755
--- a/indra/newview/skins/default/xui/da/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/da/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml
index 0e3cbfd2d2..0e3cbfd2d2 100644..100755
--- a/indra/newview/skins/default/xui/da/language_settings.xml
+++ b/indra/newview/skins/default/xui/da/language_settings.xml
diff --git a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml
index 1e8301dc4c..1e8301dc4c 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_other.xml b/indra/newview/skins/default/xui/da/menu_attachment_other.xml
index ca7b184942..ca7b184942 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/da/menu_attachment_other.xml
diff --git a/indra/newview/skins/default/xui/da/menu_attachment_self.xml b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
index 35ba27f9e2..35ba27f9e2 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_attachment_self.xml
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml
index 26b58ce1ab..26b58ce1ab 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_other.xml b/indra/newview/skins/default/xui/da/menu_avatar_other.xml
index a778dedf0b..a778dedf0b 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_other.xml
diff --git a/indra/newview/skins/default/xui/da/menu_avatar_self.xml b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
index 4e6b42a744..4e6b42a744 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/da/menu_avatar_self.xml
diff --git a/indra/newview/skins/default/xui/da/menu_bottomtray.xml b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
index a0d74db36d..a0d74db36d 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/menu_bottomtray.xml
diff --git a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml
index 9d7fc0f223..9d7fc0f223 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/da/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml
index 0e90d5a3ae..0e90d5a3ae 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/da/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml
index 16c225b7d9..16c225b7d9 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/da/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/da/menu_cof_gear.xml b/indra/newview/skins/default/xui/da/menu_cof_gear.xml
index f44369fd84..f44369fd84 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_cof_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_edit.xml b/indra/newview/skins/default/xui/da/menu_edit.xml
index 3752f42b1c..3752f42b1c 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_edit.xml
+++ b/indra/newview/skins/default/xui/da/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/da/menu_favorites.xml b/indra/newview/skins/default/xui/da/menu_favorites.xml
index a4793e294c..a4793e294c 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/da/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml
index a9010e99b6..a9010e99b6 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_group_plus.xml b/indra/newview/skins/default/xui/da/menu_group_plus.xml
index 97fbec1ed1..97fbec1ed1 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/da/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml
index d96a8a8a17..d96a8a8a17 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/da/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/da/menu_im_well_button.xml b/indra/newview/skins/default/xui/da/menu_im_well_button.xml
deleted file mode 100644
index 4889230919..0000000000
--- a/indra/newview/skins/default/xui/da/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Luk alle" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml
index f64a6ad455..f64a6ad455 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/da/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml
index b89d9a5789..b89d9a5789 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/da/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml
index 6ebc40a8dd..6ebc40a8dd 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/da/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
index 8da35adb1b..8da35adb1b 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml
index e28842836d..e28842836d 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
index 887c6484bc..887c6484bc 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml
index c3b03232bf..c3b03232bf 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/da/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index f9bdf36f1f..f9bdf36f1f 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_add.xml b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
index eca03d3ee9..eca03d3ee9 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
index 4809b24463..4809b24463 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/da/menu_land.xml b/indra/newview/skins/default/xui/da/menu_land.xml
index 1548f18f89..1548f18f89 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_land.xml
+++ b/indra/newview/skins/default/xui/da/menu_land.xml
diff --git a/indra/newview/skins/default/xui/da/menu_landmark.xml b/indra/newview/skins/default/xui/da/menu_landmark.xml
index 3cf2ffe375..3cf2ffe375 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/da/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
index 0b7a5040ae..0b7a5040ae 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_login.xml
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
diff --git a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
index 788b1c4b59..788b1c4b59 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/da/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml
index 186dbd476a..186dbd476a 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
index d9626692d5..d9626692d5 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/da/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/da/menu_navbar.xml b/indra/newview/skins/default/xui/da/menu_navbar.xml
index c04206824a..c04206824a 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/da/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml
index be532ad406..be532ad406 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/da/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
index 40b35b5fdd..40b35b5fdd 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/da/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/da/menu_object.xml b/indra/newview/skins/default/xui/da/menu_object.xml
index ba62ccf90c..ba62ccf90c 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_object.xml
+++ b/indra/newview/skins/default/xui/da/menu_object.xml
diff --git a/indra/newview/skins/default/xui/da/menu_object_icon.xml b/indra/newview/skins/default/xui/da/menu_object_icon.xml
index 08aeb633b6..08aeb633b6 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/da/menu_object_icon.xml
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
index 0b0fff3b93..0b0fff3b93 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_outfit_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
index d6a6f2724f..d6a6f2724f 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/da/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/da/menu_participant_list.xml b/indra/newview/skins/default/xui/da/menu_participant_list.xml
index 5951d3ffb9..5951d3ffb9 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/da/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
index 32c5e6a6c7..32c5e6a6c7 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups.xml b/indra/newview/skins/default/xui/da/menu_people_groups.xml
index 841f58b619..841f58b619 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_groups.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
index 0b9a791530..0b9a791530 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby.xml b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
index 5470c32761..5470c32761 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
index 9318a0e340..9318a0e340 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby_multiselect.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
index 2f35ff3c92..2f35ff3c92 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
index d081f637f2..d081f637f2 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/da/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/da/menu_picks.xml b/indra/newview/skins/default/xui/da/menu_picks.xml
index 81ee900773..81ee900773 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_picks.xml
+++ b/indra/newview/skins/default/xui/da/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/da/menu_picks_plus.xml b/indra/newview/skins/default/xui/da/menu_picks_plus.xml
index d95071fbbb..d95071fbbb 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/da/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/da/menu_place.xml b/indra/newview/skins/default/xui/da/menu_place.xml
index b87964ac14..b87964ac14 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_place.xml
+++ b/indra/newview/skins/default/xui/da/menu_place.xml
diff --git a/indra/newview/skins/default/xui/da/menu_place_add_button.xml b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
index 7ad2253550..7ad2253550 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/da/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
index 5f573c2363..5f573c2363 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
index 13dbcdd42e..13dbcdd42e 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/da/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
index 6745007c99..6745007c99 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/da/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/da/menu_save_outfit.xml b/indra/newview/skins/default/xui/da/menu_save_outfit.xml
index 188229b586..188229b586 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/da/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml
index cdd3212373..cdd3212373 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/da/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml
index a9302e111e..a9302e111e 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/da/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml
index a1c25fea69..a1c25fea69 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
index dbaec62087..dbaec62087 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/da/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml
index c4d4bb4b5b..c4d4bb4b5b 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/da/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/da/menu_text_editor.xml b/indra/newview/skins/default/xui/da/menu_text_editor.xml
index 3ff31ea232..3ff31ea232 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/da/menu_text_editor.xml
diff --git a/indra/newview/skins/default/xui/da/menu_topinfobar.xml b/indra/newview/skins/default/xui/da/menu_topinfobar.xml
index 08d1c25d6f..08d1c25d6f 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/da/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_agent.xml b/indra/newview/skins/default/xui/da/menu_url_agent.xml
index 491586f3b4..491586f3b4 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_agent.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_group.xml b/indra/newview/skins/default/xui/da/menu_url_group.xml
index c776159b0a..c776159b0a 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_http.xml b/indra/newview/skins/default/xui/da/menu_url_http.xml
index 4398777a39..4398777a39 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_inventory.xml b/indra/newview/skins/default/xui/da/menu_url_inventory.xml
index 9a7de23e06..9a7de23e06 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_map.xml b/indra/newview/skins/default/xui/da/menu_url_map.xml
index ff4a4d5174..ff4a4d5174 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_objectim.xml b/indra/newview/skins/default/xui/da/menu_url_objectim.xml
index e27cf84959..e27cf84959 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_objectim.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_parcel.xml b/indra/newview/skins/default/xui/da/menu_url_parcel.xml
index 0f21e14f66..0f21e14f66 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_slapp.xml b/indra/newview/skins/default/xui/da/menu_url_slapp.xml
index dd25db2aa7..dd25db2aa7 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_slurl.xml b/indra/newview/skins/default/xui/da/menu_url_slurl.xml
index 8d84a138bb..8d84a138bb 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/da/menu_url_teleport.xml b/indra/newview/skins/default/xui/da/menu_url_teleport.xml
index e0ca7b920d..e0ca7b920d 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/da/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index d695cd1f89..f2ed7c2e64 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -245,7 +245,7 @@
 		<menu label="Gengivelse" name="Rendering">
 			<menu_item_check label="Akser" name="Axes"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Lys og skygger" name="Lighting and Shadows"/>
+			<menu_item_check label="Lys og skygger" name="Advanced Lighting Model"/>
 			<menu_item_check label="Skygger fra sol/måne/andre lyskilder" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO og skygge udjævning" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Globalt lys (eksperimentiel)" name="Global Illumination"/>
diff --git a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
index 63f4b0b388..63f4b0b388 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/da/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
index 515a15b287..515a15b287 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/da/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
index c0db7b6842..c0db7b6842 100644..100755
--- a/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/da/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/da/mime_types.xml b/indra/newview/skins/default/xui/da/mime_types.xml
index 0b00a29f07..0b00a29f07 100644..100755
--- a/indra/newview/skins/default/xui/da/mime_types.xml
+++ b/indra/newview/skins/default/xui/da/mime_types.xml
diff --git a/indra/newview/skins/default/xui/da/mime_types_linux.xml b/indra/newview/skins/default/xui/da/mime_types_linux.xml
index 69a0fb23f6..69a0fb23f6 100644..100755
--- a/indra/newview/skins/default/xui/da/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/da/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/da/mime_types_mac.xml b/indra/newview/skins/default/xui/da/mime_types_mac.xml
index bd9981b045..bd9981b045 100644..100755
--- a/indra/newview/skins/default/xui/da/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/da/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index cf6f1ccdd9..33b876bdb9 100644..100755
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -481,7 +481,6 @@ Du kan bruge [SECOND_LIFE] normalt og andre personer vil se dig korrekt.
 		[APP_NAME] installationen er færdig.
 
 Hvis det er første gang du bruger [SECOND_LIFE], skal du først oprette en konto for at logge på.
-Vend tilbage til [http://join.secondlife.com secondlife.com] for at oprette en ny konto?
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Der er problemer med at koble på.  Der kan være et problem med din Internet forbindelse eller [SECOND_LIFE_GRID].
diff --git a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml
index e2d1f26d42..e2d1f26d42 100644..100755
--- a/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/da/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/da/panel_active_object_row.xml b/indra/newview/skins/default/xui/da/panel_active_object_row.xml
index 9c27ea7fe2..9c27ea7fe2 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/da/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
index 1953fad31f..1953fad31f 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
index 890f4a2f0a..890f4a2f0a 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_avatar_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
index 4f5041ad54..4f5041ad54 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/da/panel_block_list_sidetray.xml
diff --git a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
index d2ade170d1..d2ade170d1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
index 4cbcdebbe4..4cbcdebbe4 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray.xml b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
index 3cd9d55dd0..3cd9d55dd0 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray.xml
diff --git a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
index bd31253ca4..bd31253ca4 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/da/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/da/panel_classified_info.xml b/indra/newview/skins/default/xui/da/panel_classified_info.xml
index a54d320ffd..a54d320ffd 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
index c08d095c66..c08d095c66 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
index 88b0636e9e..88b0636e9e 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
index 92d78b01a2..92d78b01a2 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/da/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
index 700ad4fa14..700ad4fa14 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
index dd8d86cfbf..dd8d86cfbf 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
index 0f60a6df51..0f60a6df51 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_classified.xml b/indra/newview/skins/default/xui/da/panel_edit_classified.xml
index fc4780a34e..fc4780a34e 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
index d801118cea..d801118cea 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
index 36f58428a6..36f58428a6 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_hair.xml b/indra/newview/skins/default/xui/da/panel_edit_hair.xml
index e91e6324e8..e91e6324e8 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
index 4e7336747d..4e7336747d 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pants.xml b/indra/newview/skins/default/xui/da/panel_edit_pants.xml
index 61056e9e6c..61056e9e6c 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_physics.xml b/indra/newview/skins/default/xui/da/panel_edit_physics.xml
index 16c9b16fa3..16c9b16fa3 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_pick.xml b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
index 3036f30240..3036f30240 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_profile.xml b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
index 14fd48ba2f..14fd48ba2f 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shape.xml b/indra/newview/skins/default/xui/da/panel_edit_shape.xml
index 7c1ffe5cfa..7c1ffe5cfa 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml
index 4dfb47aab2..4dfb47aab2 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
index 653ea421b5..653ea421b5 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skin.xml b/indra/newview/skins/default/xui/da/panel_edit_skin.xml
index 608e1d6e0b..608e1d6e0b 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml
index e80e60efd8..e80e60efd8 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_socks.xml b/indra/newview/skins/default/xui/da/panel_edit_socks.xml
index 82a7341317..82a7341317 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
index d4a12209db..d4a12209db 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
index aacfae79e1..aacfae79e1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
index a9db5d2ab0..a9db5d2ab0 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
index 906870e6d9..906870e6d9 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/da/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
index 26fe4f6ebe..26fe4f6ebe 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_general.xml b/indra/newview/skins/default/xui/da/panel_group_general.xml
index eccddb55c8..eccddb55c8 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
index 3d561f1e5b..3d561f1e5b 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_invite.xml b/indra/newview/skins/default/xui/da/panel_group_invite.xml
index 49daf6c9f2..49daf6c9f2 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_invite.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_land_money.xml b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
index 49d415e515..49d415e515 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_list_item.xml b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
index e77e548340..e77e548340 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_list_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_notices.xml b/indra/newview/skins/default/xui/da/panel_group_notices.xml
index 0a0b8f5e04..0a0b8f5e04 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_notify.xml b/indra/newview/skins/default/xui/da/panel_group_notify.xml
index 8a684ca031..8a684ca031 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/da/panel_group_roles.xml b/indra/newview/skins/default/xui/da/panel_group_roles.xml
index ebc773f7ed..ebc773f7ed 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/da/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
index 5cecb93d40..5cecb93d40 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/da/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/da/panel_inventory_item.xml b/indra/newview/skins/default/xui/da/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_landmark_info.xml b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
index 8503a41763..8503a41763 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml
index e9e5e506fd..e9e5e506fd 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index 2e0f726e1a..b7cb76d4cb 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				LOG PÅ
+			</text>
 			<text name="username_text">
 				Brugernavn:
 			</text>
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				Password:
 			</text>
-			<check_box label="Husk password" name="remember_check"/>
-			<button label="Log på" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Tilstand:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Vælg ønsket tilstand. Vælg basis for hurtig og nem udforskning og chat. Vælg avanceret for at få adgang til flere muligheder.">
-				<combo_box.item label="Basis" name="Basic"/>
-				<combo_box.item label="Avanceret" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Start ved:
 			</text>
@@ -33,16 +26,21 @@
 				<combo_box.item label="&lt;Indtast regionnavn&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Opret bruger
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Hjælp til login
 			</text>
 			<text name="forgot_password_text">
 				Har du glemt brugernavn eller password?
 			</text>
-			<text name="login_help">
-				Hjælp til login
+			<button label="Log på" name="connect_btn"/>
+			<check_box label="Husk password" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CREATE YǾUR ACCǾUNT
 			</text>
+			<button name="create_new_account_btn" label="Opret bruger"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_main_inventory.xml b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
index d6406939c1..d6406939c1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/da/panel_me.xml b/indra/newview/skins/default/xui/da/panel_me.xml
index f98ced5f91..f98ced5f91 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_me.xml
+++ b/indra/newview/skins/default/xui/da/panel_me.xml
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
index 48f08b9dfd..48f08b9dfd 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml
index 84468eb2a7..84468eb2a7 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
index 1b64888271..1b64888271 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
index 2ee87433a4..2ee87433a4 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
index 949cbcbd7b..eb104201f8 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Klik her for at chatte." name="chat_box" tool_tip="Tryk på enter for at tale, Ctrl-Enter for at råbe."/>
 	<button name="show_nearby_chat" tool_tip="Viser/skjuler log for chat nærved"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
index ef8ed3ad07..ef8ed3ad07 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml
index 30ad4ff9f6..30ad4ff9f6 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/da/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/da/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
index 3736ea06ba..3736ea06ba 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
index 055c42c003..055c42c003 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
index 7b6469023b..7b6469023b 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_list.xml b/indra/newview/skins/default/xui/da/panel_outfits_list.xml
index 72caedb461..72caedb461 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml
index 8d25efa97b..8d25efa97b 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/da/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/da/panel_people.xml b/indra/newview/skins/default/xui/da/panel_people.xml
index 66a128cd13..66a128cd13 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_people.xml
+++ b/indra/newview/skins/default/xui/da/panel_people.xml
diff --git a/indra/newview/skins/default/xui/da/panel_pick_info.xml b/indra/newview/skins/default/xui/da/panel_pick_info.xml
index 8a5141f967..8a5141f967 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/da/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/da/panel_picks.xml b/indra/newview/skins/default/xui/da/panel_picks.xml
index 8af68ee69a..8af68ee69a 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_picks.xml
+++ b/indra/newview/skins/default/xui/da/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/da/panel_place_profile.xml b/indra/newview/skins/default/xui/da/panel_place_profile.xml
index 8dd0fb2d21..8dd0fb2d21 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/da/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/da/panel_places.xml b/indra/newview/skins/default/xui/da/panel_places.xml
index c555f2fb09..c555f2fb09 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_places.xml
+++ b/indra/newview/skins/default/xui/da/panel_places.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
index 48106c7dfe..48106c7dfe 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
index 7caa17d514..7caa17d514 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 890a3038ef..890a3038ef 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
index cc3dc480bc..cc3dc480bc 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index 5702d48e97..5702d48e97 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 72200a07ad..e494b2b755 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -26,14 +26,14 @@
 		<text name="ShadersText">
 			Overflader:
 		</text>
-		<check_box initial_value="sand" label="Gennemsigtig vand" name="TransparentWater"/>
+		<check_box initial_value="true" label="Gennemsigtig vand" name="TransparentWater"/>
 		<check_box initial_value="true" label="Glatte flader og skin" name="BumpShiny"/>
-		<check_box initial_value="sand" label="Lokale lys" name="LocalLights"/>
+		<check_box initial_value="true" label="Lokale lys" name="LocalLights"/>
 		<check_box initial_value="true" label="Basale flader" name="BasicShaders" tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher."/>
 		<check_box initial_value="true" label="Atmosfæriske flader" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="sand" label="Lys og skygger" name="UseLightShaders"/>
-		<check_box initial_value="sand" label="&quot;Ambient Occlusion&quot;" name="UseSSAO"/>
-		<check_box initial_value="sand" label="Skarphedsdybde" name="UseDoF"/>
+		<check_box initial_value="true" label="Lys og skygger" name="UseLightShaders"/>
+		<check_box initial_value="true" label="&quot;Ambient Occlusion&quot;" name="UseSSAO"/>
+		<check_box initial_value="true" label="Skarphedsdybde" name="UseDoF"/>
 		<text name="shadows_label">
 			Skygger:
 		</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_move.xml b/indra/newview/skins/default/xui/da/panel_preferences_move.xml
index 98dfed92c1..98dfed92c1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
index 0df330b016..0df330b016 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 479e98817e..7be9a9d555 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
@@ -26,14 +26,13 @@
 		Web:
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="1"/>
+		<radio_item label="Benyt min browser(IE, Firefox, Safari)" name="external" tool_tip="Brug systemets standard web browser til hjælp, web links, m.v. Ikke anbefalet hvis du kører i fuld-skærm." value="true"/>
 		<radio_item label="Benyt den indbyggede browser" name="internal" tool_tip="Brug den indbyggede web browser til hjælp, web links m.v. Denne browser åbner et nyt vindue i [APP_NAME]." value=""/>
 	</radio_group>
 	<check_box initial_value="true" label="Aktivér plugins" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Acceptér cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Aktivér Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="fra" label="Tilad media browser pop-ups" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Aktivér web proxy" name="web_proxy_enabled"/>
+	<check_box initial_value="false" label="Tilad media browser pop-ups" name="media_popup_enabled"/>	
 	<text name="Proxy location">
 		Proxy placering:
 	</text>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
index 26d2ae4abd..26d2ae4abd 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
index cfb32500c6..cfb32500c6 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/da/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
index 4b9c7539ea..4b9c7539ea 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/da/panel_region_debug.xml b/indra/newview/skins/default/xui/da/panel_region_debug.xml
index 08e2d1e263..08e2d1e263 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_debug.xml
diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml
index 65948ce481..65948ce481 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml
diff --git a/indra/newview/skins/default/xui/da/panel_region_general.xml b/indra/newview/skins/default/xui/da/panel_region_general.xml
index 667c88c5b1..667c88c5b1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/da/panel_region_terrain.xml b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
index 14ef0060b1..14ef0060b1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml
index 45946fd222..45946fd222 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml
diff --git a/indra/newview/skins/default/xui/da/panel_script_ed.xml b/indra/newview/skins/default/xui/da/panel_script_ed.xml
index 3dec4bf101..3dec4bf101 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/da/panel_script_ed.xml
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
index 821c82ccda..821c82ccda 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/da/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
index 91fc76dbb4..91fc76dbb4 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/da/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml
index 99f61b938b..99f61b938b 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/da/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/da/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml
index 66c3e69904..66c3e69904 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml
diff --git a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
index ce3a1d8b4e..ce3a1d8b4e 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/da/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/da/panel_sound_devices.xml b/indra/newview/skins/default/xui/da/panel_sound_devices.xml
index 27b7666a1f..27b7666a1f 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/da/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml
index f25639d56f..f25639d56f 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/da/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/da/panel_status_bar.xml b/indra/newview/skins/default/xui/da/panel_status_bar.xml
index 6e7bdfc188..6e7bdfc188 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/da/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history.xml b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
index e6e78028f5..e6e78028f5 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/da/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
index 8148588c86..8148588c86 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/da/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
index 50f561ec7f..50f561ec7f 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/da/panel_world_map.xml b/indra/newview/skins/default/xui/da/panel_world_map.xml
index 138b922df1..138b922df1 100644..100755
--- a/indra/newview/skins/default/xui/da/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/da/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/da/role_actions.xml b/indra/newview/skins/default/xui/da/role_actions.xml
index 7e581200a5..7e581200a5 100644..100755
--- a/indra/newview/skins/default/xui/da/role_actions.xml
+++ b/indra/newview/skins/default/xui/da/role_actions.xml
diff --git a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
index c5caefe070..c5caefe070 100644..100755
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
index b3293b981e..b3293b981e 100644..100755
--- a/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
index d52845160b..d52845160b 100644..100755
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
index f80d5aeb15..f80d5aeb15 100644..100755
--- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 11d100eeff..11d100eeff 100644..100755
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
diff --git a/indra/newview/skins/default/xui/da/teleport_strings.xml b/indra/newview/skins/default/xui/da/teleport_strings.xml
index 0d89fae986..0d89fae986 100644..100755
--- a/indra/newview/skins/default/xui/da/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/da/teleport_strings.xml
diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/da/xui_version.xml
+++ b/indra/newview/skins/default/xui/da/xui_version.xml
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index b4c28daac9..bc0eae7c5d 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -8,7 +8,9 @@
 		Kompiliert mit [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Sie befinden sich in [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -66,27 +68,26 @@ Voice-Serverversion: [VOICE_VERSION]
 		</panel>
 		<panel label="Lizenzen" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion.
-        APR Copyright (C) 2000-2004 The Apache Software Foundation.
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg (daniel@haxx.se).
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion.
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg (daniel@haxx.se).
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm und Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University sowie David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW).
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus.
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge.
+        ogg/vorbis Copyright (C) 2002, Xiphophorus.
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge.
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga.
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com).
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly und Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly und Mark Adler.
 
         Second Life Viewer verwendet Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (und Lizenzgeber). Alle Rechte vorbehalten. Details siehe www.havok.com.
 
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 9e330f9766..44922fbe78 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -463,7 +463,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Zugang nur Einwohnern gestatten, die:
 			</text>
 			<check_box label="Zahlungsinformationen hinterlegt haben [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Um diese Parzelle besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
-			<check_box label="ihr Alter bestätigt haben [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Um diese Parzelle besuchen zu können, müssen Einwohner ihr Alter bestätigt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
+			<check_box label="Sind mindestens 18 Jahre alt [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diese Parzelle betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
 			<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
 			<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/de/floater_activeim.xml b/indra/newview/skins/default/xui/de/floater_activeim.xml
index 416e31b2d6..416e31b2d6 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/de/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml
index 3dc554b120..3dc554b120 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
index 9a6f5e0166..9a6f5e0166 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
deleted file mode 100644
index 82a4a51d07..0000000000
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Bewegung konnte nicht initialisiert werden
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animationsdatei ist [LENGTH] Sekunden lang.
-
-Maximal erlaubt sind [MAX_LENGTH] Sekunden.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Animationsdatei konnte nicht gelesen werden.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Unvollständige Datei
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Constraint-Definition kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH-Datei kann nicht geöffnet werden
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Ungültiger HIERARCHY-Titel.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		ROOT oder JOINT nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		JOINT-Name nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		VERSATZ nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		CHANNELS nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Kann Rotations-Reihenfolge nicht erfassen.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Kann Rotations-Achse nicht erfassen.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		MOTION nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Anzahl der Bilder kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Bildzeit kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Positions-Werte können nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Kann Rotations-Werte nicht erfassen.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Datei kann nicht geöffnet werden
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Übersetzungstitel kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Übersetzungsnamen können nicht geladen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Ignorier-Wert kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Übersetzungs-Wert kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Outname-Wert kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Übersetzungsmatrix kann nicht geladen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Mergechild-Name nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Mergeparent-Name nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Prioritätswert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Loop-Wert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Easeln-Wert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		easeOut-Wert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Hand-Morph-Wert nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Emote-Name kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Falscher Root-Joint-Name, &quot;hip&quot; verwenden.
-	</floater.string>
-	<text name="name_label">
-		Name:
-	</text>
-	<line_editor name="name_form"/>
-	<text name="description_label">
-		Beschreibung:
-	</text>
-	<spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können"/>
-	<check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife"/>
-	<spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen"/>
-	<spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen"/>
-	<text name="hand_label">
-		Handhaltung
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände">
-		<combo_box.item label="Dehnen" name="Spread"/>
-		<combo_box.item label="Entspannt" name="Relaxed"/>
-		<combo_box.item label="Beide zeigen" name="PointBoth"/>
-		<combo_box.item label="Faust" name="Fist"/>
-		<combo_box.item label="Links entspannt" name="RelaxedLeft"/>
-		<combo_box.item label="Nach links zeigen" name="PointLeft"/>
-		<combo_box.item label="Linke Faust" name="FistLeft"/>
-		<combo_box.item label="Rechts entspannt" name="RelaxedRight"/>
-		<combo_box.item label="Nach rechts zeigen" name="PointRight"/>
-		<combo_box.item label="Rechte Faust" name="FistRight"/>
-		<combo_box.item label="Rechts salutieren" name="SaluteRight"/>
-		<combo_box.item label="Tippt" name="Typing"/>
-		<combo_box.item label="Friedensrecht" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Ausdruck
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation">
-		<item label="(Keiner)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Ängstlich" name="Afraid" value="Ängstlich"/>
-		<item label="Verärgert" name="Angry" value="Verärgert"/>
-		<item label="Grinst" name="BigSmile" value="Grinsend"/>
-		<item label="Gelangweilt" name="Bored" value="Gelangweilt"/>
-		<item label="Weinen" name="Cry" value="Weinen"/>
-		<item label="Verachten" name="Disdain" value="Verachten"/>
-		<item label="Verlegen" name="Embarrassed" value="Verlegen"/>
-		<item label="Stirnrunzeln" name="Frown" value="Stirnrunzeln"/>
-		<item label="Küssen" name="Kiss" value="Küssen"/>
-		<item label="Lachen" name="Laugh" value="Lachen"/>
-		<item label="Bäääh" name="Plllppt" value="Bäääh"/>
-		<item label="Angewidert" name="Repulsed" value="Angewidert"/>
-		<item label="Traurig" name="Sad" value="Traurig"/>
-		<item label="Schulterzucken" name="Shrug" value="Schulterzucken"/>
-		<item label="Lächeln" name="Smile" value="Lächeln"/>
-		<item label="Überraschung" name="Surprise" value="Überraschung"/>
-		<item label="Zwinkern" name="Wink" value="Zwinkern"/>
-		<item label="Sorgenvoll" name="Worry" value="Sorgenvoll"/>
-	</combo_box>
-	<text name="preview_label" width="97">
-		Vorschau während:
-	</text>
-	<combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
-		<item label="Stehend" name="Standing" value="Stehend"/>
-		<item label="Geht" name="Walking" value="Gehend"/>
-		<item label="Sitzt" name="Sitting" value="Sitzend"/>
-		<item label="Fliegen" name="Flying" value="Fliegen"/>
-	</combo_box>
-	<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)" width="175"/>
-	<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendegeschwindigkeit von Animationen (in Sekunden)" width="175"/>
-	<button bottom_delta="-32" label="" name="play_btn" tool_tip="Ihre Animation abspielen"/>
-	<button name="pause_btn" tool_tip="Ihre Animation pausieren"/>
-	<button label="" name="stop_btn" tool_tip="Animation anhalten"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		Animationsdatei konnte nicht gelesen werden.
-
-Wir empfehlen exportierte BVH-Dateien aus Poser 4.
-	</text>
-	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="160"/>
-	<button label="Abbrechen" left="180" name="cancel_btn" width="88"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_auction.xml b/indra/newview/skins/default/xui/de/floater_auction.xml
index 8ededff319..8ededff319 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_auction.xml
+++ b/indra/newview/skins/default/xui/de/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
new file mode 100755
index 0000000000..0c774990ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Einstellungen für automatische Ersetzung...">
+	<check_box label="Automatische Ersetzung aktivieren..." name="autoreplace_enable" tool_tip="Eines oder mehrere Schlüsselwörter bei der Eingabe von Chat-Text durch die entsprechende Ersetzung substituieren"/>
+	<button label="Liste importieren..." name="autoreplace_import_list" tool_tip="Exportierte Liste aus einer Datei laden."/>
+	<button label="Liste exportieren..." name="autoreplace_export_list" tool_tip="Ausgewählte Liste zur Weitergabe in einer Datei speichern."/>
+	<button label="Neue Liste..." name="autoreplace_new_list" tool_tip="Neue Liste erstellen."/>
+	<button label="Liste löschen" name="autoreplace_delete_list" tool_tip="Ausgewählte Liste löschen."/>
+	<button name="autoreplace_list_up" tool_tip="Dieser Liste eine höhere Priorität einräumen."/>
+	<button name="autoreplace_list_down" tool_tip="Dieser Liste eine niedrigere Priorität einräumen."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Schlüsselwort" name="keyword"/>
+		<scroll_list.columns label="Ersetzung" name="replacement"/>
+	</scroll_list>
+	<button label="Hinzufügen..." name="autoreplace_add_entry"/>
+	<button label="Entfernen" name="autoreplace_delete_entry"/>
+	<button label="Eintrag speichern" name="autoreplace_save_entry" tool_tip="Diesen Eintrag speichern."/>
+	<button label="Änderungen speichern" name="autoreplace_save_changes" tool_tip="Alle Änderungen speichern."/>
+	<button label="Abbrechen" name="autoreplace_cancel" tool_tip="Alle Änderungen löschen."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/de/floater_avatar.xml b/indra/newview/skins/default/xui/de/floater_avatar.xml
index ba0dd54d96..ba0dd54d96 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index f66b87b76c..f66b87b76c 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
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 8235eacde0..8235eacde0 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml
index 1a052bd814..1a052bd814 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/de/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml
index 939fd5dee4..939fd5dee4 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
index 8f99fc933c..27a74c874e 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/de/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="BERECHTIGUNGEN BEARBEITEN">
+<floater name="floaterbulkperms" title="INHALTSBERECHTIGUNGEN ÄNDERN">
 	<floater.string name="nothing_to_modify_text">
 		Auswahl enthält keinen Inhalt, der bearbeitet werden kann.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Alle" label_selected="Alle" name="check_all"/>
 	<button label="Löschen" label_selected="Keine" name="check_none"/>
 	<text name="newperms">
-		Neue Inhalts-Berechtigungen
+		Inhaltsberechtigungen ändern in
 	</text>
 	<text name="GroupLabel">
 		Gruppe:
@@ -49,6 +49,7 @@
 	<check_box label="Bearbeiten" name="next_owner_modify"/>
 	<check_box label="Kopieren" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transferieren" name="next_owner_transfer" tool_tip="Nächster Eigentümer kann dieses Objekt weitergeben oder -verkaufen"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Anwenden" name="apply"/>
 	<button label="Abbrechen" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml
index 5d02511ab1..5d02511ab1 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/de/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index bd6ace6bda..bd6ace6bda 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/de/floater_buy_currency.xml b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
index 65926c088c..65926c088c 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency.xml
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
index 38d3bdd77f..38d3bdd77f 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index ca4ee8981b..ca4ee8981b 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/de/floater_buy_object.xml b/indra/newview/skins/default/xui/de/floater_buy_object.xml
index 29b49f57b3..29b49f57b3 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index 163ef87d8c..163ef87d8c 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/de/floater_chat_bar.xml b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
index 2464a55665..ab77d4dae5 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT IN DER NÄHE">
+<floater name="nearby_chat" title="CHAT IN DER NÄHE">
 	<panel name="bottom_panel">
 		<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabetaste zum Sprechen, Strg+Eingabe zum Rufen"/>
 		<button name="show_nearby_chat" tool_tip="Chatprotokoll in der Nähe ein-/ausblenden"/>
diff --git a/indra/newview/skins/default/xui/de/floater_choose_group.xml b/indra/newview/skins/default/xui/de/floater_choose_group.xml
index 3d76b645fe..3d76b645fe 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/de/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/de/floater_color_picker.xml b/indra/newview/skins/default/xui/de/floater_color_picker.xml
index 0fe154b531..0fe154b531 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/de/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
new file mode 100644
index 0000000000..19620a0fc9
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL">
+	<panel name="buttons_panel">
+		<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
new file mode 100644
index 0000000000..010ad19076
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="UNTERHALTUNG:">
+	<floater.string name="Title">
+		UNTERHALTUNG: [NAME]
+	</floater.string>
+	<text name="page_label" value="Seite"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_critical.xml b/indra/newview/skins/default/xui/de/floater_critical.xml
index 0b147926dd..0b147926dd 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_critical.xml
+++ b/indra/newview/skins/default/xui/de/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
index cc14ce640d..cc14ce640d 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/de/floater_destinations.xml b/indra/newview/skins/default/xui/de/floater_destinations.xml
index 57881488fd..57881488fd 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/de/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/de/floater_display_name.xml b/indra/newview/skins/default/xui/de/floater_display_name.xml
index 4c2914fccb..4c2914fccb 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/de/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
index 8b29428c24..8b29428c24 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/de/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
index ea4c5f7ebc..ea4c5f7ebc 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/de/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
index 9b9d5e7d77..9b9d5e7d77 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/de/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/de/floater_environment_settings.xml b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
index 946416980a..946416980a 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/de/floater_event.xml b/indra/newview/skins/default/xui/de/floater_event.xml
index 5b3267d7c9..5b3267d7c9 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_event.xml
+++ b/indra/newview/skins/default/xui/de/floater_event.xml
diff --git a/indra/newview/skins/default/xui/de/floater_fast_timers.xml b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
index e61e542688..e61e542688 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/de/floater_font_test.xml b/indra/newview/skins/default/xui/de/floater_font_test.xml
index 29357b8ee0..29357b8ee0 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/de/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/de/floater_gesture.xml b/indra/newview/skins/default/xui/de/floater_gesture.xml
index 7b35da8d5c..7b35da8d5c 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 8cb1af9f7d..8cb1af9f7d 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/de/floater_goto_line.xml b/indra/newview/skins/default/xui/de/floater_goto_line.xml
new file mode 100644
index 0000000000..02550ec398
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="GEHE ZU ZEILE">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Gehe zu Zeile
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
index ca081aafae..fd6c9a0875 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		VBO aktivieren:
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern.  Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
+	<text name="tc label">
+		S3TC aktivieren:
+	</text>
+	<check_box initial_value="true" label="Texturkomprimierung aktivieren (Neustart erforderlich)" name="texture compression" tool_tip="Komprimiert Texturen im Videospeicher, damit höher auflösende Texturen geladen werden können (leichte Beeinträchtigung der Farbqualität)."/>
 	<slider label="Texturen-Cache (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/>
 	<spinner label="Nebeldistanzverhältnis:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/de/floater_help_browser.xml b/indra/newview/skins/default/xui/de/floater_help_browser.xml
index d55a3b0a26..d55a3b0a26 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/de/floater_how_to.xml b/indra/newview/skins/default/xui/de/floater_how_to.xml
index caea221f83..caea221f83 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/de/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml
index 8a10eccabe..8a10eccabe 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_hud.xml
+++ b/indra/newview/skins/default/xui/de/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 95eda97938..5bf916c8e9 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="GESPRÄCHE"/>
+<multi_floater name="floater_im_box" title="GESPRÄCHE">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+					<button name="add_btn" tool_tip="Neue Unterhaltung starten"/>
+					<button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/>
+					<text name="stub_textbox">
+						Diese Unterhaltung erscheint in einem separaten Fenster.   [secondlife:/// Zurückholen.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index abaf275651..b07b74bf4a 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="An" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/>
+	<floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/>
+	<floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/>
+	<floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/>
+	<floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/>
+	<floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/>
+				<button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/>
+				<button name="close_btn" tool_tip="Diese Unterhaltung beenden"/>
+				<button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="An" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml
index d581c6051b..d581c6051b 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/de/floater_import_collada.xml b/indra/newview/skins/default/xui/de/floater_import_collada.xml
index 8b1313c7b5..8b1313c7b5 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/de/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index 213d9f54f5..f13842f479 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		Anonym
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ruft an.
+		ruft Sie an.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ist einem Voice-Konferenz-Chat beigetreten.
@@ -25,9 +25,9 @@
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
-		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
+		Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet.
 	</text>
-	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
-	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
-	<button label="IM starten" name="Start IM"/>
+	<button label="Annehmen" label_selected="Annehmen" name="Accept"/>
+	<button label="Ignorieren" label_selected="Ignorieren" name="Reject"/>
+	<button label="Stattdessen IM öffnen" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
index da97ceb2d8..da97ceb2d8 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/de/floater_inventory.xml b/indra/newview/skins/default/xui/de/floater_inventory.xml
deleted file mode 100644
index d9b7c30fd2..0000000000
--- a/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MEIN INVENTAR">
-	<floater.string name="Title">
-		MEIN INVENTAR
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MEIN INVENTAR ([ITEM_COUNT] Objekte werden abgerufen...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MEIN INVENTAR ([ITEM_COUNT] Objekte) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Abgerufen
-	</floater.string>
-	<panel label="Inventar" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 7f48105460..7f48105460 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index d63426d684..d63426d684 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/de/floater_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml
index 2efc11df29..2efc11df29 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/de/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index 45ff37c147..45ff37c147 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
index 73559407a9..73559407a9 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/de/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
index 3b42a8b741..3b42a8b741 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/de/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index 73c21edc67..73c21edc67 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/de/floater_map.xml b/indra/newview/skins/default/xui/de/floater_map.xml
index c4c42af66d..c4c42af66d 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_map.xml
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
index 2d438dfe21..2d438dfe21 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/de/floater_media_settings.xml b/indra/newview/skins/default/xui/de/floater_media_settings.xml
index 1b98ed7973..1b98ed7973 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
index fdc9b950b6..fdc9b950b6 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
index a412b530a4..a412b530a4 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index 4af8d67686..4285462bc8 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Dreiecke" name="triangles" value="Dreiecke"/>
 				<text initial_value="Scheitelpunkte" name="vertices" value="Scheitelpunkte"/>
 				<text initial_value="Hoch" name="high_label" value="Hoch"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Mittel" name="medium_label" value="Mittel"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+					<item name="Use LoD above" value="Detailstufe oben verwenden"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Niedrig" name="low_label" value="Niedrig"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+					<item name="Use LoD above" value="Detailstufe oben verwenden"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Niedrigste" name="lowest_label" value="Niedrigste"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+					<item name="Use LoD above" value="Detailstufe oben verwenden"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Normalen generieren" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/de/floater_model_wizard.xml b/indra/newview/skins/default/xui/de/floater_model_wizard.xml
deleted file mode 100644
index ee26d51d32..0000000000
--- a/indra/newview/skins/default/xui/de/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="ASSISTENT ZUM HOCHLADEN VON MODELLEN">
-	<button label="5. Hochladen" name="upload_btn"/>
-	<button label="4. Überprüfen" name="review_btn"/>
-	<button label="3. Physik" name="physics_btn"/>
-	<button label="2. Optimieren" name="optimize_btn"/>
-	<button label="1. Datei auswählen" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Modelldatei auswählen
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Fortgeschrittene Benutzer: Wenn Sie bereits mit Tools zur Erstellung von 3D-Inhalten vertraut sind, können Sie den erweiterten Uploader verwenden.
-			</text>
-			<button label="Auf Erweitert wechseln" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Hochzuladende Modelldatei auswählen
-			</text>
-			<button label="Durchsuchen..." label_selected="Durchsuchen..." name="browse"/>
-			<text name="Model types">
-				Second Life unterstützt COLLADA-Dateien (.dae).
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				ACHTUNG:
-			</text>
-			<text name="warning_text">
-				Sie können den letzten Schritt nicht abschließen (Modell auf Second Life-Server hochladen). [secondlife:///app/floater/learn_more Weitere Infos], wie Sie Ihr Konto zum Hochladen von Netzmodellen einrichten.
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Modell optimieren
-			</text>
-		</panel>
-		<text name="optimize_description">
-			Wir haben das Modell auf Leistung optimiert. Sie können es bei Bedarf weiter anpassen.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Detailstufe generieren: hoch
-			</text>
-			<text name="medium_detail_text">
-				Detailstufe generieren: mittel
-			</text>
-			<text name="low_detail_text">
-				Detailstufe generieren: niedrig
-			</text>
-			<text name="lowest_detail_text">
-				Detailstufe generieren: niedrigste
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Geometrie neu berechnen" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Geometrievorschau
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Viel Details
-				</combo_item>
-				<combo_item name="medium">
-					Mittlere Details
-				</combo_item>
-				<combo_item name="low">
-					Wenig Details
-				</combo_item>
-				<combo_item name="lowest">
-					Wenigste Details
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Physik anpassen
-			</text>
-		</panel>
-		<text name="physics_description">
-			Wir erstellen eine Form für die Außenhülle des Modells. Passen Sie die Detailstufe der Form wie für den beabsichtigten Zweck erforderlich an.
-		</text>
-		<panel name="physics_content">
-			<button label="Physik neu berechnen" name="recalculate_physics_btn"/>
-			<button label="Neu berechnen..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Physikvorschau
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Detailstufe zur Anzeige in Vorschaudarstellung">
-				<combo_item name="high">
-					Viel Details
-				</combo_item>
-				<combo_item name="medium">
-					Mittlere Details
-				</combo_item>
-				<combo_item name="low">
-					Wenig Details
-				</combo_item>
-				<combo_item name="lowest">
-					Wenigste Details
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				Überprüfen
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Auswirkung auf Parzelle/Region: Prim-Äquivalenzwert [EQUIV]
-			</text>
-			<text name="review_fee">
-				Die für das Hochladen anfallende Gebühr in Höhe von L$ [FEE] wird von Ihrem Konto abgebucht.
-			</text>
-			<text name="review_confirmation">
-				Durch Klicken auf „Hochladen“ bestätigen Sie, dass Sie die erforderlichen Rechte für das im Modell enthaltene Material besitzen.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Upload abgeschlossen
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Ihr Modell wurde hochgeladen.
-		</text>
-		<text name="inventory_text">
-			Sie finden das Modell im Objektordner Ihres Inventars.
-		</text>
-		<text name="charged_fee">
-			Von Ihrem Konto wurden [FEE] L$ abgebucht.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Zurück" name="back"/>
-	<button label="Weiter &gt;&gt;" name="next"/>
-	<button label="Gewichte und Gebühr berechnen &gt;&gt;" name="calculate"/>
-	<button label="Berechnen..." name="calculating"/>
-	<button label="Hochladen" name="upload" tool_tip="An Simulator hochladen"/>
-	<button label="Abbrechen" name="cancel"/>
-	<button label="Schließen" name="close"/>
-	<spinner name="import_scale" value="1,0"/>
-	<string name="status_idle">
-		Inaktiv
-	</string>
-	<string name="status_parse_error">
-		DAE-Parsing-Fehler. Details siehe Protokoll.
-	</string>
-	<string name="status_reading_file">
-		Laden...
-	</string>
-	<string name="status_generating_meshes">
-		Netze werden generiert...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Fehler: Anzahl von Vertices überschreitet 65534. Operation abgebrochen.
-	</string>
-	<string name="bad_element">
-		Fehler: ungültiges Element.
-	</string>
-	<string name="high">
-		Hoch
-	</string>
-	<string name="medium">
-		Mittel
-	</string>
-	<string name="low">
-		Niedrig
-	</string>
-	<string name="lowest">
-		Niedrigste
-	</string>
-	<string name="mesh_status_good">
-		Ausliefern
-	</string>
-	<string name="mesh_status_na">
-		--
-	</string>
-	<string name="mesh_status_none">
-		Keine
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Detailstufen haben unterschiedliche Anzahl texturfähiger Flächen.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Detailstufen haben unterschiedliche Anzahl von Netzinstanzen.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		Detailstufe hat zu viele Vertices.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Erforderliche Detailstufe fehlt.
-	</string>
-	<string name="layer_all">
-		Alle
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_moveview.xml b/indra/newview/skins/default/xui/de/floater_moveview.xml
index c1c8271310..c1c8271310 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/de/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
index 3f1af3dc63..3f1af3dc63 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/de/floater_my_appearance.xml b/indra/newview/skins/default/xui/de/floater_my_appearance.xml
index e26b2434cc..e26b2434cc 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/de/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/de/floater_my_inventory.xml b/indra/newview/skins/default/xui/de/floater_my_inventory.xml
index 0cfa17562e..0cfa17562e 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/de/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
deleted file mode 100644
index 2aabbb18f2..0000000000
--- a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT IN DER NÄHE">
-	<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_notification.xml b/indra/newview/skins/default/xui/de/floater_notification.xml
index 7752d22b52..7752d22b52 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_notification.xml
+++ b/indra/newview/skins/default/xui/de/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/de/floater_notifications_console.xml b/indra/newview/skins/default/xui/de/floater_notifications_console.xml
index e271cdace2..e271cdace2 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/de/floater_object_weights.xml b/indra/newview/skins/default/xui/de/floater_object_weights.xml
index e6641d3d18..e6641d3d18 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/de/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/de/floater_openobject.xml b/indra/newview/skins/default/xui/de/floater_openobject.xml
index c3e7052283..c3e7052283 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/de/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml
index 7481e6d4b7..7481e6d4b7 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/de/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
index 81079a3c52..81079a3c52 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..7096dbc156
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Pathfinding-Figuren">
+	<floater.string name="messaging_get_inprogress">
+		Pathfinding-Figuren werden abgerufen...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Fehler beim Abrufen von Pathfinding-Figuren.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Keine Pathfinding-Figuren.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] Figuren von [NUM_TOTAL] ausgewählt.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Laden]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Unbekannt]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[Gruppe]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Name" name="name"/>
+			<scroll_list.columns label="Beschreibung" name="description"/>
+			<scroll_list.columns label="Eigentümer" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Höhe" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Figuren:
+		</text>
+		<button label="Liste aktualisieren" name="refresh_objects_list"/>
+		<button label="Alle auswählen" name="select_all_objects"/>
+		<button label="Keine auswählen" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Aktionen für ausgewählte Figuren:
+		</text>
+		<check_box label="Beacon anzeigen" name="show_beacon"/>
+		<check_box label="Physikkapsel anzeigen" name="show_physics_capsule"/>
+		<button label="Nehmen" name="take_objects"/>
+		<button label="Kopie nehmen" name="take_copy_objects"/>
+		<button label="Dorthin teleportieren" name="teleport_me_to_object" tool_tip="Nur aktiviert, wenn eine Figur ausgewählt ist."/>
+		<button label="Zurückgeben" name="return_objects"/>
+		<button label="Löschen" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..ebf8f01632
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Pathfinding-Ansicht/-Test">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Pathfinding-Bibliotheksimplementierung nicht gefunden.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Warten, bis Region geladen ist.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Navmesh-Status wird geprüft.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Navmesh wird heruntergeladen.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Navmesh hat sich auf dem Server geändert. Neuestes Navmesh wird heruntergeladen.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Neuestes Navmesh wurde heruntergeladen.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Navmesh kann nicht heruntergeladen werden.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Navmesh weist ausstehende Änderungen auf.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Navmesh wird erstellt.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Einige Navmesh-Regionen weisen ausstehende Änderungen auf.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Einige Navmesh-Regionen werden erstellt.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Einige Navmesh-Regionen weisen ausstehende Änderungen auf und andere werden erstellt.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Navmesh ist aktuell.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Pathfinding-Bibliotheksimplementierung nicht gefunden.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Bitte wählen Sie Anfangs- und Endpunkte aus.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Bitte wählen Sie einen Anfangspunkt aus.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Bitte wählen Sie einen Endpunkt aus.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Pfad wird orange dargestellt.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Zwischen den gewählten Punkten wurde kein Pfad gefunden.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Fehler bei der Pfaderstellung aufgetreten.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Anzeigen" name="view_panel">
+			<text name="show_label">
+				Anzeigen:
+			</text>
+			<check_box label="Welt" name="show_world"/>
+			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
+			<check_box label="Navmesh" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Begehbarkeitskarte anzeigen:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Nicht anzeigen" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Figurentyp A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Figurentyp B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Figurentyp C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Figurentyp D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Begehbare Objekte" name="show_walkables"/>
+			<check_box label="Materialvolumen" name="show_material_volumes"/>
+			<check_box label="Statische Hinternisse" name="show_static_obstacles"/>
+			<check_box label="Ausschlussvolumen" name="show_exclusion_volumes"/>
+			<check_box label="Wasserebene" name="show_water_plane"/>
+			<check_box label="Mit Röntgenblick" name="show_xray"/>
+		</panel>
+		<panel label="Pfad testen" name="test_panel">
+			<text name="ctrl_click_label">
+				Bei gedrückter Strg-Taste klicken, um Anfangspunkt auszuwählen.
+			</text>
+			<text name="shift_click_label">
+				Bei gedrückter Umschalttaste klicken, um Endpunkt auszuwählen.
+			</text>
+			<text name="character_width_label">
+				Figurenbreite
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Figurentyp
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Keine" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Pfad löschen" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..0d3ba59efb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Pathfinding-Linksets">
+	<floater.string name="messaging_get_inprogress">
+		Pathfinding-Linksets werden abgerufen...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Fehler beim Abrufen von Pathfinding-Linksets.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Ausgewählte Pathfinding-Linksets werden geändert...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Fehler beim Ändern der ausgewählten Pathfinding-Linksets.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Keine Pathfinding-Linksets.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] Linksets von [NUM_TOTAL] ausgewählt.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Laden]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Unbekannt]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[Gruppe]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Ja
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		Nein
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Unbekannt
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Begehbar
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Statisches Hinternis
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Bewegliches Hinternis
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Materialvolumen
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Ausschlussvolumen
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Bewegliches Phantom
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[nicht änderbar]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[beschränkt]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[konkav]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[beschränkt,konkav]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Linkset-Nutzung auswählen...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Nach Linkset-Nutzung filtern..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Begehbar" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Statisches Hinternis" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Bewegliches Hinternis" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Materialvolumen" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Ausschlussvolumen" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Bewegliches Phantom" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Anwenden" name="apply_filters"/>
+		<button label="Entfernen" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Name (Hauptprim)" name="name"/>
+			<scroll_list.columns label="Beschreibung (Hauptprim)" name="description"/>
+			<scroll_list.columns label="Eigentümer" name="owner"/>
+			<scroll_list.columns label="Geskriptet" name="scripted"/>
+			<scroll_list.columns label="Belastung" name="land_impact"/>
+			<scroll_list.columns label="Abstand" name="dist_from_you"/>
+			<scroll_list.columns label="Linkset-Nutzung" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Linksets:
+		</text>
+		<button label="Liste aktualisieren" name="refresh_objects_list"/>
+		<button label="Alle auswählen" name="select_all_objects"/>
+		<button label="Keine auswählen" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Beacon anzeigen" name="show_beacon"/>
+		<button label="Nehmen" name="take_objects"/>
+		<button label="Kopie nehmen" name="take_copy_objects"/>
+		<button label="Dorthin teleportieren" name="teleport_me_to_object"/>
+		<button label="Zurückgeben" name="return_objects"/>
+		<button label="Löschen" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Begehbarkeit:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Begehbarkeit für Figuren vom Typ A. Ein Beispiel für diesen Typ wäre „Humanoid“."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Begehbarkeit für Figuren vom Typ B. Ein Beispiel für diesen Typ wäre „Kreatur“."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Begehbarkeit für Figuren vom Typ C. Ein Beispiel für diesen Typ wäre „Mechanisch“."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Begehbarkeit für Figuren vom Typ D. Ein Beispiel für diesen Typ wäre „Anderer“."/>
+		<button label="Änderungen übernehmen" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoid)
+		</text>
+		<text name="suggested_use_b_label">
+			(Kreatur)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mechanisch)
+		</text>
+		<text name="suggested_use_d_label">
+			(Anderer)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pay.xml b/indra/newview/skins/default/xui/de/floater_pay.xml
index a0a622ecbc..a0a622ecbc 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_pay.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/de/floater_pay_object.xml b/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 7159bbadb3..7159bbadb3 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/de/floater_people.xml b/indra/newview/skins/default/xui/de/floater_people.xml
index fd1db148ac..fd1db148ac 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_people.xml
+++ b/indra/newview/skins/default/xui/de/floater_people.xml
diff --git a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
index 9be22f3ccb..9be22f3ccb 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/de/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/de/floater_picks.xml b/indra/newview/skins/default/xui/de/floater_picks.xml
index 2521920e83..2521920e83 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_picks.xml
+++ b/indra/newview/skins/default/xui/de/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/de/floater_places.xml b/indra/newview/skins/default/xui/de/floater_places.xml
index 80a1490afd..80a1490afd 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_places.xml
+++ b/indra/newview/skins/default/xui/de/floater_places.xml
diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml
index a6ed8cc3df..a6ed8cc3df 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/de/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/de/floater_postcard.xml b/indra/newview/skins/default/xui/de/floater_postcard.xml
deleted file mode 100644
index 28af0183cb..0000000000
--- a/indra/newview/skins/default/xui/de/floater_postcard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="FOTO EMAILEN">
-	<text name="to_label">
-		E-Mail des Empfängers:
-	</text>
-	<text name="from_label">
-		Ihre E-Mail:
-	</text>	
-	<text name="name_label">
-		Ihr Name:
-	</text>	
-	<text name="subject_label">
-		Betreff:
-	</text>
-	<line_editor label="Betreff hier eingeben." name="subject_form"/>
-	<text name="msg_label">
-		Nachricht:
-	</text>
-	<text_editor name="msg_form">
-		Nachricht hier eingeben.
-	</text_editor>	
-	<text name="fine_print">
-		Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
-	</text>
-	<button label="Abbrechen" name="cancel_btn"/>
-	<button label="Senden" name="send_btn"/>
-	<text name="default_subject">
-		Postkarte aus [SECOND_LIFE].
-	</text>
-	<text name="default_message">
-		Sehen Sie hier!
-	</text>
-	<string name="upload_message">
-		Wird gesendet...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
index 3624c4c968..3624c4c968 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
index cdefb470c2..cdefb470c2 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index 2dd47a27ad..2dd47a27ad 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_animation.xml
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 76dc623ca4..76dc623ca4 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
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 14e666fd22..14e666fd22 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/de/floater_preview_sound.xml b/indra/newview/skins/default/xui/de/floater_preview_sound.xml
index 4629ec4a04..4629ec4a04 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/de/floater_preview_texture.xml b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
index 526c0813bd..526c0813bd 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
index bdd772a9c2..bdd772a9c2 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/de/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/de/floater_publish_classified.xml b/indra/newview/skins/default/xui/de/floater_publish_classified.xml
index d91535ebc3..d91535ebc3 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/de/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml
index b8a1a89c30..b8a1a89c30 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml
index c0dc47a67d..c0dc47a67d 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/de/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index e37e298478..e37e298478 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/de/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug.xml b/indra/newview/skins/default/xui/de/floater_script_debug.xml
index 585a6c36ea..585a6c36ea 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/de/floater_script_limits.xml b/indra/newview/skins/default/xui/de/floater_script_limits.xml
index 94a24a97ae..94a24a97ae 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/de/floater_script_preview.xml b/indra/newview/skins/default/xui/de/floater_script_preview.xml
index e0bcd42523..e0bcd42523 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/de/floater_script_queue.xml b/indra/newview/skins/default/xui/de/floater_script_queue.xml
index f267fe4b7c..f267fe4b7c 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/de/floater_script_search.xml b/indra/newview/skins/default/xui/de/floater_script_search.xml
index ffae96f6a1..ffae96f6a1 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
index bd39bf2bce..bd39bf2bce 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_search.xml
diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml
index 8ab9db520a..8ab9db520a 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/de/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
index 646138eaad..646138eaad 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
index 004e54a339..004e54a339 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index 798461c007..798461c007 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/de/floater_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
index 22ccb2c1a2..22ccb2c1a2 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/de/floater_sound_preview.xml b/indra/newview/skins/default/xui/de/floater_sound_preview.xml
index 1070c93405..1070c93405 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck.xml b/indra/newview/skins/default/xui/de/floater_spellcheck.xml
new file mode 100755
index 0000000000..213db277b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Einstellungen für Rechtschreibprüfung">
+	<check_box label="Rechtschreibprüfung aktivieren" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Hauptwörterbuch:
+	</text>
+	<text label="Protokolle:" name="spellcheck_additional">
+		Zusätzliche Wörterbücher:
+	</text>
+	<text name="spellcheck_available">
+		Verfügbar
+	</text>
+	<text name="spellcheck_active">
+		Aktiv
+	</text>
+	<button label="Entfernen" name="spellcheck_remove_btn"/>
+	<button label="Importieren..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..374c0fc0d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Wörterbuch importieren">
+	<button label="Durchsuchen" label_selected="Durchsuchen" name="dictionary_path_browse"/>
+	<button label="Importieren" name="ok_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index f6dc9fe15d..f3239f73c7 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="Pro Sek. gezeichnete KTris" name="ktrissec"/>
 					<stat_bar label="Objektanzahl" name="objs"/>
 					<stat_bar label="Neue Objekte" name="newobjs"/>
+					<stat_bar label="Objektcache-Trefferrate" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Textur" name="texture">
+					<stat_bar label="Cache-Trefferrate" name="texture_cache_hits"/>
+					<stat_bar label="Cache-Leselatenz" name="texture_cache_read_latency"/>
 					<stat_bar label="Zählen" name="numimagesstat"/>
 					<stat_bar label="Rohanzahl" name="numrawimagesstat"/>
 					<stat_bar label="GL Sp" name="gltexmemstat"/>
@@ -50,7 +53,13 @@
 				<stat_bar label="Objekte" name="simobjects"/>
 				<stat_bar label="Aktive Objekte" name="simactiveobjects"/>
 				<stat_bar label="Aktive Skripts" name="simactivescripts"/>
+				<stat_bar label="Skripts ausgeführt" name="simpctscriptsrun"/>
 				<stat_bar label="Skript-Events" name="simscripteps"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="AI-Schrittzeit" name="simsimaistepmsec"/>
+					<stat_bar label="Übersprungene Silhouettenschritte" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Figuren aktualisiert" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Paketeingang" name="siminpps"/>
 				<stat_bar label="Paketausgang" name="simoutpps"/>
 				<stat_bar label="Ausstehende Downloads" name="simpendingdownloads"/>
diff --git a/indra/newview/skins/default/xui/de/floater_sys_well.xml b/indra/newview/skins/default/xui/de/floater_sys_well.xml
index ec79b862b4..ec79b862b4 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/de/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/de/floater_telehub.xml b/indra/newview/skins/default/xui/de/floater_telehub.xml
index 83d37b2ce4..83d37b2ce4 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/de/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml
index 429447c378..429447c378 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/de/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml
index 506d2b013a..506d2b013a 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/de/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 8944c79c7d..b794d879f0 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -1,24 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="TEXTUR AUSWÄHLEN">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Zum Auswählen eines Bildes hier klicken
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Auswählen:
+	</floater.string>
 	<text name="Multiple">
 		Mehrere Texturen
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventar" name="inventory" value="0"/>
+		<radio_item label="Lokal" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Größe: [DIMENSIONS]
 	</text>
 	<button label="Standard" label_selected="Standard" name="Default"/>
-	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="Leer" label_selected="Leer" name="Blank"/>
-	<check_box label="Ordner anzeigen" name="show_folders_check"/>
-	<search_editor label="Texturen filtern" name="inventory search editor"/>
-	<check_box label="Jetzt übernehmen" name="apply_immediate_check"/>
+	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Vorschau deaktiviert"/>
+	<filter_editor label="Texturen filtern" name="inventory search editor"/>
+	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
+	<button label="Hinzufügen" label_selected="Hinzufügen" name="l_add_btn"/>
+	<button label="Entfernen" label_selected="Entfernen" name="l_rem_btn"/>
+	<button label="Hochladen" label_selected="Hochladen" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Name" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<text name="pick title">
-		Auswählen:
-	</text>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..97b0364832
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Debugger für Texturabruffehler">
+	<text name="total_num_fetched_label">
+		1, Gesamtzahl abgerufener Texturen: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Gesamtzahl von Abrufanforderungen: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Gesamtzahl von Cachetreffern: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Gesamtzahl sichtbarer Texturen: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Gesamtzahl von Abrufanforderungen für sichtbare Texturen: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Gesamtmenge abgerufener Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Gesamtmenge sichtbarer Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Gesamtmenge dargestellter Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Gesamtzeit Cache-Lesezugriffe: [TIME] s
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Gesamtzeit Cache-Schreibzugriffe: [TIME] s
+	</text>
+	<text name="total_time_decode_label">
+		11, Gesamtzeit Decodierung: [TIME] s
+	</text>
+	<text name="total_time_gl_label">
+		12, Gesamtzeit GL-Texturerstellung: [TIME] s
+	</text>
+	<text name="total_time_http_label">
+		13, Gesamtzeit HTTP-Abrufe: [TIME] s
+	</text>
+	<text name="total_time_fetch_label">
+		14, Gesamtzeit für alle Abrufe: [TIME] s
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Neuabruf sichtbarer Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, Neuabruf aller Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, Neuabruf sichtbarer Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, Neuabruf aller Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<spinner label="19, Verhältnis Texel/Pixel:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, Texturquelle:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Cache + HTTP" name="0"/>
+		<radio_item label="Nur HTTP" name="1"/>
+	</radio_group>
+	<button label="Starten" name="start_btn"/>
+	<button label="Zurücksetzen" name="clear_btn"/>
+	<button label="Schließen" name="close_btn"/>
+	<button label="Cache-Lesezugriff" name="cacheread_btn"/>
+	<button label="Cache-Schreibzugriff" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodieren" name="decode_btn"/>
+	<button label="GL-Textur" name="gl_btn"/>
+	<button label="Neuabruf sichtbarer Texturen (Cache)" name="refetchviscache_btn"/>
+	<button label="Neuabruf des gesamten Cache" name="refetchallcache_btn"/>
+	<button label="Neuabruf sichtbarer Texturen (HTTP)" name="refetchvishttp_btn"/>
+	<button label="Neuabruf des gesamten HTTP" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index dee89b28e5..6634a4bd90 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				Sie können diese Objekte nicht bearbeiten.
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden
+			</panel.string>
 			<panel.string name="text modify warning">
 				Gesamtes Objekt wählen, um Berechtigungen festzulegen.
 			</panel.string>
@@ -197,12 +203,12 @@
 				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="Zum Verkauf:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Kopie" name="Copy"/>
 				<combo_box.item label="Inhalt" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Preis: L$" name="Edit Cost"/>
 			<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -238,6 +244,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Pathfinding-Attribute:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objekt" name="Object">
 			<check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass das Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
@@ -455,16 +466,11 @@
 				<combo_box.item label="Saugen" name="suction"/>
 				<combo_box.item label="gewoben" name="weave"/>
 			</combo_box>
-			<check_box initial_value="falsch" label="Flache Oberflächen ausrichten" name="checkbox planar align" tool_tip="Texturen auf allen ausgewählten Oberflächen an der zuletzt ausgewählten Oberfläche ausrichten. Planar Texture Mapping erforderlich."/>
-			<text name="rpt">
-				Wiederholungen / Oberfläche
-			</text>
 			<spinner label="Horizontal (U)" name="TexScaleU"/>
 			<check_box label="Umkehren" name="checkbox flip s"/>
 			<spinner label="Vertikal (V)" name="TexScaleV"/>
 			<check_box label="Umkehren" name="checkbox flip t"/>
 			<spinner label="Rotation˚" name="TexRot"/>
-			<spinner label="Wiederholungen / Meter" name="rptctrl"/>
 			<button label="Übernehmen" label_selected="Übernehmen" name="button apply"/>
 			<text name="tex offset">
 				Texture-Versatz
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
index d2055a53db..f8130c6379 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Zeit
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Mono-Uhrzeit:
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Top-Kollisionsobjekte
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Name" name="name" width="135"/>
 		<scroll_list.columns label="Eigentümer" name="owner"/>
 		<scroll_list.columns label="Position" name="location" width="125"/>
+		<scroll_list.columns label="Parzelle" name="parcel"/>
 		<scroll_list.columns label="Uhrzeit" name="time"/>
-		<scroll_list.columns label="Mono-Uhrzeit:" name="mono_time"/>
 		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="Speicher (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		Objekt-ID:
@@ -42,12 +40,16 @@
 	<button label="Beacon anzeigen" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Objektname:
-	</text>	
+	</text>
 	<button label="Filter" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		Eigentümer:
-	</text>	
+	</text>
 	<button label="Filter" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parzelle:
+	</text>
+	<button label="Filtern" name="filter_parcel_btn"/>
 	<button label="Aktualisieren" name="refresh_btn"/>
 	<button label="Auswahl zurückgeben" name="return_selected_btn" width="134"/>
 	<button label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml
index ba329371f8..ba329371f8 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_tos.xml
+++ b/indra/newview/skins/default/xui/de/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/de/floater_toybox.xml b/indra/newview/skins/default/xui/de/floater_toybox.xml
index 90e50804d6..90e50804d6 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/de/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/de/floater_translation_settings.xml b/indra/newview/skins/default/xui/de/floater_translation_settings.xml
index 3d5d1d46a8..3d5d1d46a8 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml
index f5fa449c85..f5fa449c85 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/de/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..15259639e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE">
+	<slider label="Voice-Chat" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_controls.xml b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
index 5efda4136e..5efda4136e 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_controls.xml
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 413a46525c..8d37950480 100644..100755
--- 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">
+<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
new file mode 100644
index 0000000000..258627c94f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="LAUTSTÄRKE">
+	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_web_content.xml b/indra/newview/skins/default/xui/de/floater_web_content.xml
index 6ab119eeab..6ab119eeab 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/de/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
index 1332509529..1332509529 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/de/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml
index a2a53e0567..6502f002a1 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/de/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Fenstergröße einstellen:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="Breite x Höhe">
-		<combo_box.item label="1000 x 700 (Standard)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (Standard)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Festlegen" name="set_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index befa46651a..befa46651a 100644..100755
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/de/inspect_avatar.xml b/indra/newview/skins/default/xui/de/inspect_avatar.xml
index 4b8fd8a0ad..4b8fd8a0ad 100644..100755
--- a/indra/newview/skins/default/xui/de/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/de/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/de/inspect_group.xml b/indra/newview/skins/default/xui/de/inspect_group.xml
index 60fa8ff0d8..60fa8ff0d8 100644..100755
--- a/indra/newview/skins/default/xui/de/inspect_group.xml
+++ b/indra/newview/skins/default/xui/de/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/de/inspect_object.xml b/indra/newview/skins/default/xui/de/inspect_object.xml
index 72b8235828..72b8235828 100644..100755
--- a/indra/newview/skins/default/xui/de/inspect_object.xml
+++ b/indra/newview/skins/default/xui/de/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/de/inspect_remote_object.xml b/indra/newview/skins/default/xui/de/inspect_remote_object.xml
index 9fe05455eb..9fe05455eb 100644..100755
--- a/indra/newview/skins/default/xui/de/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/de/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/de/language_settings.xml b/indra/newview/skins/default/xui/de/language_settings.xml
index f9346eef7d..f9346eef7d 100644..100755
--- a/indra/newview/skins/default/xui/de/language_settings.xml
+++ b/indra/newview/skins/default/xui/de/language_settings.xml
diff --git a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml
index f3775a05ec..f3775a05ec 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
index 237c92f7d2..4c125c8b5d 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Einfrieren" name="Freeze..."/>
 	<menu_item_call label="Hinauswerfen" name="Eject..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
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 325d52a22e..7888c7b0a1 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<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="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Fallen lassen" name="Drop"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml
index c036cf5515..c036cf5515 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
index 8aee0be3d2..65dc054ed5 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Einfrieren" name="Freeze..."/>
 	<menu_item_call label="Hinauswerfen" name="Eject..."/>
 	<menu_item_call label="Fehler in Texturen beseitigen" name="Debug..."/>
+	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
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 c49f4b198b..022cd8c3ca 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<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="XML ausgeben" name="Dump XML"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_bottomtray.xml b/indra/newview/skins/default/xui/de/menu_bottomtray.xml
deleted file mode 100644
index cb0082f944..0000000000
--- a/indra/newview/skins/default/xui/de/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Schaltfläche „Sprechen“" name="EnableVoiceChat"/>
-	<menu_item_check label="Schaltfläche Gesten" name="ShowGestureButton"/>
-	<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 „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="Minikarten-Schaltfläche" 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"/>
-	<menu_item_call label="Löschen" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Alle auswählen" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
index 05d3dfca9d..05d3dfca9d 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
index 07960a525c..07960a525c 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
index 7fced273a7..7fced273a7 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
index 54b218d22f..2dd871b2ea 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
-	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
new file mode 100644
index 0000000000..bdfa66c23b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
+	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
+	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
+	<menu_item_call label="Ausgewählte schließen" name="close_selected_conversations"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Voice ignorieren" name="block_unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+	<menu_item_call label="Gruppenprofil" name="group_profile"/>
+	<menu_item_call label="Gruppe aktivieren" name="activate_group"/>
+	<menu_item_call label="Gruppe verlassen" name="leave_group"/>
+	<context_menu label="Moderatoroptionen" 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="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
+		<menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..2ef8762128
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Voice-Anruf..." name="Call"/>
+	<menu_item_call label="Chatverlauf öffnen..." name="Chat history"/>
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="Invite"/>
+	<menu_item_call label="Karte" name="Map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..ae3cc5bc97
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
+	<menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/>
+	<menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_edit.xml b/indra/newview/skins/default/xui/de/menu_edit.xml
index 37f68d68d5..37f68d68d5 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_edit.xml
+++ b/indra/newview/skins/default/xui/de/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/de/menu_favorites.xml b/indra/newview/skins/default/xui/de/menu_favorites.xml
index 0d0491d2eb..0d0491d2eb 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/de/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
index 953c0eeed5..953c0eeed5 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/de/menu_group_plus.xml b/indra/newview/skins/default/xui/de/menu_group_plus.xml
index 583ee793be..583ee793be 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/de/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
index 33d55e85bd..33d55e85bd 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
new file mode 100644
index 0000000000..875524b19d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Chatverlauf..." name="chat_history"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
+	<menu_item_check label="Text ignorieren" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..48f62d29a1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Kompaktansicht" name="compact_view"/>
+	<menu_item_check label="Erweiterte Ansicht" name="expanded_view"/>
+	<menu_item_check label="Zeit anzeigen" name="IMShowTime"/>
+	<menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_well_button.xml b/indra/newview/skins/default/xui/de/menu_im_well_button.xml
deleted file mode 100644
index f464b71f4a..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Alle schließen" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml
index 11f93f47b4..11f93f47b4 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/de/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
index 81ef3b6569..81ef3b6569 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/de/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
index d123238246..d123238246 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/de/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
index 641a0ceebe..641a0ceebe 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
index 73e0029b76..73e0029b76 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_inspect_object_gear.xml
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 5979194bfb..5979194bfb 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml
index 71cff7136b..71cff7136b 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/de/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index 39b3099336..cd2fca313e 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="Systemordner löschen" name="Delete System Folder"/>
 	<menu_item_call label="Konferenz-Chat starten" name="Conference Chat Folder"/>
 	<menu_item_call label="Wiedergeben/Abspielen" name="Sound Play"/>
+	<menu_item_call label="SLurl kopieren" name="url_copy"/>
 	<menu_item_call label="Landmarken-Info" name="About Landmark"/>
 	<menu_item_call label="Inworld abspielen" name="Animation Play"/>
 	<menu_item_call label="Lokal abspielen" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_add.xml b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
index af70c08ba1..af70c08ba1 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
index 48dec3e856..48dec3e856 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/de/menu_land.xml b/indra/newview/skins/default/xui/de/menu_land.xml
index de679da3d8..0bbf8c666e 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_land.xml
+++ b/indra/newview/skins/default/xui/de/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Pass kaufen" name="Land Buy Pass"/>
 	<menu_item_call label="Bauen" name="Create"/>
 	<menu_item_call label="Land bearbeiten" name="Edit Terrain"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_landmark.xml b/indra/newview/skins/default/xui/de/menu_landmark.xml
index 2aff0eec95..2aff0eec95 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/de/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index b43b41a5dc..62358cc5a8 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Servicebedingungen anzeigen" name="TOS"/>
 		<menu_item_call label="Wichtige Meldung anzeigen" name="Critical"/>
 		<menu_item_call label="Web Content Floater Debug Test" name="Web Content Floater Debug Test"/>
-		<menu label="Protokollierungsstufe festlegen" name="Set Logging Level"/>
+		<menu label="Protokollierungsstufe festlegen" name="Set Logging Level">
+			<menu_item_check label="Debug" name="Debug"/>
+			<menu_item_check label="Info" name="Info"/>
+			<menu_item_check label="Warnung" name="Warning"/>
+			<menu_item_check label="Fehler" name="Error"/>
+			<menu_item_check label="Keine" name="None"/>
+		</menu>
 		<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
 		<menu_item_call label="Benachrichtigungs-Konsole anzeigen" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
index 59c1c2ee86..59c1c2ee86 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/de/menu_mini_map.xml b/indra/newview/skins/default/xui/de/menu_mini_map.xml
index 2e0d72c40c..2e0d72c40c 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/de/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/de/menu_mode_change.xml b/indra/newview/skins/default/xui/de/menu_mode_change.xml
deleted file mode 100644
index b8090018b7..0000000000
--- a/indra/newview/skins/default/xui/de/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Basis" name="BasicMode"/>
-	<menu_item_check label="Erweitert" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
index e1faeedcde..e1faeedcde 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/de/menu_mute_particle.xml b/indra/newview/skins/default/xui/de/menu_mute_particle.xml
new file mode 100644
index 0000000000..ea8ae03ee0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_navbar.xml b/indra/newview/skins/default/xui/de/menu_navbar.xml
index 5175f34b41..5175f34b41 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/de/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
index 99d6428c3f..99d6428c3f 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
index 0f2784f160..0f2784f160 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/de/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 412bd3ac04..de2b409678 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -10,6 +10,8 @@
 	<menu_item_call label="Aufstehen" name="Object Stand Up"/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
+	<menu_item_call label="In Linksets anzeigen" name="show_in_linksets"/>
+	<menu_item_call label="In Figuren anzeigen" name="show_in_characters"/>
 	<context_menu label="Anziehen" name="Put On">
 		<menu_item_call label="Anziehen" name="Wear"/>
 		<menu_item_call label="Hinzufügen" name="Add"/>
@@ -26,4 +28,5 @@
 	<menu_item_call label="Bezahlen" name="Pay..."/>
 	<menu_item_call label="Kaufen" name="Buy..."/>
 	<menu_item_call label="Löschen" name="Delete"/>
+	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index 8b6c558416..f92fa0f82b 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Objektprofil..." name="Object Profile"/>
 	<menu_item_call label="Ignorieren..." name="Block"/>
+	<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
+	<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index d56c93533c..0cf3c09882 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Neues Haar" name="New Hair"/>
 		<menu_item_call label="Neue Augen" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Alle Ordner erweitern" name="expand"/>
+	<menu_item_call label="Alle Ordner schließen" name="collapse"/>
 	<menu_item_call label="Outfit neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
 </toggleable_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 32a65c96fc..32a65c96fc 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_tab.xml
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 160f2f97be..160f2f97be 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/de/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml
new file mode 100644
index 0000000000..6ceb9ac4c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/>
+	<menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/>
+	<menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/>
+	<menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/>
+	<menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/>
+	<menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/>
+	<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/>
+	<menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/>
+	<menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..f69a453e58
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Nicht mehr ignorieren" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..041fde139d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/>
+	<menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..1dae593ebe
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach Typ sortieren" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
new file mode 100644
index 0000000000..da4890fe96
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
+	<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
index 84d9d8938c..84d9d8938c 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
index 76225ba241..a69c82d3d8 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Info anzeigen" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Voice-Anruf" name="Call"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Verlassen" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
new file mode 100644
index 0000000000..20386bba56
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
index b68597d8aa..b68597d8aa 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index 1db964357f..cdbb3ae917 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Karte" name="Map"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Profil anzeigen" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Voice-Anruf" name="voice_call"/>
+	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
+	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
+	<menu_item_call label="Freund entfernen" name="remove_friend"/>
+	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
+	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
+	<menu_item_call label="Karte" name="map"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index b6e99edfe1..ba6578e2d1 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
-	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Anrufen" name="Call"/>
-	<menu_item_call label="Teilen" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
+	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
+	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Anrufen" name="call"/>
+	<menu_item_call label="Freigeben" name="share"/>
+	<menu_item_call label="Bezahlen" name="pay"/>
+	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..d38ec65037
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+	<menu_item_check label="Karte anzeigen" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
index a001544f3e..a001544f3e 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a116ad0bc1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Nach jüngsten sortieren" name="sort_most"/>
+	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
+	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
index 1ef020f5e1..1ef020f5e1 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/de/menu_picks.xml b/indra/newview/skins/default/xui/de/menu_picks.xml
index 9aec4c83b0..9aec4c83b0 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_picks.xml
+++ b/indra/newview/skins/default/xui/de/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/de/menu_picks_plus.xml b/indra/newview/skins/default/xui/de/menu_picks_plus.xml
index 385ff25b95..385ff25b95 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/de/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/de/menu_place.xml b/indra/newview/skins/default/xui/de/menu_place.xml
index d9c85f5b92..d9c85f5b92 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_place.xml
+++ b/indra/newview/skins/default/xui/de/menu_place.xml
diff --git a/indra/newview/skins/default/xui/de/menu_place_add_button.xml b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
index 7c0ff4a46a..7c0ff4a46a 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/de/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
index 892f075d3c..892f075d3c 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/de/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
index 8955f797a2..8955f797a2 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/de/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
index 9f3fcbca1d..9f3fcbca1d 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/de/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/de/menu_save_outfit.xml b/indra/newview/skins/default/xui/de/menu_save_outfit.xml
index 986c78b318..986c78b318 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/de/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml
index 3256aa1a87..3256aa1a87 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/de/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/de/menu_slurl.xml b/indra/newview/skins/default/xui/de/menu_slurl.xml
index b2ec017f9f..b2ec017f9f 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/de/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
index 68b8e21802..68b8e21802 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
index ff8fb0b181..ff8fb0b181 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
index 194dd16fd1..194dd16fd1 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/de/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml
index c00186c13e..2e33ed3416 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/de/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(unbekannt)" name="Suggestion 1"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 2"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 3"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 4"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 5"/>
+	<menu_item_call label="Zum Wörterbuch hinzufügen" name="Add to Dictionary"/>
+	<menu_item_call label="Zur Ignorieren-Liste hinzufügen" name="Add to Ignore"/>
 	<menu_item_call label="Ausschneiden" name="Cut"/>
 	<menu_item_call label="Kopieren" name="Copy"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/de/menu_toolbars.xml b/indra/newview/skins/default/xui/de/menu_toolbars.xml
index 3fb48e26b2..3fb48e26b2 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/de/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/de/menu_topinfobar.xml b/indra/newview/skins/default/xui/de/menu_topinfobar.xml
index 5b0a724244..5b0a724244 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/de/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index 9a808088fb..ddb072ba8f 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
+	<menu_item_call label="Profil anzeigen" name="show_agent"/>
+	<menu_item_call label="IM senden..." name="send_im"/>
+	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
+	<menu_item_call label="Freund entfernen..." name="remove_friend"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_group.xml b/indra/newview/skins/default/xui/de/menu_url_group.xml
index 6bd86414bc..6bd86414bc 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_http.xml b/indra/newview/skins/default/xui/de/menu_url_http.xml
index 30eb1668a5..30eb1668a5 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_inventory.xml b/indra/newview/skins/default/xui/de/menu_url_inventory.xml
index dc069df02b..dc069df02b 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_map.xml b/indra/newview/skins/default/xui/de/menu_url_map.xml
index 2f6ffcd450..2f6ffcd450 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 90d3763d9c..fc01ea8444 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
+	<menu_item_call label="Objektprofil..." name="show_object"/>
+	<menu_item_call label="Blockieren..." name="block_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_url_parcel.xml b/indra/newview/skins/default/xui/de/menu_url_parcel.xml
index 9169bca24f..9169bca24f 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_slapp.xml b/indra/newview/skins/default/xui/de/menu_url_slapp.xml
index 72e916b902..72e916b902 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_slurl.xml b/indra/newview/skins/default/xui/de/menu_url_slurl.xml
index 5d48230ebf..5d48230ebf 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/de/menu_url_teleport.xml b/indra/newview/skins/default/xui/de/menu_url_teleport.xml
index 4cc1ecc70e..4cc1ecc70e 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index d011c7295c..be5d4891d7 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Status" name="Status">
-			<menu_item_call label="Abwesend" name="Set Away"/>
-			<menu_item_call label="Beschäftigt" name="Set Busy"/>
+			<menu_item_check label="Abwesend" name="Away"/>
+			<menu_item_check label="Nicht stören" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
 		<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
@@ -28,17 +28,25 @@
 		<menu_item_call label="Einstellungen..." name="Preferences"/>
 		<menu_item_call label="Symbolleistenschaltflächen..." name="Toolbars"/>
 		<menu_item_call label="Alle Steuerelemente ausblenden" name="Hide UI"/>
+		<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
+		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
-		<menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/>
-		<menu_item_check label="Voice-Morphing..." name="ShowVoice"/>
+		<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation Log..."/>
+		<menu label="Voice-Morphing" name="VoiceMorphing">
+			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
+			<menu_item_check label="Vorschau..." name="Preview"/>
+			<menu_item_call label="Abonnieren..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesten..." name="Gestures"/>
-		<menu_item_call label="Freunde" name="My Friends"/>
-		<menu_item_call label="Gruppen" name="My Groups"/>
-		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_check label="Freunde" name="My Friends"/>
+		<menu_item_check label="Gruppen" name="My Groups"/>
+		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_call label="Blockierliste" name="Block List"/>
+		<menu_item_check label="Nicht stören" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Welt" name="World">
 		<menu_item_call label="Landmarke für diesen Ort setzen" name="Create Landmark Here"/>
@@ -107,13 +115,13 @@
 			<menu_item_call label="Nächsten Teil mit einsschließen" name="Include Next Part"/>
 			<menu_item_call label="Vorherige Teile mit einschließen" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Fokus auf Auswahl" name="Focus on Selection"/>
 		<menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
 		<menu label="Objekt" name="Object">
 			<menu_item_call label="Kaufen" name="Menu Object Buy"/>
 			<menu_item_call label="Nehmen" name="Menu Object Take"/>
 			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
-			<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Objekt zurückgeben" name="Return Object back to Owner"/>
 		</menu>
@@ -124,6 +132,12 @@
 			<menu_item_call label="Skripts auf ausführen einstellen" name="Set Scripts to Running"/>
 			<menu_item_call label="Skripts auf nicht ausführen einstellen" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
 			<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
@@ -152,6 +166,13 @@
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
+		<menu_item_call label="Benutzerhandbuch" name="User’s guide"/>
+		<menu_item_call label="Knowledge Base" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Community-Foren" name="Community Forums"/>
+		<menu_item_call label="Support-Portal" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
@@ -174,7 +195,6 @@
 			<menu_item_check label="Partikel ausblenden" name="Hide Particles"/>
 			<menu_item_check label="Auswahl ausblenden" name="Hide Selected"/>
 			<menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent"/>
-			<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
 			<menu_item_check label="Fadenkreuz für Mouselook anzeigen" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Darstellungstypen" name="Rendering Types">
@@ -227,11 +247,10 @@
 			<menu_item_check label="Textur" name="Texture Console"/>
 			<menu_item_check label="Fehler beseitigen" name="Debug Console"/>
 			<menu_item_call label="Meldungen" name="Notifications"/>
-			<menu_item_check label="Texturgröße" name="Texture Size"/>
-			<menu_item_check label="Texture-Kategorie" name="Texture Category"/>
 			<menu_item_check label="Schnelle Timer" name="Fast Timers"/>
 			<menu_item_check label="Speicher" name="Memory"/>
 			<menu_item_check label="Szenestatistiken" name="Scene Statistics"/>
+			<menu_item_call label="Debug-Konsole für Texturabruffehler" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Info zu Region in Fenster Fehler beseitigen" name="Region Info to Debug Console"/>
 			<menu_item_call label="Gruppeninfo in Fenster Fehler beseitigen" name="Group Info to Debug Console"/>
 			<menu_item_call label="Info zu Fähigkeiten in Fenster Fehler beseitigen" name="Capabilities Info to Debug Console"/>
@@ -266,6 +285,7 @@
 			<menu_item_check label="Framerate randomisieren" name="Randomize Framerate"/>
 			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
 			<menu_item_check label="Frame-Test" name="Frame Test"/>
+			<menu_item_call label="Rahmenprofil" name="Frame Profile"/>
 		</menu>
 		<menu label="Metadaten darstellen" name="Render Metadata">
 			<menu_item_check label="Bonding Boxes" name="Bounding Boxes"/>
@@ -289,14 +309,21 @@
 			<menu_item_check label="Komplexität beim Rendern" name="rendercomplexity"/>
 			<menu_item_check label="Byte in Anhängen" name="attachment bytes"/>
 			<menu_item_check label="Formen" name="Sculpt"/>
+			<menu label="Texturdichte" name="Texture Density">
+				<menu_item_check label="Keine" name="None"/>
+				<menu_item_check label="Aktuelle" name="Current"/>
+				<menu_item_check label="Gewünschte" name="Desired"/>
+				<menu_item_check label="Volle" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Achsen" name="Axes"/>
 			<menu_item_check label="Tangentenbasis" name="Tangent Basis"/>
 			<menu_item_call label="Texturinfo für ausgewähltes Objekt" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Ausgewählte Materialinfos" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
 			<menu_item_check label="Objekt-Objekt Okklusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Licht und Schatten" name="Lighting and Shadows"/>
+			<menu_item_check label="Erweitertes Beleuchtungsmodell" name="Advanced Lighting Model"/>
 			<menu_item_check label="Schatten von Sonne-/Mond-Projektoren" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO und Schattenglättung" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Fehler in GL beseitigen" name="Debug GL"/>
@@ -306,8 +333,6 @@
 			<menu_item_check label="Animationstexturen" name="Animation Textures"/>
 			<menu_item_check label="Texturen deaktivieren" name="Disable Textures"/>
 			<menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/>
-			<menu_item_check label="Texturen prüfen" name="Audit Textures"/>
-			<menu_item_check label="Textur-Atlas (experimentell)" name="Texture Atlas"/>
 			<menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/>
 			<menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/>
 			<menu_item_check label="Leucht-Objekte schweben lassen" name="Hover Glow Objects"/>
@@ -343,7 +368,6 @@
 			<menu_item_call label="Fokus ausgeben" name="Dump Focus Holder"/>
 			<menu_item_call label="Ausgewählte Objektinfo drucken" name="Print Selected Object Info"/>
 			<menu_item_call label="Agent-Info drucken" name="Print Agent Info"/>
-			<menu_item_call label="Speicher-Stats" name="Memory Stats"/>
 			<menu_item_check label="Regions-Debug-Konsole" name="Region Debug Console"/>
 			<menu_item_check label="Fehler in SelectMgr beseitigen" name="Debug SelectMgr"/>
 			<menu_item_check label="Fehler in Klicks beseitigen" name="Debug Clicks"/>
@@ -373,12 +397,10 @@
 				<menu_item_call label="Avatargeometry ein-/ausschalten" name="Toggle Character Geometry"/>
 				<menu_item_call label="Männlich testen" name="Test Male"/>
 				<menu_item_call label="Weiblich testen" name="Test Female"/>
-				<menu_item_call label="PG ein-/ausschalten" name="Toggle PG"/>
 				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
 			<menu_item_check label="Animations-Info" name="Animation Info"/>
-			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
 			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
 			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
 			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
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 283e454a06..283e454a06 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/de/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
index dacf898b6a..dacf898b6a 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
index 695451a105..695451a105 100644..100755
--- a/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/de/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index de93107e94..de93107e94 100644..100755
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
diff --git a/indra/newview/skins/default/xui/de/mime_types_linux.xml b/indra/newview/skins/default/xui/de/mime_types_linux.xml
index e4b5c53292..e4b5c53292 100644..100755
--- a/indra/newview/skins/default/xui/de/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/de/mime_types_mac.xml b/indra/newview/skins/default/xui/de/mime_types_mac.xml
index e4b5c53292..e4b5c53292 100644..100755
--- a/indra/newview/skins/default/xui/de/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/de/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index ac068fcd4e..b3ae98f633 100644..100755
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -140,7 +146,7 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
 		<usetemplate canceltext="Abbrechen" name="yesnocancelbuttons" notext="Nicht speichern" yestext="Alles speichern"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
-		Leute, die nicht auf Ihrer Freundesliste stehen, werden nicht wissen, dass Sie deren Anrufe oder Sofortnachrichten ignoriert haben.
+		Personen, die nicht auf Ihrer Freundesliste stehen, werden nicht informiert, dass Sie ihre Anrufe und Instant Messages ignorieren.
 		<usetemplate name="okbutton" yestext="Ja"/>
 	</notification>
 	<notification name="FavoritesOnLogin">
@@ -210,6 +216,14 @@ Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
 		<usetemplate name="okcancelbuttons" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Sie sind dabei, [AVATAR_NAME] aus der Gruppe hinauszuwerfen.
+		<usetemplate ignoretext="Hinauswerfen eines einzelnen Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Sie sind dabei, [COUNT] Mitglieder aus der Gruppe hinauszuwerfen.
+		<usetemplate ignoretext="Hinauswerfen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Sie möchten Ihren Anhang wirklich fallen lassen?
 Möchten Sie fortfahren?
@@ -367,13 +381,19 @@ Sie müssen den Benutzernamen Ihres Avatars eingeben.
 
 Sie benötigen ein Konto, um [SECOND_LIFE] betreten zu können. Möchten Sie jetzt ein Konto erstellen?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=de-DE
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Erneut versuchen" yestext="Neues Benutzerkonto anlegen"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Sie müssen entweder den Benutzernamen oder den Vor- und Nachnamen Ihres Avatars in das Feld „Benutzername“ eingeben und die Anmeldung dann erneut versuchen.
 	</notification>
+	<notification name="InvalidGrid">
+		„[GRID]“ ist keine gültige Grid-ID.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Ihre Startposition gibt kein gültiges Grid an.
+	</notification>
 	<notification name="DeleteClassified">
 		Anzeige „[NAME]“ löschen?
 Gebühren werden nicht rückerstattet.
@@ -479,8 +499,8 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
 		Ein kompiliertes Skript konnte aus folgendem Grund nicht gespeichert werden: [REASON].  Speichern Sie das Skript bitte später.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Sie haben keine Start-Region festgelegt.
-Bitte geben Sie den Namen der Region im Feld „Startposition“ ein oder wählen Sie „Mein letzter Standort“ oder „Mein Zuhause“ als Startposition aus.
+		Ihre Startregion ist nicht definiert.
+Geben Sie den Namen der Region im Feld „Startposition“ ein oder wählen Sie „Mein letzter Standort“ oder „Mein Zuhause“ als Startposition aus.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -502,6 +522,33 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Meine Hardware wird nicht unterstützt" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.intel.com/p/de_DE/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://support.amd.com/de/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=de-de
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -598,6 +645,9 @@ Sie können maximal [MAX] Objekte verknüpfen.
 
 Stellen Sie sicher, dass kein Objekt gesperrt ist und alle Objekte Ihnen gehören.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Objekte können nicht über Regionsgrenzen hinweg verknüpft werden.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Verknüpfung nicht möglich, da nicht alle Objekte denselben Eigentümer haben.
 
@@ -982,6 +1032,41 @@ Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
 			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification label="Automatische Ersetzungsliste hinzufügen" name="AddAutoReplaceList">
+		Name für neue Liste:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Automatische Ersetzungsliste umbenennen" name="RenameAutoReplaceList">
+		Der Name „[DUPNAME]“ wird bereits verwendet.
+ Geben Sie einen neuen eindeutigen Namen ein:
+		<form name="form">
+			<button name="ReplaceList" text="Aktuelle Liste ersetzen"/>
+			<button name="SetName" text="Neuen Namen verwenden"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Das Schlüsselwort muss ein einziges Wort sein; die Ersetzungszeichenfolge darf nicht leer sein.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Diese Ersetzungsliste ist nicht gültig.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Sie müssen eine Datei, einen Namen und eine Sprache angeben.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Das Wörterbuch [DIC_NAME] scheint keine „aff“-Datei zu haben und ist deshalb ein sekundäres Wörterbuch.
+Es kann als zusätzliches Wörterbuch verwendet werden, aber nicht als Hauptwörterbuch.
+
+Weitere Informationen finden Sie unter https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries.
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Kopieren nicht möglich:
+    [FROM_NAME]
+    in
+    [TO_NAME]
+	</notification>
 	<notification label="Outfit speichern" name="SaveOutfitAs">
 		Mein aktuelles Outfit als neues Outfit speichern:
 		<form name="form">
@@ -1047,7 +1132,7 @@ 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.
+		Auf mindestens eines der Objekte wird über Verknüpfungen Bezug genommen. Wenn Sie dieses Objekt löschen, funktionieren die Verknüpfungen nicht mehr.  Wir empfehlen daher, diese Verknüpfungen zuerst zu löschen.
 
 Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
@@ -1065,9 +1150,9 @@ Möchten Sie diese Objekte löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		Mindestens eines der ausgewählten Objekt gehört nicht Ihnen.
+		Mindestens eines der ausgewählten Objekte gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1081,14 +1166,14 @@ Möchten Sie diese Objekte löschen?
 		Mindestens ein Objekt ist gesperrt.
 Mindestens ein Objekt gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
 		Mindestens ein Objekt kann nicht kopiert werden.
 Mindestens ein Objekt gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
@@ -1096,7 +1181,7 @@ Möchten Sie diese Objekte löschen?
 Mindestens ein Objekt kann nicht kopiert werden.
 Mindestens ein Objekt gehört nicht Ihnen.
 
-Möchten Sie diese Objekte löschen?
+Möchten Sie diese Objekte wirklich löschen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
@@ -1162,7 +1247,7 @@ in „[THIS_GPU]“
 Sie wurden zur nächstgelegenen Region teleportiert.
 	</notification>
 	<notification name="AvatarMovedLast">
-		Ihr letzter Standort ist zurzeit nicht verfügbar.
+		Ihr angeforderter Standort ist zurzeit nicht verfügbar.
 Sie wurden zur nächstgelegenen Region teleportiert.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1181,8 +1266,7 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
 		Installation von [APP_NAME] vollständig abgeschlossen.
 
 Falls Sie [SECOND_LIFE] zum ersten Mal verwenden, müssen Sie zuerst ein Konto erstellen, bevor Sie sich anmelden können.
-Zurück zu [http://join.secondlife.com secondlife.com], um ein neues Konto zu erstellen?
-		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Neues Konto..."/>
+		<usetemplate name="okcancelbuttons" notext="Weiter" yestext="Konto erstellen..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Es gibt Probleme mit der Verbindung. Möglicherweise besteht ein Problem mit Ihrer Internetverbindung oder dem [SECOND_LIFE_GRID].
@@ -1416,13 +1500,43 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Informationen zu diesem Update]
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Ein erforderliches Softwareupdate wurde heruntergeladen.
-Version [VERSION]
+Version [VERSION] [[INFO_URL] Infos zu diesem Update]
 
 Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+[[INFO_URL] Infos zu diesem Update]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Für Ihre [APP_NAME]-Installation wurde ein Update heruntergeladen.
+Version [VERSION] 
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Details zu diesem Update finden Sie [[INFO_URL] hier].
+		<usetemplate name="okcancelbuttons" notext="Später..." yestext="Jetzt installieren und [APP_NAME] neu starten"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Für Ihre [APP_NAME]-Installation wurde ein Update heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
+		<usetemplate name="okcancelbuttons" notext="Später..." yestext="Jetzt installieren und [APP_NAME] neu starten"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Ein erforderliches Softwareupdate wurde heruntergeladen.
+Version [VERSION]
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
+
+Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
+Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
+weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1473,6 +1587,10 @@ Zur Installation des Updates muss [APP_NAME] neu gestartet werden.
 Diese Gruppe verlassen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Sie können die Gruppe nicht verlassen, da Sie der letzte Besitzer der Gruppe sind. Weisen Sie die Besitzerrolle zuerst einem anderen Mitglied zu.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Möchten Sie WIRKLICH alle Benutzer aus dem Grid werfen?
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="Alle Benutzer hinauswerfen"/>
@@ -1500,10 +1618,13 @@ Diese Gruppe verlassen?
 		Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Beschäftigt-Modus ist aktiviert.
-Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben.
-		<usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Nicht-stören-Modus ist aktiviert:  Sie erhalten keine Benachrichtigung über eingehende Kommunikation.
+
+- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen &gt; Allgemein).
+- Teleport-Angebote werden abgelehnt.
+- Voice-Anrufe werden abgelehnt.
+		<usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab.
@@ -1699,83 +1820,128 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Sie dürfen diese Region aufgrund Ihrer Alterseinstufung nicht betreten. Der Grund hierfür ist möglicherweise, dass Sie nicht altersüberprüft sind.
-
-Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben und besuchen Sie unsere Knowledgebase, um mehr über Regionen mit dieser Altereinstufung zu erfahren.
+		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Sie dürfen diese Region aufgrund Ihrer Alterseinstufung nicht betreten.
-
-Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
 		</url>
-		<usetemplate ignoretext="Ich kann diese Region aufgrund der Alterseinstufung nicht betreten" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
+		<usetemplate ignoretext="Regionswechsel: Die Region, die Sie besuchen möchten, enthält Inhalte, die nur für Erwachsene zugänglich sind." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Aufgrund Ihrer Alterseinstufung dürfen Sie diese Region nicht betreten.
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Sie dürfen diese Region aufgrund der Einstellung Ihrer Inhaltseinstufung nicht betreten.
-
-Bitte ändern Sie Ihre Einstellungen bezüglich der Inhaltseinstufung, um die gewünschte Region zu betreten. Danach können Sie nach [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Um die Veränderungen rückgängig zu machen, gehen Sie zu Ich &gt; Einstellungen &gt; Allgemein.
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern oder diesen Vorgang abbrechen. Nachdem Sie Ihre Einstellungen geändert haben, können Sie erneut versuchen, die Region zu betreten.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Regionswechsel: Die Region, die Sie besuchen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Wir haben technische Probleme mit Ihrem Teleport, da Ihre Einstellungen nicht mit dem Server synchronisiert sind.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
+		</url>
+		<usetemplate ignoretext="Teleport: Die Region, die Sie besuchen möchten, enthält Inhalte, die nur für Erwachsene zugänglich sind." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und den Teleport fortsetzen oder Sie können den Teleport abbrechen.
 		<form name="form">
-			<button name="OK" text="Einstellung ändern"/>
-			<button name="Cancel" text="Schließen"/>
-			<ignore name="ignore" text="Meine Alterseinstufung lässt nicht zu, dass ich eine Region betrete."/>
+			<button name="OK" text="Ändern und fortfahren"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Teleport (kann neu gestartet werden): Die Region, die Sie besuchen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern oder den Teleport abbrechen. Nachdem Sie Ihre Einstellungen geändert haben, können Sie den Teleport erneut versuchen.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Teleport (kann nicht neu gestartet werden): Die Region, die Sie besuchen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Wir haben technische Probleme mit Ihrem Teleport, da Ihre Einstellungen nicht mit dem Server synchronisiert sind.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Ihre Inhaltseinstufung ist jetzt [RATING].
+		Sie erhalten keine Benachrichtigungen mehr, wenn Sie eine Region der Inhaltseinstufung „[RATING]“ besuchen. Sie können Ihre Inhaltseinstellungen von der Menüleiste aus ändern („Ich“ &gt; „Einstellungen“ &gt; „Allgemein“).
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Wir konnten Ihre Einstellungen zur Anzeige von [PREFERRED_MATURITY]-Inhalten leider nicht ändern. Ihre Einstellungen wurden auf [ACTUAL_MATURITY]-Inhalte zurückgesetzt. Sie können erneut versuchen, Ihre Inhaltseinstellungen von der Menüleiste aus zu ändern („Ich“ &gt; „Einstellungen“ &gt; „Allgemein“).
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Sie haben aufgrund Ihrer Alterseinstufung keinen Anspruch auf dieses Land. Der Grund hierfür ist möglicherweise, dass Sie nicht altersüberprüft sind.
-
-Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben und besuchen Sie unsere Knowledgebase, um mehr über Regionen mit dieser Altereinstufung zu erfahren.
+		Die Inhaltseinstufung des Landes, das Sie in Besitz nehmen möchten, überschreitet Ihre aktuellen Einstellungen. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Sie haben aufgrund Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
-
-Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Nur Erwachsene können dieses Land in Besitz nehmen.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
 		</url>
-		<usetemplate ignoretext="Ich habe aufgrund der Alterseinstufung keinen Anspruch auf dieses Land" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
+		<usetemplate ignoretext="Nur Erwachsene können dieses Land in Besitz nehmen." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Sie haben aufgrund Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
+		Das Land, das Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Das Land, das Sie in Besitz nehmen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Sie haben aufgrund der Einstellung Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
-
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
-		<usetemplate ignoretext="Meine Alterseinstufung lässt nicht zu, dass ich auf Land Anspruch erhebe" name="okcancelignore" notext="Schließen" yestext="Einstellung ändern"/>
+		Das Land, das Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und anschließend erneut versuchen, das Land in Besitz zu nehmen.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Das Land, das Sie in Besitz nehmen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Sie können aufgrund Ihrer Alterseinstufung dieses Land nicht kaufen. Der Grund hierfür ist möglicherweise, dass Sie nicht altersüberprüft sind.
-
-Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben und besuchen Sie unsere Knowledgebase, um mehr über Regionen mit dieser Altereinstufung zu erfahren.
+		Die Inhaltseinstufung des Landes, das Sie kaufen möchten, überschreitet Ihre aktuellen Einstellungen.  Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Sie können aufgrund Ihrer Alterseinstufung dieses Land nicht kaufen.
-
-Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Nur Erwachsene können dieses Land kaufen.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
 		</url>
-		<usetemplate ignoretext="Ich kann aufgrund der Alterseinstufung dieses Land nicht kaufen" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
+		<usetemplate ignoretext="Nur Erwachsene können dieses Land kaufen." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Sie können aufgrund Ihrer Alterseinstufung dieses Land nicht kaufen.
+		Das Land, das Sie kaufen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Das Land, das Sie kaufen möchten, enthält Inhalte der Einstufung „[REGIONMATURITY]“, die nur für Erwachsene zugänglich sind.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Sie können aufgrund Ihrer Einstellung für Alterseinstufung dieses Land nicht kaufen.
-
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
-		<usetemplate ignoretext="Meine Alterseinstufung lässt nicht zu, dass ich Land kaufe" name="okcancelignore" notext="Schließen" yestext="Einstellung ändern"/>
+		Das Land, das Sie kaufen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und anschließend erneut versuchen, das Land zu kaufen.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Das Land, das Sie kaufen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Zu viele Prims wurden ausgewählt.  Bitte wählen Sie höchstens [MAX_PRIM_COUNT] Prims aus und versuchen Sie es erneut.
@@ -1830,10 +1996,9 @@ Anzeige für [AMOUNT] L$ veröffentlichen?
 		</form>
 	</notification>
 	<notification label="Alterseinstufung der Region ändern" name="RegionMaturityChange">
-		Die Alterseinstufung dieser Region wurde aktualisiert.
+		Die Inhaltseinstufung dieser Region wurde geändert.
 Es kann eine Weile dauern, bis diese Änderung auf der Karte angezeigt wird.
-
-Um Regionen der Alterseinstufung „Adult&quot; zu betreten, müssen Einwohner altersüberprüft sein. Dies kann entweder über die Alterverifizierung oder Zahlungsverifizierung geschehen.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Falsche Voice-Version" name="VoiceVersionMismatch">
 		Diese Version von [APP_NAME] ist mit der Voice-Chat-Funktion in dieser Region nicht kompatibel. Damit Voice-Chat funktioniert, müssen Sie [APP_NAME] aktualisieren.
@@ -1947,6 +2112,10 @@ Inventarobjekt(e) verschieben?
 		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt.  Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen.
+		<usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Wirklich beenden?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
@@ -2020,14 +2189,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
 			<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
-	<notification label="Beschäftigt-Modus-Warnung" name="BusyModePay">
-		Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
+	<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
+		Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
 
-Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
+Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/>
-			<button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/>
-			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
+			<ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/>
+			<button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/>
+			<button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2123,14 +2292,11 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 		<usetemplate ignoretext="Die Kleidung, die während dem Bearbeiten meines Aussehens erstellt wird, sofort anziehen" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Um auf Adult-Inhalte und –Bereiche in Second Life zuzugreifen, müssen Sie mindestens 18 Jahre alt sein. Bitte besuchen Sie die Altersüberprüfungsseite, um zu bestätigen, dass Sie mindestens 18 Jahre alt sind. 
-Hierzu wird Ihr Webbrowser geöffnet.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Ich habe mein Alter nicht verifizieren lassen" name="okcancelignore" notext="Abbrechen" yestext="Zur Altersüberprüfung"/>
+		Der Ort, den Sie besuchen möchten, ist nur für Bewohner zugänglich, die mindestens 18 Jahre alt sind.
+		<usetemplate ignoretext="Ich bin nicht alt genug, um beschränkte Bereiche zu besuchen." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Ort auf Einwohner beschränkt, die mindestens 18 Jahre alt sind.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Um diesen Bereich besuchen zu können, müssen Ihre Zahlungsinformationen gespeichert sein.  Möchten Sie diese Einstellung auf der [SECOND_LIFE]-Webseite einrichten?
@@ -2165,11 +2331,8 @@ Hierzu wird Ihr Webbrowser geöffnet.
 	<notification name="GroupNotice">
 		Betreff: [SUBJECT], Nachricht: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
@@ -2191,7 +2354,7 @@ Hierzu wird Ihr Webbrowser geöffnet.
 		Terrain.raw heruntergeladen
 	</notification>
 	<notification name="GestureMissing">
-		Hmm. Geste [NAME] fehlt in Datenbank.
+		Geste [NAME] fehlt in Datenbank.
 	</notification>
 	<notification name="UnableToLoadGesture">
 		Geste [NAME] konnte nicht geladen werden.
@@ -2289,9 +2452,7 @@ Wählen Sie ein einzelnes Objekt aus.
     „Teleportieren“ wählen.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Um Einwohner wie „[NAME]“ zu kontaktieren, klicken Sie auf die Schaltfläche „Leute“, wählen Sie eingeblendeten Fenster einen Einwohner aus
-    und klicken Sie unten im Fenster auf „IM“.
-    (Sie können auch auf den Namen doppelklicken bzw. ihn mit der rechten Maustaste anklicken und dann „IM“ wählen.)
+		Um eine private Unterhaltung zu beginnen, klicken Sie mit der rechten Maustaste auf den gewünschten Avatar und wählen Sie im Menü „IM“ aus.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Land kann nicht über Servergrenzen hinweg ausgewählt werden.
@@ -2391,6 +2552,16 @@ Fliegen ist hier nicht möglich.
 	<notification name="NoBuild">
 		In diesem Bereich ist das Bauen deaktiviert. Sie können keine Objekte bauen oder rezzen.
 	</notification>
+	<notification name="PathfindingDirty">
+		Diese Region weist ausstehende Pathfinding-Änderungen auf. Wenn Sie Baurechte besitzen, können Sie die Region durch Klicken auf die Schaltfläche „Region neu formen“ neu formen.
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Diese Parzelle verbirgt Avatare und Text-Chat vor einer anderen Parzelle.   Sie können Einwohner außerhalb dieser Parzelle weder sehen noch von ihnen gesehen werden.  Regulärer Text-Chat auf Kanal 0 ist ebenfalls blockiert.
 	</notification>
@@ -2409,9 +2580,7 @@ Hier funktionieren nur Skripts, die dem Landeigentümer gehören.
 		Öffentliches Land kann nur in der Region in Besitz genommen werden, in der Sie sich befinden.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Sie dürfen diese Region aufgrund Ihrer Alterseinstufung nicht betreten. Sie müssen eventuell eine Altersüberprüfung vornehmen und/oder den aktuellsten Viewer installieren.
-
-Bitte besuchen Sie unsere Knowledgebase, um mehr Details über Zugang zu Regionen mit dieser Alterseinstufung zu erhalten.
+		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Sie dürfen diese Region nicht betreten.
@@ -2422,11 +2591,11 @@ Bitte besuchen Sie unsere Knowledgebase, um mehr Details über Zugang zu Regione
 	<notification name="ImproperPaymentStatus">
 		Die für den Zutritt zu dieser Region erforderlichen Zahlungsinformationen liegen nicht vor.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Sie müssen altersüberprüft sein, um diese Region betreten zu können.
+	<notification name="MustGetAgeRegion">
+		Sie müssen mindestens 18 Jahre alt sein, um diese Region betreten zu können.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Sie müssen altersüberprüft sein, um diese Parzelle betreten zu können.
+		Sie müssen mindestens 18 Jahre alt sein, um diese Parzelle betreten zu können.
 	</notification>
 	<notification name="NoDestRegion">
 		Keine Zielregion gefunden.
@@ -2526,14 +2695,35 @@ Versuchen Sie es in einigen Minuten erneut.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] hat Ihnen einen Teleport an seine/ihre Position angeboten:
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+„[MESSAGE]“
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teleportieren"/>
 			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
+
+„[MESSAGE]“
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+
+Diese Region enthält [REGION_CONTENT_MATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGION_CONTENT_MATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und den Teleport fortsetzen oder Sie können den Teleport abbrechen.
+		<form name="form">
+			<button name="Teleport" text="Ändern und fortfahren"/>
+			<button name="Cancel" text="Abbrechen"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
+
+„[MESSAGE]“
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+
+Diese Region enthält jedoch Inhalte, die nur für Erwachsene zugänglich sind.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Ein Teleportangebot wurde an [TO_NAME] geschickt
 	</notification>
@@ -2628,16 +2818,21 @@ Ist das OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“, das „[NAME]“ gehört, stellt folgende Anfrage:
-
-[QUESTIONS]
-Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen.
-
-Anfrage gestatten?
+		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
+  
+Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
-			<button name="Grant" text="Gewähren"/>
+			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
-			<button name="Details" text="Info..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		Die Runtime-Skript-Berechtigung, die von „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ (Besitzer: „[NAME]“) angefordert wurde, wird vom Viewer nicht erkannt und kann nicht gewährt werden.
+
+Um diese Berechtigung zu gewähren, laden Sie die neueste Version des Viewers von [DOWNLOADURL] herunter.
+		<form name="form">
+			<button name="Deny" text="OK"/>
+			<button name="Mute" text="Blockieren"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2942,6 +3137,10 @@ Sie haben eine [RESOLUTION]-gebackene Textur für „[BODYREGION]“ nach [TIME]
 		( [EXISTENCE] Sekunden am Leben)
 Sie haben lokal eine [RESOLUTION]-gebackene Textur für „[BODYREGION]“ nach [TIME] Sekunden aktualisiert.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Wir können keine Vorschau dieser Textur anzeigen, da sie nicht kopier- und/oder übertragungsfähig ist.
+		<usetemplate ignoretext="Hinweis anzeigen, wenn bei nicht kopier- und/oder übertragungsfähigen Texturen keine Live-Vorschau möglich ist" name="okignore" yestext="OK"/>
+	</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"/>
@@ -3111,6 +3310,62 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
 		Durch diese Aktion werden alle Menüelemente und Schaltflächen ausgeblendet. Um sie wieder anzuzeigen, klicken Sie erneut auf [SHORTCUT].
 		<usetemplate ignoretext="Vor Ausblenden der UI bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht auf „[REQUESTED_TYPE]“ gesetzt werden.  Diese Linksets werden stattdessen auf „[RESTRICTED_TYPE]“ gesetzt.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht gesetzt werden." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Einige der ausgewählten Linksets können nicht auf „[REQUESTED_TYPE]“ gesetzt werden, da die Form nicht konvex ist.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Einige der ausgewählten Linksets können nicht gesetzt werden, da die Form nicht konvex ist." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet.
+
+Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht auf „[REQUESTED_TYPE]“ gesetzt werden.  Diese Linksets werden stattdessen auf „[RESTRICTED_TYPE]“ gesetzt.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet und andere können aufgrund von Berechtigungseinschränkungen nicht gesetzt werden." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet.
+
+Einige der ausgewählten Linksets können nicht auf „[REQUESTED_TYPE]“ gesetzt werden, da die Form nicht konvex ist.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet und andere können nicht gesetzt werden, da die Form nicht konvex ist." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht auf „[REQUESTED_TYPE]“ gesetzt werden.  Diese Linksets werden stattdessen auf „[RESTRICTED_TYPE]“ gesetzt.
+
+Einige der ausgewählten Linksets können nicht auf „[REQUESTED_TYPE]“ gesetzt werden, da die Form nicht konvex ist. Die Nutzungsarten dieser Linksets bleiben unverändert.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Einige der ausgewählten Linksets können nicht gesetzt werden, da die Berechtigungen eingeschränkt sind und die Form nicht konvex ist." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet.
+
+Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht auf „[REQUESTED_TYPE]“ gesetzt werden.  Diese Linksets werden stattdessen auf „[RESTRICTED_TYPE]“ gesetzt.
+
+Einige der ausgewählten Linksets können nicht auf „[REQUESTED_TYPE]“ gesetzt werden, da die Form nicht konvex ist. Die Nutzungsarten dieser Linksets bleiben unverändert.
+
+Möchten Sie fortfahren?
+		<usetemplate ignoretext="Bei einigen ausgewählten Linksets wird die Phantom-Markierung umgeschaltet und andere können nicht gesetzt werden, da die Berechtigungen für das Linkset eingeschränkt sind und die Form nicht konvex ist." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		Das ausgewählte Objekt wirkt sich auf das Navmesh aus. Wenn Sie es in einen flexiblen Pfad ändern, wird es aus dem Navmesh entfernt.
+		<usetemplate ignoretext="Das ausgewählte Objekt wirkt sich auf das Navmesh aus. Wenn Sie es in einen flexiblen Pfad ändern, wird es aus dem Navmesh entfernt." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Ihr Computer entspricht nicht den Hardwareanforderungen von [APP_NAME]. [APP_NAME] setzt eine OpenGL-Grafikkarte mit Multitextur-Unterstützung voraus. Falls Ihre Grafikkarte diese Funktion unterstützt, installieren Sie die neuesten Treiber sowie die aktuellen Service Packs und Patches für Ihr Betriebssystem.
 
@@ -3135,4 +3390,653 @@ Ansonsten können Sie auf der Karte nachsehen und dort Ort suchen, die als „In
 	<global name="You died and have been teleported to your home location">
 		Sie sind gestorben und wurden zu Ihrem Zuhause teleportiert.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] wurde nicht gefunden und konnte deshalb nicht aktualisiert werden.
+Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] konnte auch nach [NRETRIES] Versuchen nicht geöffnet oder decodiert werden und gilt als beschädigt.
+Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Versuch, eine ungültige oder nicht lesbare Bilddatei ([FNAME]) hinzuzufügen, die nicht geöffnet oder decodiert werden konnte.
+Versuch abgebrochen.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Sie sind dabei, [NUM_ITEMS] Objekte zurückzugeben. Möchten Sie diesen Vorgang wirklich fortsetzen?
+		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte zurückgeben?" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen?
+		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar eingefroren.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] hat Sie aufgetaut.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar aufgetaut.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Sie sind nicht mehr eingefroren und können sich frei bewegen.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Dieser Benutzer kann nicht eingefroren werden.
+	</notification>
+	<notification name="NowOwnObject">
+		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen.
+	</notification>
+	<notification name="SitFailCantMove">
+		Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Kommen Sie näher heran.  Sitzen auf Objekt nicht möglich, da
+es sich nicht in der gleichen Region befindet wie Sie.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Neues Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Ohne ausgewählte Hauptobjekte duplizieren.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Objekte können nicht dupliziert werden, da die Region voll ist.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Objekt kann nicht erstellt werden, da 
+die Parzelle voll ist.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Versuch zum Rezzen eines Objekts fehlgeschlagen.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Dieses Inventarobjekt ist auf der schwarzen Liste.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Landsuche blockiert.
+Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt.
+Warten Sie kurz und versuchen Sie es noch einmal.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sie sind gestorben und wurden nach Hause teleportiert
+	</notification>
+	<notification name="EjectComingSoon">
+		Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Sie können diese Region nicht betreten, da 
+der Server voll ist.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Erneutes Speichern im Inventar ist deaktiviert.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		„[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		„[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann.
+	</notification>
+	<notification name="NoModNoTaking">
+		Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben.
+	</notification>
+	<notification name="RezDestInternalError">
+		Interner Fehler: Unbekannter Zielttyp.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Löschen fehlgeschlagen, da Objekt nicht gefunden wurde
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Dieser Benutzer kann nicht hinausgeworfen werden.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="HomePositionSet">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar hinausgeworfen.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Objekt „[OBJECT_NAME]“ kann nicht nach
+[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Physik für Keyframe-Objekte kann nicht aktiviert werden.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden.
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt.
+	</notification>
+	<notification name="UnableAddItem">
+		Objekt konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="UnableEditItem">
+		Kein Bearbeiten möglich.
+	</notification>
+	<notification name="NoPermToEdit">
+		Bearbeiten nicht gestattet.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Kopieren dieses Inventars nicht gestattet.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
+	</notification>
+	<notification name="TooManyScripts">
+		Zu viele Skripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Skript konnte nicht hinzugefügt werden.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Asset-Server hat nicht rechtzeitig reagiert.  Objekt wurde zum Sim zurückübertragen.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In dieser Region sind keine Physikformen aktiviert.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Sie können das Navmesh nicht regionsübergreifend modifizieren.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Hauptprim kann nicht auf formlos eingestellt werden.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In dieser Region sind keine Physikmaterialien aktiviert.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Nur bei Hauptprims können die Physikmaterialien angepasst werden.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Sie können den Nahttyp eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Sie können die Form eines Mesh-Objekts nicht ändern.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Sie können diese Region nicht betreten, \nda die Region voll ist.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Verknüpfungsfehler – Eigentümer sind unterschiedlich
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Verknüpfungsfehler – zu viele Primitive
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Verknüpfungsfehler – nichts zum Verknüpfen vorhanden.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Verknüpfungsfehler – zu viele Pathfinding-Figuren
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Verknüpfungsfehler – nicht genügend Landressourcen
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert.
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sie wurden von einem Anhang an [ITEM_ID] teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Sie können hier nicht mehrere Objekte erstellen.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Objekt konnte nicht an angegebenem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Auf diesem Land können keine Pflanzen erstellt werden.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantCreateObject">
+		Sie können gegenwärtig keine Objekte erstellen.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Ungültige Objektparameter
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantChangeShape">
+		Sie können diese Form nicht ändern.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Bäume und Gräser können nicht als Anhänge getragen werden.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Objekte im Gruppenbesitz können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Objekte, die Ihnen nicht gehören, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Objekte, die zum Navmesh beitragen, können nicht angehängt werden.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Objekt kann nicht hier abgelegt werden.  Die Parzelle ist voll.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Grenzen Sie Ihre Löschparameter ein.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Asset kann nicht hochgeladen werden.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Keinen Benutzer zum Teleportieren nach Hause gefunden
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		Anforderdung nach übernatürlichen Kräften fehlgeschlagen
+	</notification>
+	<notification name="GenericRequestFailed">
+		generische Anforderdung fehlgeschlagen
+	</notification>
+	<notification name="CantUploadPostcard">
+		Postkarte kann nicht hochgeladen werden.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Inventardetails für Gruppenmitteilung kann nicht abgerufen werden.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Inventar in Mitteilung kann nicht geparst werden.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Fehler beim Hochladen von Terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Terraindatei geschrieben.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Terraindatei geschrieben, Download beginnt...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain geformt.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Sie sind nicht der autorisierte Käufer dieser Parzelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -&gt; „Fehler melden“...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Land wurde geteilt.
+	</notification>
+	<notification name="PassPurchased">
+		Sie haben einen Pass gekauft.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Region lässt keine Werbung zu.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ihr Pass für dieses Land läuft demnächst ab.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Land in Gruppenbesitz kann nicht übertragen werden.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Passkauf momentan nicht möglich.  Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Objekt kann nicht erstellt werden, \nda die Parzelle voll ist.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Landmarke für dieses Ereignis kann nicht erstellt werden.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Ihre übernatürlichen Kräfte heben das Einfrieren auf!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert.
+	</notification>
+	<notification name="ExpireExplanation">
+		Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung.
+	</notification>
+	<notification name="DieExplanation">
+		Das System kann Ihre Anfrage nicht verarbeiten.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Sie haben nicht genügend Geld, um Primitive zu erstellen.
+	</notification>
+	<notification name="RezObjectFailure">
+		Sie haben nicht genügend Geld, um Objekt zu erstellen.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Zuhause-Position neu festlegen, da Zuhause nicht zulässig war.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
+	</notification>
+	<notification name="SetHomePosition">
+		Position für Zuhause festgelegt.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Angefordertes Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Angeforderter Inventarordner kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateInventory">
+		Dieses Inventar kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Landmarke kann nicht erstellt werden.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Inventar steht nicht zum Verkauf.
+	</notification>
+	<notification name="CantFindInvItem">
+		Inventarobjekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantFindObject">
+		Objekt kann nicht gefunden werden.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Nicht ersichtlich, wer bezahlt werden muss.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Sie können öffentlichen Objekten keine L$ geben.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Inventarerstellung für Inworld-Objekt fehlgeschlagen.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden.  Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden.  Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht.
+		<usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht.
+		<usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt.
+		<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100644..100755
--- a/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/de/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/de/panel_active_object_row.xml b/indra/newview/skins/default/xui/de/panel_active_object_row.xml
index 00de705a30..00de705a30 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/de/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
index 6ad18781f5..6ad18781f5 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/de/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
index dcfcffa6e2..79a2ebe9df 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/>
 	<icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/>
 	<icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
index 09f930ec01..09f930ec01 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index 2d140515d4..c105a5b8a3 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel" width="300">
-	<text left_pad="5" name="title_text" width="260">
-		Liste der ignorierten Einwohner
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
-	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
-	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
-	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtern" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/>
+		<menu_button name="view_btn" tool_tip="Sortieroptionen"/>
+		<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
+		<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
 </panel>
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 799586f021..799586f021 100644..100755
--- 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
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
index 4d7e65405a..4d7e65405a 100644..100755
--- 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
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
deleted file mode 100644
index afe9836401..0000000000
--- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<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"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Bewegen" name="movement_btn" tool_tip="Bewegungssteuerung anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Ansicht" name="camera_btn" tool_tip="Kamerasteuerung anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Foto machen"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Bauen" name="build_btn" tool_tip="Bauwerkzeuge ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Suche" name="search_btn" tool_tip="Suche anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Karte" name="world_map_btn" tool_tip="Karte ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_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"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Benachrichtigungen"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml
index 9c84105254..9c84105254 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/de/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/de/panel_chat_header.xml b/indra/newview/skins/default/xui/de/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/de/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml
index bcc6772bb9..bcc6772bb9 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/de/panel_classified_info.xml b/indra/newview/skins/default/xui/de/panel_classified_info.xml
index 007e9d69f0..007e9d69f0 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_classified_info.xml
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
index fc45c9ce79..fc45c9ce79 100644..100755
--- 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
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 945acb02d7..945acb02d7 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml
index 12294a43ce..12294a43ce 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/de/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..a9bfe4754e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(laden)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..afeaa14e81
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/>
+	<icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/>
+	<button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/>
+</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 a27252e23e..a27252e23e 100644..100755
--- 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
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 b7ad1bdc1b..b7ad1bdc1b 100644..100755
--- 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
diff --git a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
index 4c6facf5e3..4c6facf5e3 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_classified.xml b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
index bd270697ea..bd270697ea 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
index 69bcf2fb71..69bcf2fb71 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
index fb7d18f66c..fb7d18f66c 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_hair.xml b/indra/newview/skins/default/xui/de/panel_edit_hair.xml
index d6efde8306..d6efde8306 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
index 1b7c1d79a5..1b7c1d79a5 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pants.xml b/indra/newview/skins/default/xui/de/panel_edit_pants.xml
index 533cf20412..533cf20412 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_physics.xml b/indra/newview/skins/default/xui/de/panel_edit_physics.xml
index bd9c84577a..bd9c84577a 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_pick.xml b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
index aafffc7ae3..aafffc7ae3 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_profile.xml b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
index 03974e7f7f..03974e7f7f 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_profile.xml
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 80d3b29cad..80d3b29cad 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml
index 4f140a2b01..4f140a2b01 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
index abedb8d89e..abedb8d89e 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skin.xml b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
index 60f6919485..60f6919485 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
index 07ce8a7436..07ce8a7436 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_socks.xml b/indra/newview/skins/default/xui/de/panel_edit_socks.xml
index 4e72b63f49..4e72b63f49 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_socks.xml
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 075a9d752a..075a9d752a 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
index 1fad0ccedb..1fad0ccedb 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
index 9d193ffedb..9d193ffedb 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_undershirt.xml
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 94a79a0bbd..94a79a0bbd 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/de/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
index 9cb72fafff..9cb72fafff 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index 9d4301de73..9d4301de73 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
index bf4d44af52..bf4d44af52 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 5f323d80dd..c32d2fe4bf 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Gruppeneinladungen nicht gesendet: zu viele Einwohner ausgewählt. Gruppeneinladungen sind auf 100 Einwohner pro Anfrage beschränkt.
+	</panel.string>
 	<text name="help_text">
 		Sie können mehrere Einwohner in Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
 	</text>
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 d9d237be2e..d9d237be2e 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
index d097a2b18c..fc911a64df 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Unbekannt"/>
+	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
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 df423cc69a..df423cc69a 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_notify.xml b/indra/newview/skins/default/xui/de/panel_group_notify.xml
index 9c05e99786..9c05e99786 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/de/panel_group_roles.xml b/indra/newview/skins/default/xui/de/panel_group_roles.xml
index f297d32a91..f297d32a91 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
index abf8011d9d..abf8011d9d 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/de/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/de/panel_instant_message.xml b/indra/newview/skins/default/xui/de/panel_instant_message.xml
index 372def78ca..372def78ca 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/de/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/de/panel_inventory_item.xml b/indra/newview/skins/default/xui/de/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/de/panel_landmark_info.xml b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
index 10cf34c170..10cf34c170 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/de/panel_landmarks.xml b/indra/newview/skins/default/xui/de/panel_landmarks.xml
index c1f8a20728..c1f8a20728 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/de/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 553bd3e2ff..8cc467185c 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://de.secondlife.com/registration/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=de
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				ANMELDEN
+			</text>
 			<text name="username_text">
 				Benutzername:
 			</text>
@@ -15,17 +15,10 @@
 			<text name="password_text">
 				Kennwort:
 			</text>
-			<check_box label="Kennwort merken" name="remember_check"/>
-			<button label="Anmelden" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Modus:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Wählen Sie den gewünschten Modus aus. Basis: Second Life schnell und einfach erkunden und chatten. Erweitert: Zugriff auf zusätzliche Funktionen.">
-				<combo_box.item label="Basis" name="Basic"/>
-				<combo_box.item label="Erweitert" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
-				Hier anfangen:
+				Hier starten:
 			</text>
 			<combo_box name="start_location_combo">
 				<combo_box.item label="Mein letzter Standort" name="MyLastLocation"/>
@@ -33,16 +26,21 @@
 				<combo_box.item label="&lt;Region eingeben&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Registrieren
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Brauchen Sie Hilfe beim Anmelden?
 			</text>
 			<text name="forgot_password_text">
 				Benutzernamen oder Kennwort vergessen?
 			</text>
-			<text name="login_help">
-				Sie brauchen Hilfe?
+			<button label="Anmelden" name="connect_btn"/>
+			<check_box label="Kennwort speichern" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				IHR KONTO ERSTELLEN
 			</text>
+			<button label="Jetzt starten" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
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 2f00782ef0..2f00782ef0 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/de/panel_me.xml b/indra/newview/skins/default/xui/de/panel_me.xml
index f49446fbbf..f49446fbbf 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_me.xml
+++ b/indra/newview/skins/default/xui/de/panel_me.xml
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
index 75c9057571..75c9057571 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
index dd408b8275..dd408b8275 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
index adc0d22ce6..adc0d22ce6 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/de/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
index 53794b6619..53794b6619 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
index 07ad761791..07ad761791 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
index 08cc0b0ec8..69cf6d98de 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Zum Chatten hier klicken." name="chat_box" tool_tip="Eingabe drücken, um zu sprechen, Strg-Eingabe drücken, um zu Rufen."/>
 	<button name="show_nearby_chat" tool_tip="Protokoll des Chats in der Nähe anzeigen/ausblenden"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
index 90885c7192..90885c7192 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml
index 35bd76ce70..35bd76ce70 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/de/panel_notifications_channel.xml
diff --git a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml
index da672a0309..da672a0309 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/de/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
index 7c7448c061..7c7448c061 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/de/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
index 4006022ffc..4006022ffc 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_outbox_inventory.xml
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 1af0492aa1..1af0492aa1 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfit_edit.xml
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 d5158b2d97..d5158b2d97 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
index ad0e039070..ad0e039070 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_list.xml b/indra/newview/skins/default/xui/de/panel_outfits_list.xml
index ea3a938be9..ea3a938be9 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
index 27141796a8..27141796a8 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/de/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 4e76147746..2d56d6b7d2 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -14,81 +14,56 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_filtered_friends_msg">
 		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/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
-	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
-		<panel label="MEINE FREUNDE" name="friends_panel">
+		<panel label="FREUNDE" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEINE GRUPPEN" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Optionen"/>
-				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
-				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
+		<panel label="GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/>
+				<menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
 			</panel>
+			<text name="groupcount">
+				Sie gehören [COUNT] Gruppen an und können [REMAINING] weiteren beitreten.
+			</text>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Optionen"/>
-				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Nach Personen filtern" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
+				<menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
+				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
+				<dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
 			</panel>
 		</panel>
+		<panel label="IGNORIERT" name="blocked_panel">
+			<panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_pick_info.xml b/indra/newview/skins/default/xui/de/panel_pick_info.xml
index f215c43a3d..f215c43a3d 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/de/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/de/panel_picks.xml b/indra/newview/skins/default/xui/de/panel_picks.xml
index 6aaa3151a8..6aaa3151a8 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_picks.xml
+++ b/indra/newview/skins/default/xui/de/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/de/panel_place_profile.xml b/indra/newview/skins/default/xui/de/panel_place_profile.xml
index 4077fdab36..4077fdab36 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/de/panel_places.xml b/indra/newview/skins/default/xui/de/panel_places.xml
index 602ffff94d..602ffff94d 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_places.xml
+++ b/indra/newview/skins/default/xui/de/panel_places.xml
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_message.xml b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
index 6eeef8af71..6eeef8af71 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
index c1a1c0cc46..c1a1c0cc46 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/de/panel_postcard_settings.xml
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 8a5c175f2f..8a5c175f2f 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
index fcb45e26be..fcb45e26be 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_alerts.xml
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 746a561e6c..8eb815fd1b 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<text name="font_size">
-		Schriftgröße:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Klein" name="radio" value="0"/>
-		<radio_item label="Mittel" name="radio2" value="1"/>
-		<radio_item label="Groß" name="radio3" value="2"/>
-	</radio_group>
-	<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 IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
-	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IMs anzeigen in:
-	</text>
-	<text name="requires_restart_label">
-		(Neustart erforderlich)
-	</text>
-	<radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich).">
-		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
-		<radio_item label="Registerkarten" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Popups für eingehende Chats aktivieren:
-	</text>
-	<check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/>
-	<check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/>
-	<spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/>
-	<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
-	<button label="Übersetzungseinstellungen für Chats" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
+		<check_box label="IMs per E-Mail zustellen, wenn ich offline bin" name="send_im_to_email"/>
+		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Schriftgröße:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Klein" name="Small" value="0"/>
+			<item label="Mittel" name="Medium" value="1"/>
+			<item label="Groß" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			IMs von Freunden:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			IMs von anderen:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			Konferenz-IMs:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Gruppen-Chat:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Chat in der Nähe:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IMs von Objekten:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
+			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
+			<item label="Keine Aktion" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sound abspielen" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Sound abspielen:
+		</text>
+		<check_box label="Neue Unterhaltung" name="new_conversation"/>
+		<check_box label="Eingehender Anruf" name="incoming_voice_call"/>
+		<check_box label="Teleport-Angebot" name="teleport_offer"/>
+		<check_box label="Inventarangebot" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Protokoll löschen..." name="clear_log"/>
+		<button label="Transkripte löschen..." name="delete_transcripts"/>
+		<button label="Durchsuchen..." label_selected="Durchblättern" name="log_path_button"/>
+	</panel>
+	<button label="Übersetzen..." name="ok_btn"/>
+	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
+	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
index 19c5efcb05..19c5efcb05 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 979ccba48d..4e453b6969 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Antwort, wenn im „Beschäftigt“-Modus:
+		Nicht-stören-Antwort:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </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 9175ea0bae..f3746a7c82 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
 		<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
 		<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Licht und Schatten" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
 		<check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
index 3e248f0bf0..3e248f0bf0 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
index e21bed6bb5..e21bed6bb5 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 8c7ea688d7..24e5033bfc 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Automatisch installieren" name="Install_automatically"/>
 		<combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Bereit, Release-Kandidaten zu verwenden" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Proxy-Einstellungen:
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
index 1e6a03c99f..1e6a03c99f 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
index c85f2762b1..c85f2762b1 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/de/panel_region_covenant.xml b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
index 225c98b84f..225c98b84f 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
index d1b8f0d78a..a03a0b8b7b 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" name="top_scripts_help"/>
 	<button label="Region neu starten" name="restart_btn" tool_tip="2-Minuten-Countdown und Region neu starten"/>
 	<button label="?" name="restart_help"/>
-	<button label="Neustart verzögern" name="cancel_restart_btn" tool_tip="Regionsneustart um eine Stunde verschieben"/>
+	<button label="Neustart abbrechen" name="cancel_restart_btn" tool_tip="Regionsneustart abbrechen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_environment.xml b/indra/newview/skins/default/xui/de/panel_region_environment.xml
index daadd30f62..daadd30f62 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index aecf6f62fc..b087451391 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -19,7 +19,7 @@
 		Zugang nur Einwohnern gestatten, die:
 	</text>
 	<check_box label="Zahlungsinformationen hinterlegt haben" name="limit_payment" tool_tip="Um diesen Grundbesitz besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
-	<check_box label="ihr Alter bestätigt haben" name="limit_age_verified" tool_tip="Um diesen Grundbesitz besuchen zu können, müssen Einwohner ihr Alter bestätigt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
+	<check_box label="Sind mindestens 18 Jahre alt" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diesen Grundbesitz betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
 	<check_box label="Voice-Chat erlauben" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text" width="222">
diff --git a/indra/newview/skins/default/xui/de/panel_region_general.xml b/indra/newview/skins/default/xui/de/panel_region_general.xml
index f383be992b..f383be992b 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
index 7801be30e4..7801be30e4 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml
deleted file mode 100644
index 2f4904730b..0000000000
--- a/indra/newview/skins/default/xui/de/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Bodentexturen" name="Textures">
-	<text name="region_text_lbl">
-		Region:
-	</text>
-	<text name="region_text">
-		unbekannt
-	</text>
-	<text name="detail_texture_text">
-		Terraintexturen (erfordert 512x512, 24-Bit-.tga-Dateien)
-	</text>
-	<text name="height_text_lbl">
-		1 (niedrig)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Hoch)
-	</text>
-	<text name="height_text_lbl5">
-		Texturhöhenbereich
-	</text>
-	<text name="height_text_lbl6">
-		Nordwest
-	</text>
-	<text name="height_text_lbl7">
-		Nordost
-	</text>
-	<text name="height_text_lbl8">
-		Südwest
-	</text>
-	<text name="height_text_lbl9">
-		Südost
-	</text>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_0"/>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_1"/>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_2"/>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_3"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_0"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_1"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_2"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Diese Werte geben den Mischungsgrad für die obigen Texturen an.
-	</text>
-	<text name="height_text_lbl11">
-		In Metern gemessen. Der NIEDRIG-Wert ist die MAXIMALE Höhe der Textur #1, der HÖCHST-Wert ist die MINDEST-Höhe von Textur #4.
-	</text>
-	<text name="height_text_lbl12">
-		und der OBERE WERT die MINIMALE Höhe von Textur 4.
-	</text>
-	<button label="Übernehmen" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_script_ed.xml b/indra/newview/skins/default/xui/de/panel_script_ed.xml
index 7e03aeff15..d688bedd5c 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Alle auswählen" name="Select All"/>
 			<menu_item_call label="Auswahl aufheben" name="Deselect"/>
 			<menu_item_call label="Suchen / Ersetzen..." name="Search / Replace..."/>
+			<menu_item_call label="Gehe zu Zeile..." name="Go to line..."/>
 		</menu>
 		<menu label="Hilfe" name="Help">
 			<menu_item_call label="Hilfe..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
index c91eb98e9c..c91eb98e9c 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
index 8d7cc1bf9a..8d7cc1bf9a 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/de/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
index 50590b8d73..50590b8d73 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/de/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/de/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml
deleted file mode 100644
index 3c81636fa0..0000000000
--- a/indra/newview/skins/default/xui/de/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Seitenleiste auf-/zuklappen." name="sidebar_openclose" tab_title="Seitenleiste auf-/zuklappen"/>
-	<sidetray_tab description="Startseite." name="sidebar_home" tab_title="Startseite">
-		<panel label="Startseite" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me" tab_title="Mein Profil">
-		<panel_container name="panel_container">
-			<panel label="Ich" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Freunde, Kontakte und Leute in Ihrer Nähe finden." name="sidebar_people" tab_title="Leute">
-		<panel_container name="panel_container">
-			<panel label="Gruppenprofil" name="panel_group_info_sidetray"/>
-			<panel label="Ignorierte Einwohner &amp; Objekte" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Hier finden Sie neue Orte und Orte, die Sie bereits besucht haben." label="Orte" name="sidebar_places" tab_title="Orte">
-		<panel label="Orte" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Inventar durchsuchen." name="sidebar_inventory" tab_title="Mein Inventar">
-		<panel label="Inventar bearbeiten" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Ändern Sie Ihr Aussehen und Ihren aktuellen Look." name="sidebar_appearance" tab_title="Mein Aussehen">
-		<panel label="Aussehen bearbeiten" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
index 652fb7c836..652fb7c836 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/de/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
index cf3080a4f9..cf3080a4f9 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/de/panel_sidetray_home_tab.xml
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index 10827ce6f2..10827ce6f2 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
index 3aeae80388..3aeae80388 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
index e1d8a5dc6d..e1d8a5dc6d 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
index c9afe86d7f..c9afe86d7f 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
index 8d1c52dea8..8d1c52dea8 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/de/panel_sound_devices.xml b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
index b739b6197f..b739b6197f 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/de/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
index be21429007..be21429007 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/de/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/de/panel_status_bar.xml b/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 14ace0ac3a..14ace0ac3a 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/de/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
index 504f1727e2..504f1727e2 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_sys_well_item.xml
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history.xml b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
index 4d721f2af6..4d721f2af6 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/de/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
index 4b57aa69b6..4b57aa69b6 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
new file mode 100644
index 0000000000..18517d7a7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Textur" name="Texture">
+	<panel.string name="string repeats per meter">
+		Wiederholungen pro Meter
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Wiederholungen pro Fläche
+	</panel.string>
+	<text name="color label">
+		Farbe
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	<text name="color trans">
+		Transparenz %
+	</text>
+	<text name="glow label">
+		Leuchten
+	</text>
+	<check_box label="Ganz hell" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Material" name="Materials"/>
+		<combo_box.item label="Medien" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Textur (diffus)" name="Texture (diffuse)"/>
+		<combo_box.item label="Unebenheit (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Glanzlicht (Spiegel)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
+	<text name="label alphamode">
+		Alpha-Modus
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Keiner" name="None"/>
+		<combo_box.item label="Alpha-Mischung" name="Alpha blending"/>
+		<combo_box.item label="Alpha-Maske" name="Alpha masking"/>
+		<combo_box.item label="Selbststrahlende Maske" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Maskenabgrenzung
+	</text>
+	<texture_picker label="Textur" name="bumpytexture control" tool_tip="Klicken, um ein Bild auszuwählen"/>
+	<text name="label bumpiness">
+		Unebenheit
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Keine" name="None"/>
+		<combo_box.item label="Helligkeit" name="Brightness"/>
+		<combo_box.item label="Dunkelheit" name="Darkness"/>
+		<combo_box.item label="Holzmaserung" name="woodgrain"/>
+		<combo_box.item label="Rinde" name="bark"/>
+		<combo_box.item label="Backsteine" name="bricks"/>
+		<combo_box.item label="Schachbrett" name="checker"/>
+		<combo_box.item label="Beton" name="concrete"/>
+		<combo_box.item label="Rostkachel" name="crustytile"/>
+		<combo_box.item label="Steinfliesen" name="cutstone"/>
+		<combo_box.item label="Scheiben" name="discs"/>
+		<combo_box.item label="Kies" name="gravel"/>
+		<combo_box.item label="Petrischale" name="petridish"/>
+		<combo_box.item label="Verkleidung" name="siding"/>
+		<combo_box.item label="Steinkachel" name="stonetile"/>
+		<combo_box.item label="Stuck" name="stucco"/>
+		<combo_box.item label="Saugkraft" name="suction"/>
+		<combo_box.item label="Gewebe" name="weave"/>
+	</combo_box>
+	<texture_picker label="Textur" name="shinytexture control" tool_tip="Klicken, um ein Bild auszuwählen"/>
+	<text name="label shininess">
+		Glanz
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Keiner" name="None"/>
+		<combo_box.item label="Niedrig" name="Low"/>
+		<combo_box.item label="Mittel" name="Medium"/>
+		<combo_box.item label="Hoch" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Glanz
+	</text>
+	<text name="label environment">
+		Umgebung
+	</text>
+	<text name="label shinycolor">
+		Farbe
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
+	<text name="media_info">
+		URL der ausgewählten Medien ggf. hier angeben
+	</text>
+	<button label="Auswählen..." name="add_media" tool_tip="Medien hinzufügen"/>
+	<button label="Entfernen" name="delete_media" tool_tip="Diese Medientextur löschen"/>
+	<button label="Ausrichten" label_selected="Medien ausrichten" name="button align" tool_tip="Medientextur ausrichten (muss zuerst geladen werden)"/>
+	<text name="tex gen">
+		Zuordnung
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Standard" name="Default"/>
+		<combo_box.item label="Planar" name="Planar"/>
+	</combo_box>
+	<spinner label="Horizontale Skalierung" name="TexScaleU"/>
+	<spinner label="Vertikale Skalierung" name="TexScaleV"/>
+	<spinner label="Wiederholungen pro Meter" name="rptctrl"/>
+	<spinner label="Drehung (Grad)" name="TexRot"/>
+	<spinner label="Horizontaler Versatz" name="TexOffsetU"/>
+	<spinner label="Vertikaler Versatz" name="TexOffsetV"/>
+	<spinner label="Horizontale Skalierung" name="bumpyScaleU"/>
+	<spinner label="Vertikale Skalierung" name="bumpyScaleV"/>
+	<spinner label="Drehung (Grad)" name="bumpyRot"/>
+	<spinner label="Horizontaler Versatz" name="bumpyOffsetU"/>
+	<spinner label="Vertikaler Versatz" name="bumpyOffsetV"/>
+	<spinner label="Horizontale Skalierung" name="shinyScaleU"/>
+	<spinner label="Vertikale Skalierung" name="shinyScaleV"/>
+	<spinner label="Drehung (Grad)" name="shinyRot"/>
+	<spinner label="Horizontaler Versatz" name="shinyOffsetU"/>
+	<spinner label="Vertikaler Versatz" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Planare Flächen ausrichten" name="checkbox planar align" tool_tip="Texturen auf allen ausgewählten Flächen an der zuletzt ausgewählten Fläche ausrichten. Erfordert planares Texture Mapping."/>
+</panel>
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 533deb8597..533deb8597 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..3d43200e48
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_volume_pulldown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater" width="240">
+	<button left="217" name="prefs_btn"/>
+	<slider label="Master" label_width="80" name="System Volume" width="180"/>
+	<slider label="Schaltflächen" label_width="80" name="UI Volume" width="180"/>
+	<slider label="Umgebung" label_width="80" name="Wind Volume" width="180"/>
+	<slider label="Sounds" label_width="80" name="SFX Volume" width="180"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Sounds von Gesten aktivieren"/>
+	<slider label="Musik" label_width="80" name="Music Volume" width="180"/>
+	<check_box name="enable_music" tool_tip="Streaming-Musik aktivieren"/>
+	<slider label="Medien" label_width="80" name="Media Volume" width="180"/>
+	<check_box name="enable_media" tool_tip="Streaming-Medien aktivieren"/>
+	<slider label="Voice" label_width="80" name="Voice Volume" width="180"/>
+	<check_box name="enable_voice_check" tool_tip="Voice-Chat aktivieren"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_world_map.xml b/indra/newview/skins/default/xui/de/panel_world_map.xml
index 35fe3d3ffc..35fe3d3ffc 100644..100755
--- a/indra/newview/skins/default/xui/de/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/de/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/de/role_actions.xml b/indra/newview/skins/default/xui/de/role_actions.xml
index 5d9dcacd51..3e9d406e5f 100644..100755
--- a/indra/newview/skins/default/xui/de/role_actions.xml
+++ b/indra/newview/skins/default/xui/de/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Diese Fähigkeiten ermöglichen es, den Parzellennamen und die Veröffentlichungseinstellungen sowie die Anzeige des Suchverzeichnisses, den Landepunkt und die TP-Routenoptionen festzulegen." name="Parcel Identity">
 		<action description="„Ort in Suche anzeigen&quot; ein-/ausschalten und Kategorie festlegen." longdescription="Auf der Registerkarte „Optionen“ unter „Land-Info“ können Sie „Ort in Suche anzeigen“ ein- und ausschalten und die Parzellenkategorie festlegen." name="land find places" value="17"/>
-		<action description="Parzellenname, Beschreibung und Einstellung für „Ort in Suche anzeigen&quot; ändern" longdescription="Parzellenname, Beschreibung und Einstellung für „Ort in Suche anzeigen&quot; ändern Diese Einstellungen finden Sie unter „Land-Info“ &gt; Registerkarte „Optionen“." name="land change identity" value="18"/>
+		<action description="Parzellenname, Beschreibung und Einstelllungen für „Moderater Inhalt“ ändern" longdescription="Parzellenname, Beschreibung und Einstelllungen für „Moderater Inhalt“ ändern. Diese Einstellungen finden Sie unter „Land-Info“ &gt; Registerkarte „Optionen“." name="land change identity" value="18"/>
 		<action description="Landepunkt und Teleport-Route festlegen" longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle einen Landepunkt für ankommende Teleports und Teleport-Routen festlegen. Diese Einstellungen finden Sie unter „Land-Info“ &gt; „Optionen“." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Diese Fähigkeiten ermöglichen es, Parzellenoptionen wie „Objekte erstellen“, „Terrain bearbeiten“ sowie Musik- und Medieneinstellungen zu ändern." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
index 7fb9b34e0a..7fb9b34e0a 100644..100755
--- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
index 18aad64f96..18aad64f96 100644..100755
--- a/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
index 18241dea32..1b67eaf03b 100644..100755
--- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(unbekannt)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(unbekannt/mehrere)
+	</panel.string>
 	<panel.string name="public">
 		(öffentlich)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 7b46ee7c9b..29239033fe 100644..100755
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Sie können diese Objekte nicht bearbeiten.
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden
+	</panel.string>
 	<panel.string name="text modify warning">
 		Diese Objekt verfügt über verknüpfte Teile
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
+			<combo_box.item label="Zoomen" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Preis: L$" name="Edit Cost"/>
 		<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
+		<text name="pathfinding_attributes_label">
+			Pathfinding-Attribute:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index d917d33d12..4268b95370 100644..100755
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,10 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=de-DE
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
@@ -448,6 +451,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="SLappAgentRequestFriend">
 		Freundschaftsangebot
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Entfernen von Freunden
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Schließen (⌘W)
 	</string>
@@ -622,8 +628,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AvatarAway">
 		Abwesend
 	</string>
-	<string name="AvatarBusy">
-		Beschäftigt
+	<string name="AvatarDoNotDisturb">
+		Nicht stören
 	</string>
 	<string name="AvatarMuted">
 		Ignoriert
@@ -838,6 +844,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="multiple_textures">
 		Mehrfach
 	</string>
+	<string name="use_texture">
+		Textur verwenden
+	</string>
 	<string name="texture_loading">
 		Wird geladen...
 	</string>
@@ -859,6 +868,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat in der Nähe
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat in der Nähe)
+	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
@@ -886,6 +901,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ScriptQuestionCautionChatDenied">
 		Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Wenn Sie dem Objekt Zugriff auf Ihr Konto gewähren, kann dieses außerdem:
+	</string>
 	<string name="ScriptTakeMoney">
 		Linden-Dollar (L$) von Ihnen nehmen
 	</string>
@@ -922,6 +940,27 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="NotConnected">
 		Nicht verbunden
 	</string>
+	<string name="AgentNameSubst">
+		(Sie)
+	</string>
+	<string name="TeleportYourAgent">
+		Sie teleportieren
+	</string>
+	<string name="JoinAnExperience">
+		Bei einem Erlebnis mitmachen
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Beim Verwalten von Grundbesitzzugangslisten Warnhinweise unterdrücken
+	</string>
+	<string name="OverrideYourAnimations">
+		Ihre Standardanimationen ersetzen
+	</string>
+	<string name="ScriptReturnObjects">
+		Objekte in Ihrem Namen zurückgeben
+	</string>
+	<string name="UnknownScriptPermission">
+		(unbekannt)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1000,17 +1039,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="script_files">
 		Skripts
 	</string>
-	<string name="AvatarSetNotAway">
-		Nicht abwesend
-	</string>
-	<string name="AvatarSetAway">
-		Abwesend
-	</string>
-	<string name="AvatarSetNotBusy">
-		Nicht beschäftigt
-	</string>
-	<string name="AvatarSetBusy">
-		Beschäftigt
+	<string name="dictionary_files">
+		Wörterbücher
 	</string>
 	<string name="shape">
 		Form
@@ -1244,7 +1274,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1405,6 +1435,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="InvFolder favorite">
 		Meine Favoriten
 	</string>
+	<string name="InvFolder Favorites">
+		Meine Favoriten
+	</string>
+	<string name="InvFolder favorites">
+		Meine Favoriten
+	</string>
 	<string name="InvFolder Current Outfit">
 		Aktuelles Outfit
 	</string>
@@ -1420,6 +1456,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="InvFolder Meshes">
 		Netze
 	</string>
+	<string name="InvFolder Received Items">
+		Erhaltene Artikel
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Händler-Outbox
+	</string>
 	<string name="InvFolder Friends">
 		Freunde
 	</string>
@@ -1950,6 +1992,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD unten rechts
 	</string>
+	<string name="ATTACH_NECK">
+		Hals
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Avatar-Mitte
+	</string>
 	<string name="CursorPos">
 		Zeile [LINE], Spalte [COLUMN]
 	</string>
@@ -1968,8 +2016,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
-	<string name="BusyModeResponseDefault">
-		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 name="DoNotDisturbModeResponseDefault">
+		Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen.
 	</string>
 	<string name="MuteByName">
 		(Nach Namen)
@@ -2082,9 +2130,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Inhalte
-	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
 	</string>
@@ -2982,6 +3027,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="Hip Width">
 		Breite der Hüfte
 	</string>
+	<string name="Hover">
+		Schweben
+	</string>
 	<string name="In">
 		In
 	</string>
@@ -3856,7 +3904,13 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Generelle Region
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
+		Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Dynamisches Pathfinding ist in dieser Region nicht aktiviert.
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Aktualisierung
@@ -3927,6 +3981,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="IM_unblock_only_groups_friends">
 		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
@@ -3936,6 +3996,9 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="you_joined_call">
 		Sie sind dem Gespräch beigetreten
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war.
+	</string>
 	<string name="name_started_call">
 		[NAME] hat einen Voice-Anruf begonnen
 	</string>
@@ -3952,7 +4015,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Wird verbunden...
 	</string>
 	<string name="conference-title">
-		Ad-hoc-Konferenz
+		Chat mit mehreren Personen
 	</string>
 	<string name="conference-title-incoming">
 		Konferenz mit [AGENT_NAME]
@@ -4832,6 +4895,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Unterhaltungen
+	</string>
 	<string name="Command_Compass_Label">
 		Kompass
 	</string>
@@ -4907,6 +4973,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Tooltip">
 		Mit Leuten in der Nähe chatten
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Mit allen unterhalten
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Kompass
 	</string>
@@ -5000,6 +5069,21 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Keine
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Wirkt sich auf Navmesh aus
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Figur
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(mehrere)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Sehr niedrig
 	</string>
@@ -5015,4 +5099,22 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="snapshot_quality_very_high">
 		Sehr hoch
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Der Einwohner kann diese Region nicht besuchen.
+	</string>
+	<string name="UserDictionary">
+		[Benutzer]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
+	</string>
+	<string name="loading_chat_logs">
+		Laden...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 9cf381bacc..8062633df6 100644..100755
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -46,6 +46,9 @@ Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in e
 		<message name="no_inventory_host">
 			Das Inventarsystem ist zurzeit nicht verfügbar.
 		</message>
+		<message name="MustGetAgeRegion">
+			Sie müssen mindestens 18 Jahre alt sein, um diese Region betreten zu können.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -81,5 +84,8 @@ Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in e
 		<message name="requesting">
 			Teleport wird initialisiert...
 		</message>
+		<message name="pending">
+			Anstehender Teleport...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/de/xui_version.xml b/indra/newview/skins/default/xui/de/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/de/xui_version.xml
+++ b/indra/newview/skins/default/xui/de/xui_version.xml
diff --git a/indra/newview/skins/default/xui/en/accordion_drag.xml b/indra/newview/skins/default/xui/en/accordion_drag.xml
index e8a705e744..e8a705e744 100644..100755
--- a/indra/newview/skins/default/xui/en/accordion_drag.xml
+++ b/indra/newview/skins/default/xui/en/accordion_drag.xml
diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml
index e17a0dd351..e17a0dd351 100644..100755
--- a/indra/newview/skins/default/xui/en/accordion_parent.xml
+++ b/indra/newview/skins/default/xui/en/accordion_parent.xml
diff --git a/indra/newview/skins/default/xui/en/alert_button.xml b/indra/newview/skins/default/xui/en/alert_button.xml
index a60e9afab1..a60e9afab1 100644..100755
--- a/indra/newview/skins/default/xui/en/alert_button.xml
+++ b/indra/newview/skins/default/xui/en/alert_button.xml
diff --git a/indra/newview/skins/default/xui/en/alert_check_box.xml b/indra/newview/skins/default/xui/en/alert_check_box.xml
index 5535a5dc2a..5535a5dc2a 100644..100755
--- a/indra/newview/skins/default/xui/en/alert_check_box.xml
+++ b/indra/newview/skins/default/xui/en/alert_check_box.xml
diff --git a/indra/newview/skins/default/xui/en/alert_icon.xml b/indra/newview/skins/default/xui/en/alert_icon.xml
index b0886fce06..b0886fce06 100644..100755
--- a/indra/newview/skins/default/xui/en/alert_icon.xml
+++ b/indra/newview/skins/default/xui/en/alert_icon.xml
diff --git a/indra/newview/skins/default/xui/en/alert_line_editor.xml b/indra/newview/skins/default/xui/en/alert_line_editor.xml
index 54dbc698c8..54dbc698c8 100644..100755
--- a/indra/newview/skins/default/xui/en/alert_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/alert_line_editor.xml
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index e7dd62eb64..e7dd62eb64 100644..100755
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml
index d11373ce1d..d11373ce1d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/en/floater_aaa.xml
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 060d889003..703015af20 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -22,7 +22,9 @@ Built with [COMPILER] version [COMPILER_VERSION]
 </floater.string>
   <floater.string
      name="AboutPosition">
-You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 
@@ -196,27 +198,26 @@ Dummy Name replaced at run time
        top="5"
        width="435"
        word_wrap="true">
-        3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+        3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details.
 
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 fb123ec4d1..a660e812cc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1354,84 +1354,18 @@ Only large parcels can be listed in search.
              top="150"
              width="430" />
             <combo_box
-             enabled="false"
-             height="23"
-             layout="topleft"
-             left="20"
-             top="194"
-             name="land category with adult"
-             visible="false"
-             width="140">
-                <combo_box.item
-                 label="Any Category"
-                 name="item0"
-                 value="any" />
-                <combo_box.item
-                 label="Linden Location"
-                 name="item1"
-                 value="linden" />
-                <combo_box.item
-                 label="Adult"
-                 name="item2"
-                 value="adult" />
-                <combo_box.item
-                 label="Arts &amp; Culture"
-                 name="item3"
-                 value="arts" />
-                <combo_box.item
-                 label="Business"
-                 name="item4"
-                 value="store" />
-                <combo_box.item
-                 label="Educational"
-                 name="item5"
-                 value="educational" />
-                <combo_box.item
-                 label="Gaming"
-                 name="item6"
-                 value="game" />
-                <combo_box.item
-                 label="Hangout"
-                 name="item7"
-                 value="gather" />
-                <combo_box.item
-                 label="Newcomer Friendly"
-                 name="item8"
-                 value="newcomer" />
-                <combo_box.item
-                 label="Parks &amp; Nature"
-                 name="item9"
-                 value="park" />
-                <combo_box.item
-                 label="Residential"
-                 name="item10"
-                 value="home" />
-                <combo_box.item
-                 label="Shopping"
-                 name="item11"
-                 value="shopping" />
-                <combo_box.item
-                 label="Rental"
-                 name="item13"
-                 value="rental" />
-                <combo_box.item
-                 label="Other"
-                 name="item12"
-                 value="other" />
-            </combo_box>
-            <combo_box
-             enabled="false"
+             enabled="true"
              height="23"
              layout="topleft"
              left="20"
              top="194"
              name="land category"
-             visible="false"
+             visible="true"
              width="140">
                 <combo_box.item
                  label="Any Category"
                  name="item0"
-                 value="any" />
+                 value="none" />
                 <combo_box.item
                  label="Linden Location"
                  name="item1"
@@ -1989,11 +1923,11 @@ Only large parcels can be listed in search.
             <check_box
              follows="top|left"
              height="16"
-             label="Have been age-verified [ESTATE_AGE_LIMIT]"
+             label="Are age 18 or older [ESTATE_AGE_LIMIT]"
              layout="topleft"
              left_delta="0"
              name="limit_age_verified"
-             tool_tip="Residents must be age verified to access this parcel. See the [SUPPORT_SITE] for more information."
+             tool_tip="Residents must be age 18 or older to access this parcel. See the [SUPPORT_SITE] for more information."
              top_pad="4"
              width="278" />
             <check_box
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
index b79c5d9a19..b79c5d9a19 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
index b5538a511c..b5538a511c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
index cb6b2f6ebc..cb6b2f6ebc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/en/floater_auction.xml b/indra/newview/skins/default/xui/en/floater_auction.xml
index 9c6d114c4c..9c6d114c4c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_auction.xml
+++ b/indra/newview/skins/default/xui/en/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/en/floater_autoreplace.xml b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
new file mode 100755
index 0000000000..0bfefc8abe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_autoreplace.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ border="true"
+ can_close="true"
+ can_minimize="true"
+ can_resize="false"
+ help_topic="autoreplace_settings"
+ save_rect="true"
+ height="455"
+ width="490"
+ name="autoreplace_floater"
+ title="Auto-Replace Settings">
+  <check_box
+   bottom_delta="30"
+   left_delta="15"
+   height="16"
+   width="100"
+   follows="left|top"
+   label="Enable Auto-Replace"
+   name="autoreplace_enable"
+   tool_tip="As you enter chat text, replace any of the keywords entered with the corresponding replacement"/>
+  <view_border
+   top_pad="15"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor1"/>
+  <button
+   top_pad="10"
+   left="10"
+   height="22"
+   width="110"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_import_list"
+   label="Import List..."
+   tool_tip="Load a previously exported list from a file."/>
+  <button
+   top_delta="0"
+   left_pad="10"
+   height="22"
+   width="110"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_export_list"
+   label="Export List..."
+   tool_tip="Save the selected list to a file so you can share it."/>
+  <button
+   top_delta="0"
+   left_pad="10"
+   height="22"
+   width="110"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_new_list"
+   label="New List..."
+   tool_tip="Create a new list."/>
+  <button
+   top_delta="0"
+   left_pad="10"
+   height="22"
+   width="110"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_delete_list"
+   label="Delete List"
+   tool_tip="Delete the selected list."/>
+  <scroll_list
+   top_pad="10"
+   left="10"
+   height="100"
+   width="370"
+   follows="left|top"
+   column_padding="0"
+   draw_heading="false"
+   multi_select="false"
+   name="autoreplace_list_name"
+   search_column="0">
+  </scroll_list>
+  <button
+   top_delta="23"
+   left_pad="10"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_list_up"
+   image_overlay="Arrow_Up"
+   tool_tip="Move this list up in priority."/>
+  <button
+   top_pad="10"
+   left_delta="0"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_list_down"
+   image_overlay="Arrow_Down"
+   tool_tip="Move this list down in priority."/>
+  <view_border
+   top_pad="36"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor2"/>
+  <scroll_list
+   top_pad="10"
+   left="10"
+   height="120"
+   width="370"
+   follows="left|top"
+   column_padding="0"
+   draw_heading="true"
+   multi_select="true"
+   name="autoreplace_list_replacements"
+   search_column="0">
+    <scroll_list.columns
+        label="Keyword"
+        name="keyword"
+        relative_width="0.30" />
+    <scroll_list.columns
+        label="Replacement"
+        name="replacement"
+        relative_width="0.70" />
+  </scroll_list>
+  <button
+   top_delta="41"
+   left_pad="10"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_add_entry"
+   label="Add..."/>
+  <button 
+   top_pad="10"
+   left_delta="0"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_delete_entry"
+   label="Remove"/>
+  <view_border
+   top_pad="38"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor3"/>
+  <text
+   type="string"
+   follows="left|top"
+   height="16"
+   layout="topleft"
+   left="10"
+   top_pad="13"
+   width="50">
+   Keyword:
+  </text>
+  <line_editor
+   name="autoreplace_keyword"
+   follows="left|top"
+   height="23"
+   layout="topleft"
+   left="100"
+   max_length_bytes="255"
+   top_delta="-5"
+   width="150"
+   />
+  <text
+   type="string"
+   follows="left|top"
+   height="16"
+   layout="topleft"
+   left="10"
+   right="90"
+   top_pad="10"
+   >
+   Replacement:
+  </text>
+  <line_editor
+   name="autoreplace_replacement"
+   follows="left|top"
+   height="23"
+   layout="topleft"
+   left="100"
+   max_length_bytes="255"
+   top_delta="-5"
+   width="280"
+   />
+  <button
+   top_delta="0"
+   right="-10"
+   height="22"
+   width="90"
+   enabled="false"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_save_entry"
+   label="Save Entry"
+   tool_tip="Save this entry."/>
+  <view_border
+   top_pad="10"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor4"/>
+  <button
+   top_pad="10"
+   right="380"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_save_changes"
+   label="Save Changes"
+   tool_tip="Save all changes."/>
+  <button
+   top_delta="0"
+   right="480"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="autoreplace_cancel"
+   label="Cancel"
+   tool_tip="Discard all changes."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/en/floater_avatar.xml b/indra/newview/skins/default/xui/en/floater_avatar.xml
index cd5cca02bd..cd5cca02bd 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index 1a55dc2e2c..1a55dc2e2c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
index bac3ea86f1..bac3ea86f1 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/en/floater_beacons.xml b/indra/newview/skins/default/xui/en/floater_beacons.xml
index 3d29356b22..3d29356b22 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/en/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index 38428b36fc..38428b36fc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 4e0cfb0cd4..e7ab3cacdc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -6,7 +6,7 @@
  layout="topleft"
  name="floaterbulkperms"
  help_topic="floaterbulkperms"
- title="EDIT CONTENT PERMISSIONS"
+ title="ADJUST CONTENT PERMISSIONS"
  width="410">
     <floater.string
      name="nothing_to_modify_text">
@@ -192,7 +192,7 @@
      name="newperms"
      top="90"
      width="250">
-        New Content Permissions
+        Adjust Content Permissions To
     </text>
       <text
        type="string"
@@ -292,11 +292,22 @@
      height="23"
      label="OK"
      layout="topleft"
-     left="205"
-     name="apply"
+     left="110"
+     name="ok"
      top_pad="10"
      width="90">
       <button.commit_callback
+       function="BulkPermission.Ok"/>
+    </button>
+    <button
+     follows="left|top"
+     height="23"
+     label="Apply"
+     layout="topleft"
+     left_pad="5"
+     name="apply"
+     width="90">
+      <button.commit_callback
        function="BulkPermission.Apply"/>
     </button>
     <button
diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml
index 1f2fe62b3c..1f2fe62b3c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/en/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/en/floater_buy_contents.xml b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
index ac96a70805..ac96a70805 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 553c5d51d0..553c5d51d0 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
index 0637eedfb2..0637eedfb2 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
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 22cc058e46..22cc058e46 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/en/floater_buy_object.xml b/indra/newview/skins/default/xui/en/floater_buy_object.xml
index 5fdd4aa49d..5fdd4aa49d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 22bc488a92..521389d7b3 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="458"
- bottom="-80"
+ right="-460"
+ bottom="-50"
  follows="left|bottom"
  legacy_header_height="18"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_chat_bar.xml b/indra/newview/skins/default/xui/en/floater_chat_bar.xml
deleted file mode 100644
index 688a01ce7b..0000000000
--- a/indra/newview/skins/default/xui/en/floater_chat_bar.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="specified"
- left="10"
- bottom="-10"
- height="60"
- layout="topleft"
- legacy_header_height="25"
- single_instance="true"
- title="NEARBY CHAT"
- save_rect="true"
- save_visibility="true"
- can_close="true"
- can_minimize="true"
- help_topic="chat_bar"
- min_height="60"
- min_width="150"
- can_resize="true"
- default_tab_group="1"
- name="chat_bar"
- width="300">
-    <panel
-        top="20"
-        class="panel_nearby_chat"
-        follow="all"
-        width="300"
-        height="0"
-        visible="false"
-        filename="panel_nearby_chat.xml"
-        name="nearby_chat" />
-    <panel width="300" 
-           height="31" 
-           left="0" 
-           name="bottom_panel"
-           bottom="-1" 
-           follows="left|right|bottom" 
-           tab_group="1">
-      <line_editor
-        border_style="line"
-        border_thickness="1"
-        follows="left|right"
-        height="23"
-        label="Click here to chat."
-        layout="topleft"
-        left_delta="7"
-        left="0"
-        max_length_bytes="1023"
-        name="chat_box"
-        text_pad_left="5"
-        text_pad_right="25"
-        tool_tip="Press Enter to say, Ctrl+Enter to shout"
-        top="2"
-        width="255" />
-      <output_monitor
-        auto_update="true"
-        follows="right"
-        draw_border="false"
-        height="16"
-        layout="topleft"
-        left_pad="-24"
-        mouse_opaque="true"
-        name="chat_zone_indicator"
-        top="6"
-        visible="true"
-        width="20" />
-      <button
-        follows="right"
-        is_toggle="true"
-        width="20"
-        top="2"
-        layout="topleft"
-        left_pad="12"
-        image_disabled="ComboButton_UpOff"
-        image_unselected="ComboButton_UpOff"
-        image_selected="ComboButton_On"
-        image_pressed="ComboButton_UpSelected"
-        image_pressed_selected="ComboButton_Selected"
-        height="23"
-        chrome="true"
-        name="show_nearby_chat"
-        tool_tip="Shows/hides nearby chat log">
-      </button>
-    </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_choose_group.xml b/indra/newview/skins/default/xui/en/floater_choose_group.xml
index 2cf6e682fd..2cf6e682fd 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/en/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/en/floater_color_picker.xml b/indra/newview/skins/default/xui/en/floater_color_picker.xml
index e06d10606a..e06d10606a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
new file mode 100755
index 0000000000..19a4cbc119
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+<floater
+ can_resize="true"
+ positioning="cascading"
+ help_topic="conversation_log"
+ height="200"
+ min_height="100"
+ min_width="230"
+ layout="topleft"
+ name="floater_conversation_log"
+ save_rect="true"
+ single_instance="true"
+ reuse_instance="true"
+ title="CONVERSATION LOG"
+ width="300">
+  <panel
+   follows="left|top|right"
+   height="32"
+   left="0"
+   name="buttons_panel"
+   top="0">
+    <filter_editor
+     follows="left|top|right"
+     height="23"
+     layout="topleft"
+     left="8"
+     label="Filter People"
+     max_length_chars="300"
+     name="people_filter_input"
+     text_color="Black"
+     text_pad_left="10"
+     top="4"
+     width="204" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="Conv_toolbar_sort"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="8"
+     menu_filename="menu_conversation_log_view.xml"
+     menu_position="bottomleft"
+     name="conversation_view_btn"
+     tool_tip="View/sort options"
+     top="3"
+     width="31" />
+    <menu_button
+     follows="top|right"
+     height="25"
+     image_hover_unselected="Toolbar_Middle_Over"
+     image_overlay="OptionsMenu_Off"
+     image_selected="Toolbar_Middle_Selected"
+     image_unselected="Toolbar_Middle_Off"
+     layout="topleft"
+     left_pad="8"
+     name="conversations_gear_btn"
+     tool_tip="Actions on selected person or group"
+     top="3"
+     width="31" />
+  </panel>
+  <panel
+   bottom="-1"
+   follows="all"
+   left="0"
+   name="log_panel"
+   right="-1"
+   top="32">
+    <conversation_log_list
+     allow_select="true"
+     bottom="-8"
+     opaque="true"
+     follows="all"
+     left="8"
+     keep_selection_visible_on_reshape="true"
+     item_pad="2"
+     multi_select="false"
+     name="conversation_log_list"
+     right="-8"
+     top="0" />
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
new file mode 100755
index 0000000000..764b9d8385
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ default_tab_group="1"
+ help_topic="conversation_preview"
+ height="391"
+ layout="topleft"
+ min_height="243"
+ min_width="234"
+ name="preview_conversation"
+ title="CONVERSATION:"
+ width="400">
+    <floater.string
+     name="Title">
+        CONVERSATION: [NAME]
+    </floater.string>
+    <chat_history
+     font="SansSerifSmall"
+     follows="all"
+     visible="true"
+     height="330"
+     name="chat_history"
+     notify_unread_msg="false"
+     parse_highlights="true"
+     parse_urls="true"
+     left="5"
+     top_pad="25"
+     width="390">
+    </chat_history>
+    <text
+     follows="bottom|right"
+     font="SansSerif"
+     height="22"
+     layout="topleft"
+     name="page_label"
+     right="-110"
+     top_pad="7"
+     value="Page"
+     width="35">
+    </text>
+    <spinner
+     allow_digits_only="true"
+     decimal_digits="0"
+     follows="bottom|right"
+     height="23"
+     increment="1"
+     label_width="40"
+     layout="topleft"
+     left_pad="0"
+     name="history_page_spin"
+     top_delta="-3"
+     width="50"/>
+    <text
+     follows="bottom|right"
+     font="SansSerif"
+     height="22"
+     layout="topleft"
+     name="page_num_label"
+     left_pad="5"
+     top_delta="4"
+     width="40">
+    </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml
index 143bcb4430..143bcb4430 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_critical.xml
+++ b/indra/newview/skins/default/xui/en/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
index b5de4166f6..b5de4166f6 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/en/floater_destinations.xml b/indra/newview/skins/default/xui/en/floater_destinations.xml
index 39aa8e07bb..94ebaa9cb2 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/en/floater_destinations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- positioning="cascading"
+ positioning="cascading"	
  ignore_ui_scale="false"
  legacy_header_height="225"
  can_minimize="true"
@@ -17,11 +17,11 @@
  save_rect="true"
  save_visibility="true"
  title="DESTINATIONS"
- width="840">
+ width="550">
     <web_browser
       top="25"
       height="200"
-      width="840"
+      width="550"
       follows="all"
       name="destination_guide_contents"
       trusted_content="true"/>
diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index 9a9fd32a77..9a9fd32a77 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index d9a3ad0c4b..d9a3ad0c4b 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
index 56233d91ee..56233d91ee 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
index 905983e7fa..905983e7fa 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
index 1b1cafaca6..1b1cafaca6 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/en/floater_event.xml b/indra/newview/skins/default/xui/en/floater_event.xml
index cf61b7d24d..cf61b7d24d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_event.xml
+++ b/indra/newview/skins/default/xui/en/floater_event.xml
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 77adb5524e..77adb5524e 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/en/floater_fbc_web.xml b/indra/newview/skins/default/xui/en/floater_fbc_web.xml
new file mode 100644
index 0000000000..0d35e22a19
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_fbc_web.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_fbc_web"
+         help_topic="fbc_web"
+         width="780"
+         height="775"
+         save_rect="true"
+         single_instance="true"
+         reuse_instance="false"
+         filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml
index 3ab19ec9d9..3ab19ec9d9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/en/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 200e9b9537..200e9b9537 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index e7131e20cb..e7131e20cb 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/en/floater_goto_line.xml b/indra/newview/skins/default/xui/en/floater_goto_line.xml
new file mode 100644
index 0000000000..b236888219
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_goto_line.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ default_tab_group="1"
+ height="90"
+ layout="topleft"
+ name="script goto"
+ help_topic="script_goto"
+ title="GO TO LINE"
+ width="200">
+    <button
+     height="24"
+     label="OK"
+     label_selected="OK"
+     layout="topleft"
+     left="55"
+     name="goto_btn"
+     top="53"
+     width="90" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="10"
+     name="txt"
+     top="21"
+     width="65">
+        Go to line
+    </text>
+    <line_editor
+     border_style="line"
+     border_thickness="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left="75"
+     max_length_bytes="9"
+     name="goto_line"
+     tab_group="1"
+     top="21"
+     width="85" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 66bb9d3cea..9deb0d2030 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -132,6 +132,28 @@
      name="vbo"
      tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
      width="315" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="10"
+    name="tc label"
+    top_pad="10"
+    width="188">
+    Enable S3TC:
+  </text>
+    <check_box
+     control_name="RenderCompressTextures"
+     height="16"
+     initial_value="true"
+     label="Enable Texture Compression (requires restart)"
+     layout="topleft"
+     left_pad="10"
+     name="texture compression"
+     tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+     width="315" />
     <slider
      control_name="TextureMemory"
      decimal_digits="0"
diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml
index c06cb63f8a..c06cb63f8a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml
index 8c0077a8cc..8c0077a8cc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/en/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/en/floater_hud.xml b/indra/newview/skins/default/xui/en/floater_hud.xml
index e2d860881a..e2d860881a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_hud.xml
+++ b/indra/newview/skins/default/xui/en/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index e123de46c2..28c89868bd 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,49 +1,183 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater
- can_close="false"  
+ can_close="true"  
  can_minimize="true"
  can_resize="true"
- height="390"
+ height="210"
+ min_height="210"
  layout="topleft"
  name="floater_im_box"
  help_topic="floater_im_box"
  save_rect="true"
  save_visibility="true"
  single_instance="true"
+ reuse_instance="true"
  title="CONVERSATIONS"
- width="396">
-    <tab_container
-     follows="left|right|top|bottom"
-     height="390"
+ bottom="-50"
+ right="-5"
+ width="450"
+ min_width="38">
+    <string
+     name="collapse_icon"
+     value="Conv_toolbar_collapse"/>
+    <string
+     name="expand_icon"
+     value="Conv_toolbar_expand"/>
+    <layout_stack
+     animate="true" 
+     bottom="-5"
+     drag_handle_gap="6"
+     drag_handle_first_indent="27"
+     drag_handle_second_indent="10"
+     follows="all"
      layout="topleft"
-     left="1"
-     name="im_box_tab_container"
-     tab_position="bottom"
-     tab_width="64"
-     tab_max_width = "134"
-     tab_height="16"
-     use_custom_icon_ctrl="true"
-     tab_icon_ctrl_pad="2"
-     halign="left"
-     use_ellipses="true"
-     top="0"
-     width="394">
-      <first_tab
-       tab_bottom_image_flash="Toolbar_Left_Flash"/>
-      <middle_tab
-       tab_bottom_image_flash="Toolbar_Middle_Flash"/>
-      <last_tab
-       tab_bottom_image_flash="Toolbar_Right_Flash"/>
-    </tab_container>
-    <icon
-     color="DefaultShadowLight"
-     enabled="false"
-     follows="left|right|bottom"
-     height="17"
-     image_name="tabarea.tga"
-     layout="bottomleft"
-     left="1"
-     name="im_box_tab_container_icon"
-     bottom="10"
-     width="394" />
+     left="0"
+     name="conversations_stack"
+     orientation="horizontal"
+     right="-1"
+     show_drag_handle="true"
+     top="0">
+        <layout_panel
+         auto_resize="false"
+         user_resize="true"        
+         name="conversations_layout_panel"
+         min_dim="43"
+         expanded_min_dim="140">
+            <layout_stack
+             animate="false" 
+             follows="left|top|right"
+             height="27"
+             layout="topleft"
+             left="0"
+             name="conversations_pane_buttons_stack"
+             orientation="horizontal"
+             right="-1"
+             top="0">
+                <layout_panel
+                 auto_resize="true"
+                 name="conversations_pane_buttons_expanded">
+                    <menu_button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_sort"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     menu_filename="menu_participant_view.xml"
+                     layout="topleft"
+                     left="5"
+                     name="sort_btn"
+                     tool_tip="View/sort options"
+                     top="1"
+                     width="31" />
+                    <button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_plus"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="1"
+                     left_pad="2"
+                     name="add_btn"
+                     tool_tip="Start a new conversation"
+                     width="31"/>
+                    <button
+                     follows="top|left"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Command_Speak_Icon"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="1"
+                     left_pad="2"
+                     name="speak_btn"
+                     tool_tip="Speak with people using your microphone"
+                     width="31"/>	
+                </layout_panel>
+                <layout_panel
+                 auto_resize="false"
+                 name="conversations_pane_buttons_collapsed"
+                 width="35">
+                    <button
+                     follows="right|top"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_collapse"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="1"
+                     left="4"
+                     name="expand_collapse_btn"
+                     tool_tip="Collapse/Expand this list"
+                     width="35" />
+                </layout_panel>
+            </layout_stack>
+            <panel
+             bottom="-1"
+             follows="all"
+             layout="topleft"
+             name="conversations_list_panel"
+             opaque="true"
+             top_pad="0"
+             left="5"
+             right="-1"/>
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         user_resize="true"
+         name="messages_layout_panel"
+         expanded_min_dim="212">
+            <panel_container
+             bottom="-1"
+             follows="all"
+             layout="topleft"
+             left="0"
+             name="im_box_tab_container"
+             right="-1"
+             top="0">
+                <panel
+                 bottom="-1"
+                 follows="all"
+                 layout="topleft"
+                 name="stub_panel"
+                 opaque="true"
+                 top_pad="0"
+                 left="0"
+                 right="-1">
+                    <button
+                     follows="right|top"
+                     height="25"
+                     image_hover_unselected="Toolbar_Middle_Over"
+                     image_overlay="Conv_toolbar_collapse"
+                     image_selected="Toolbar_Middle_Selected"
+                     image_unselected="Toolbar_Middle_Off"
+                     layout="topleft"
+                     top="1"
+                     right="-10"
+                     name="stub_collapse_btn"
+                     tool_tip="Collapse this pane"
+                     width="31" />
+                    <text
+                     type="string"
+                     clip_partial="false"
+                     follows="left|top|right"
+                     layout="topleft"
+                     left="15"
+                     right="-15"
+                     name="stub_textbox"
+                     top="25"
+                     height="40"
+                     valign="center"
+                     parse_urls="true"
+                     wrap="true">
+                         This conversation is in a separate window.   [secondlife:/// Bring it back.]
+                    </text>
+                </panel>
+            </panel_container>
+        </layout_panel>
+    </layout_stack>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index ca73883e53..43d0f2fb18 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
  background_visible="true"
  default_tab_group="1"
  height="355"
@@ -10,82 +9,302 @@
  can_dock="false"
  can_minimize="true"
  can_close="true"
+ save_rect="true"
  visible="false"
  width="394"
  can_resize="true"
- min_width="250"
- min_height="190">
-  <layout_stack
-   animate="true" 
-   default_tab_group="2"
-  follows="all"
-  height="320"
-  width="394"
-  layout="topleft"
-  orientation="horizontal"
-  name="im_panels"
-  tab_group="1"
-  top="20"
-  left="0">
-    <layout_panel
-      name="im_control_panel_holder"
-      min_width="115"
-      width="150" 
-      height="320" 
-      auto_resize="false">
-      <panel
-        name="panel_im_control_panel"
-        layout="topleft"
-        height="320"
-        width="150" 
-        follows="all"/>
-      </layout_panel>
-    <layout_panel
-       default_tab_group="3"
-       left="0"
-       tab_group="2"
-       top="0"
-       height="200"
-	     width="254"
-       user_resize="true">
-        <button
-          height="20"
-          follows="left|top"
-          top="0"
-          left="2"
-          image_overlay="TabIcon_Open_Off"
-          layout="topleft"
-          width="25"
-          name="slide_left_btn" />
-         <button
-          height="20"
-          follows="left|top"
-          top="0"
-          left="2"
-          image_overlay="TabIcon_Close_Off"
-          width="25"
-          name="slide_right_btn" />
-        <chat_history
-	 font="SansSerifSmall"
-         follows="left|right|top|bottom"
-         height="150"
-         name="chat_history"
-         parse_highlights="true"
-         parse_urls="true"
-        left="1"
-         width="249">
-        </chat_history>
-        <line_editor
-         bottom="0"
-         follows="left|right|bottom"
-	 font="SansSerifSmall"
-         height="20"
-         label="To"
-         layout="bottomleft"
-         name="chat_editor"
-         tab_group="3"
-         width="249">
-        </line_editor>
-    </layout_panel>
-  </layout_stack>
+ can_tear_off="false"
+ min_height="190"
+ positioning="relative">
+    <floater.string name="call_btn_start">Conv_toolbar_open_call</floater.string>
+    <floater.string name="call_btn_stop">Conv_toolbar_hang_up</floater.string>
+    <floater.string
+     name="collapseline_icon"
+     value="Conv_collapse_to_one_line"/>
+    <floater.string
+     name="expandline_icon"
+     value="Conv_expand_one_line"/>
+    <floater.string
+     name="collapse_icon"
+     value="Conv_toolbar_collapse"/>
+    <floater.string
+     name="expand_icon"
+     value="Conv_toolbar_expand"/>
+    <floater.string
+     name="tear_off_icon"
+     value="Conv_toolbar_arrow_ne"/>
+    <floater.string
+     name="return_icon"
+     value="Conv_toolbar_arrow_sw"/>
+    <floater.string
+     name="participant_added"
+     value="[NAME] was invited to the conversation."/>
+    <floater.string
+     name="multiple_participants_added"
+     value="[NAME] were invited to the conversation."/>
+    <floater.string
+     name="tooltip_to_separate_window"
+     value="Move this conversation to a separate window"/>
+    <floater.string
+     name="tooltip_to_main_window"
+     value="Move this conversation back to main window"/>
+    <floater.string
+     name="start_call_button_tooltip"
+     value="Open voice connection"/>
+    <floater.string
+     name="end_call_button_tooltip"
+     value="Close voice connection"/>
+    <floater.string
+     name="expcol_button_not_tearoff_tooltip"
+     value="Collapse this pane"/>
+    <floater.string
+     name="expcol_button_tearoff_and_expanded_tooltip"
+     value="Collapse participant list"/>
+    <floater.string
+     name="expcol_button_tearoff_and_collapsed_tooltip"
+     value="Expand participant list"/>
+    <view
+     follows="all"
+     layout="topleft"
+     name="contents_view"
+     top="0"
+     left="0"
+     right="-1"
+     bottom="-1">
+        <layout_stack
+         animate="false" 
+         bottom="-1"
+         default_tab_group="2"
+         follows="all"
+         left="3"
+         layout="topleft"
+         name="main_stack"
+         right="-3"
+         orientation="vertical"
+         tab_group="1"
+         top="0">
+            <layout_panel
+             auto_resize="false"
+             name="toolbar_panel"
+             height="25">
+                <menu_button
+                 menu_filename="menu_im_session_showmodes.xml"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left="5"
+                 name="view_options_btn"
+                 tool_tip="View/sort options"
+                 top="1"
+                 width="31" />
+                <menu_button
+                 menu_filename="menu_im_conversation.xml"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="1"
+                 left_pad="2"
+                 name="gear_btn"
+                 visible="false"
+                 tool_tip="Actions on selected person"
+                 width="31"/>
+                <button
+                 enabled="false"
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_add_person"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="1"
+                 left_pad="2"
+                 name="add_btn"
+                 tool_tip="Add someone to this conversation"
+                 width="31"/>
+                <button
+                 follows="top|left"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_open_call"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="1"
+                 left_pad="2"
+                 name="voice_call_btn"
+                 tool_tip="Open voice connection"
+                 width="31"/>                
+                <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_close"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="1"
+                 right="-70"
+                 name="close_btn"
+                 tool_tip="End this conversation"
+                 width="31" />
+                <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_collapse"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 top="1"
+                 left_pad="2"
+                 name="expand_collapse_btn"
+                 tool_tip="Collapse/Expand this pane"
+                 width="31" />
+                <button
+                 follows="right|top"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_arrow_ne"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="tear_off_btn"
+                 top="1"
+                 width="31" />
+            </layout_panel>
+            <layout_panel
+             name="body_panel"
+             height="235">
+                <layout_stack
+                 default_tab_group="2"
+                 drag_handle_gap="6"
+                 drag_handle_first_indent="0"
+                 drag_handle_second_indent="1"
+                 follows="all"
+                 orientation="horizontal"
+                 name="im_panels"
+                 show_drag_handle="true"
+                 tab_group="1"
+                 top="0"
+                 right="-1"
+                 bottom="-1"
+                 left="0">
+                    <layout_panel
+                     name="speakers_list_panel"
+                     expanded_min_dim="115"
+                     min_dim="0"
+                     width="150" 
+                     user_resize="true"
+                     auto_resize="false" />
+                    <layout_panel
+                     default_tab_group="3"
+                     tab_group="2"
+                     name="right_part_holder"
+                     min_width="172">
+                        <layout_stack
+                         animate="true" 
+                         default_tab_group="2"
+                         follows="all"
+                         orientation="vertical"
+                         name="translate_and_chat_stack"
+                         tab_group="1"
+                         top="0"
+                         left="1"
+                         right="-1"
+                         bottom="-1">
+                            <layout_panel
+                             auto_resize="false"
+                             height="26"
+                             name="translate_chat_checkbox_lp">
+                                <check_box
+                                 top="10"
+                                 control_name="TranslateChat"
+                                 enabled="true"
+                                 height="16"
+                                 label="Translate chat"
+                                 left="5"
+                                 name="translate_chat_checkbox"
+                                 width="230" />
+                            </layout_panel>
+                            <layout_panel
+                             name="chat_holder">
+                                <chat_history
+                                 font="SansSerifSmall"
+                                 follows="all"
+                                 name="chat_history"
+                                 parse_highlights="true"
+                                 parse_urls="true"
+                                 right="-1"
+                                 left="0"
+                                 top="0"
+                                 bottom="-1" />
+                            </layout_panel>
+                        </layout_stack>
+                    </layout_panel>
+                </layout_stack>
+            </layout_panel>
+            <layout_panel
+             height="35"
+             auto_resize="false"
+             name="chat_layout_panel">
+                <layout_stack
+                 animate="false"
+                 default_tab_group="2"
+                 follows="all"
+                 orientation="horizontal"
+                 name="input_panels"
+                 top="0"
+                 bottom="-1"
+                 left="0"
+                 right="-1">
+                    <layout_panel
+                     name="input_editor_layout_panel">
+                        <chat_editor
+                         layout="topleft"
+                         expand_lines_count="5"
+                         follows="left|right|bottom"
+                         font="SansSerifSmall"
+                         height="20"    
+                         is_expandable="true"
+                         text_tentative_color="TextFgTentativeColor"
+                         name="chat_editor"
+                         max_length="1023"
+                         spellcheck="true"
+                         tab_group="3"
+                         bottom="-8"
+                         left="5"
+                         right="-5"
+                         wrap="true" />
+                    </layout_panel>
+                    <layout_panel
+                     auto_resize="false"
+                     name="input_button_layout_panel"
+                     width="32">
+                        <button
+                         left="1"
+                         top="4"
+                         height="25"
+                         follows="left|right|top"
+                         image_hover_unselected="Toolbar_Middle_Over"
+                         image_overlay="Conv_expand_one_line"
+                         image_selected="Toolbar_Middle_Selected"
+                         image_unselected="Toolbar_Middle_Off"
+                         name="minz_btn"
+                         tool_tip="Shows/hides message panel"
+                         width="28" />
+                    </layout_panel>
+                </layout_stack>
+            </layout_panel>
+        </layout_stack>
+    </view>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
index 44d2c14cc8..44d2c14cc8 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/en/floater_import_collada.xml b/indra/newview/skins/default/xui/en/floater_import_collada.xml
index 441ab6a2de..441ab6a2de 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/en/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index 81194f61cf..a7864381a9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -8,8 +8,8 @@
  layout="topleft"
  name="incoming call"
  help_topic="incoming_call"
- title="Incoming call"
- width="410">
+ sound_flags="0"
+ width="550">
     <floater.string
      name="lifetime">
         5
@@ -24,7 +24,7 @@
     </floater.string>
     <floater.string
      name="VoiceInviteP2P">
-        is calling.
+        is calling you.
     </floater.string>
     <floater.string
      name="VoiceInviteAdHoc">
@@ -49,14 +49,14 @@
      image_name="icon_avatar_online.tga"
      layout="topleft"
      left_delta="19"
-     top="35"
+     top="20"
      width="36" />
     <group_icon
      enabled="false"
      follows="left|top"
      height="36"
      layout="topleft"
-     top="35"
+     top="20"
      width="36" />
     <text
      clip_partial="true"
@@ -67,43 +67,43 @@
      name="caller name"
      top="20"
      use_ellipses="true"
-     width="315"
+     width="475"
      word_wrap="true" />
-    <text
-     clip_partial="true"
-     font="SansSerif"
-     height="30"
-     layout="topleft"
-     left="77"
-     name="question"
-     top_pad="5"
-     use_ellipses="true"
-     width="315"
-     word_wrap="true">
-     Do you want to leave [CURRENT_CHAT] and join this voice chat?
-    </text>
-    <button
+     <button
      height="24"
-     label="Accept"
-     label_selected="Accept"
+     label="Answer"
+     label_selected="Answer"
      layout="topleft"
      left="70"
      name="Accept"
-     top="92"
-     width="100" />
+     top_pad="5"
+     width="120" />
     <button
      height="24"
-     label="Reject"
-     label_selected="Reject"
+     label="Ignore"
+     label_selected="Ignore"
      layout="topleft"
      name="Reject"
      left_pad="10"
-     width="100" />
+     width="120" />
     <button
      height="24"
-     label="Start IM"
+     label="Open IM instead"
      layout="topleft"
      name="Start IM"
      left_pad="10"
-     width="100" />
+     width="120" />
+    <text
+     clip_partial="true"
+     font="SansSerif"
+     height="30"
+     layout="topleft"
+     left="77"
+     name="question"
+     top_pad="5"
+     use_ellipses="true"
+     width="475"
+     word_wrap="true">
+     If you answer, you will be disconnected from your current voice conversation.
+    </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index bea35e5fc1..bea35e5fc1 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index adef066aef..adef066aef 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index c86ed595a7..c86ed595a7 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml
index 59f6a9434c..59f6a9434c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/en/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/en/floater_lagmeter.xml b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
index b24c745bdd..b24c745bdd 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/en/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/en/floater_land_holdings.xml b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
index 390ec9ab7d..390ec9ab7d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/en/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
index 5cd7cd196d..5cd7cd196d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/en/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
index e9676777f4..e9676777f4 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index b8893e11d9..b8893e11d9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index ce788654aa..ce788654aa 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml
index 0e03c0ab6d..0e03c0ab6d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
index fb7d09a21e..fb7d09a21e 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/en/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
index b98f280b56..b98f280b56 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 0e211551e6..5e92a12251 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="480" min_height="480" min_width="940"
-     name="Model Preview" title="UPLOAD MODEL" width="940"
-      help_topic="upload_model" >
+<floater
+ can_close="true"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_resize="false"
+ height="480"
+ min_height="480"
+ width="980"
+ min_width="980"
+ name="Model Preview"
+ title="UPLOAD MODEL"
+ help_topic="upload_model" >
 
   <string name="status_idle"></string>
   <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
@@ -98,7 +106,7 @@
       top_pad="15"
       left="0"
       height="300"
-      width="625"
+      width="635"
       name="import_tab"
       tab_position="top">
       <!-- LOD PANEL -->
@@ -116,13 +124,13 @@
              left="3"
              name="lod_tab_border"
              top_pad="0"
-             width="619" />
+             width="629" />
           <text
            follows="left|top"
            height="18"
            initial_value="Source"
            layout="topleft"
-           left="75"
+           left="85"
            name="source"
            text_color="ModelUploaderLabels"
            top="15"
@@ -165,7 +173,7 @@
              top_pad="10"
              valign="top"
              value="High"
-             width="65" />
+             width="75" />
             <combo_box
              follows="top|left"
              height="20"
@@ -175,10 +183,10 @@
              top_delta="-3"
              width="135">
                 <item
-                 id="Load from file"
+                 name="Load from file"
                  value="Load from file" />
                 <item
-                 id="Generate"
+                 name="Generate"
                  value="Generate" />
             </combo_box>
             <line_editor
@@ -210,10 +218,10 @@
              visible="false"
              width="135">
                 <item
-                 id="Triangle Limit"
+                 name="Triangle Limit"
                  value="Triangle Limit" />
                 <item
-                 id="Error Threshold"
+                 name="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -290,7 +298,7 @@
              top_pad="15"
              valign="top"
              value="Medium"
-             width="65" />
+             width="75" />
             <combo_box
              follows="top|left"
              height="20"
@@ -300,13 +308,13 @@
              top_delta="-3"
              width="135">
                 <item
-                 id="Load from file"
+                 name="Load from file"
                  value="Load from file" />
                 <item
-                 id="Generate"
+                 name="Generate"
                  value="Generate" />
                 <item
-                 id="Use LoD above"
+                 name="Use LoD above"
                  value="Use LoD above" />
             </combo_box>
             <line_editor
@@ -339,10 +347,10 @@
              top_delta="0"
              width="135">
                 <item
-                 id="Triangle Limit"
+                 name="Triangle Limit"
                  value="Triangle Limit" />
                 <item
-                 id="Error Threshold"
+                 name="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -418,7 +426,7 @@
              top_pad="15"
              valign="top"
              value="Low"
-             width="65" />
+             width="75" />
             <combo_box
              follows="top|left"
              height="20"
@@ -428,13 +436,13 @@
              top_delta="-3"
              width="135">
                 <item
-                 id="Load from file"
+                 name="Load from file"
                  value="Load from file" />
                 <item
-                 id="Generate"
+                 name="Generate"
                  value="Generate" />
                 <item
-                 id="Use LoD above"
+                 name="Use LoD above"
                  value="Use LoD above" />
             </combo_box>
             <line_editor
@@ -467,10 +475,10 @@
              top_delta="0"
              width="135">
                 <item
-                 id="Triangle Limit"
+                 name="Triangle Limit"
                  value="Triangle Limit" />
                 <item
-                 id="Error Threshold"
+                 name="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -546,7 +554,7 @@
              top_pad="15"
              valign="top"
              value="Lowest"
-             width="65" />
+             width="75" />
             <combo_box
              follows="top|left"
              height="20"
@@ -556,13 +564,13 @@
              top_delta="-3"
              width="135">
                 <item
-                 id="Load from file"
+                 name="Load from file"
                  value="Load from file" />
                 <item
-                 id="Generate"
+                 name="Generate"
                  value="Generate" />
                 <item
-                 id="Use LoD above"
+                 name="Use LoD above"
                  value="Use LoD above" />
             </combo_box>
             <line_editor
@@ -595,10 +603,10 @@
              top_delta="0"
              width="135">
                 <item
-                 id="Triangle Limit"
+                 name="Triangle Limit"
                  value="Triangle Limit" />
                 <item
-                 id="Error Threshold"
+                 name="Error Threshold"
                  value="Error Threshold" />
             </combo_box>
             <spinner
@@ -1201,7 +1209,7 @@
          name="calculate_btn"
          top="3"
          height="20"
-         width="150"
+         width="165"
          tool_tip="Calculate weights &amp;fee"/>
        <button
          follows="top|left"
@@ -1234,7 +1242,7 @@
          right="-2"
          top="3"
          height="20"
-         width="155"/>
+         width="275"/>
        <!-- ========== WEIGHTS ==========-->
        <text
          follows="top|left"
@@ -1343,7 +1351,7 @@
   layout="topleft"
   name="right_panel"
   top_pad="5"
-  width="290">
+  width="340">
     <combo_box
       top_pad="3"
       follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
deleted file mode 100644
index 62b8c5f96e..0000000000
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ /dev/null
@@ -1,841 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- layout="topleft"
- name="Model Wizard"
- help_topic="model_wizard"
- bg_opaque_image_overlay="0.5 0.5 0.5 1"
- height="480"
- save_rect="true"
- title="UPLOAD MODEL WIZARD"
- width="535">
-	<button
-	 top="32"
-	 tab_stop="false"
-	 left="410"
-	 height="32"
-	 name="upload_btn"
-	 enabled="false"
-	 label="5. Upload"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Right_Off"
-	 image_selected="BreadCrumbBtn_Right_Press"
-	 image_hover_unselected="BreadCrumbBtn_Right_Over"
-	 image_disabled="BreadCrumbBtn_Right_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Right_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Upload"/>
-	</button>
-	<button
-	 top="32"
-	 left="310"
-	 height="32"
-	 tab_stop="false"
-	 name="review_btn"
-	 label="4. Review"
-	 enabled="false"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Review"/>
-	</button>
-	<button
-	 top="32"
-	 left="210"
-	 height="32"
-	 name="physics_btn"
-	 label="3. Physics"
-	 tab_stop="false"
-	 enabled="false"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Physics"/>
-	</button>
-	<button
-	 top="32"
-	 left="115"
-	 name="optimize_btn"
-	 label="2. Optimize"
-	 tab_stop="false"
-	 height="32"
-	 border="false"
-	 image_unselected="BreadCrumbBtn_Middle_Off"
-	 image_selected="BreadCrumbBtn_Middle_Press"
-	 image_hover_unselected="BreadCrumbBtn_Middle_Over"
-	 image_disabled="BreadCrumbBtn_Middle_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Middle_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Optimize"/>
-	</button>
-	<button
-	 top="32"
-	 left="15"
-	 name="choose_file_btn"
-	 tab_stop="false"
-	 enabled="false"
-	 label="1. Choose File"
-	 height="32"
-	 image_unselected="BreadCrumbBtn_Left_Off"
-	 image_selected="BreadCrumbBtn_Left_Press"
-	 image_hover_unselected="BreadCrumbBtn_Left_Over"
-	 image_disabled="BreadCrumbBtn_Left_Disabled"
-	 image_disabled_selected="BreadCrumbBtn_Left_Disabled"
-	 width="110">
-		<button.commit_callback
-		function="Wizard.Choose"/>
-	</button>
-	<panel
-		 height="388"
-		 top_pad="0"
-		 name="choose_file_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 width="505"
-		 name="choose_file_header_panel"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 top="3"
-			 name="choose_file_header_text"
-			 text_color="White"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Choose model file
-			</text>
-		</panel>
-		<panel
-		 top_pad="14"
-		 left="15"
-		 height="310"
-		 width="505"
-		 name="choose_file_content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-            <text
-			 height="32"
-			 left="10"
-			 name="advanced_users_text"
-			 text_color="White"
-			 top="15"
-			 width="320"
-			 word_wrap="true">
-				Advanced users: If you are familiar with 3D content creation tools you may wish to use the Advanced Uploader.
-			</text>
-			<button
-			 follows="left|top"
-			 height="20"
-			 label="Switch to Advanced"
-			 layout="topleft"
-			 left_delta="0"
-			 name="switch_to_advanced"
-			 top_pad="5"
-			 width="130">
-			</button>
-			<text
-			 type="string"
-			 length="1"
-			 text_color="White" 
-			 follows="left|top"
-			 top_pad="30"
-			 height="10"
-			 layout="topleft"
-			 left_delta="0"
-			 name="Cache location"
-			 width="320">
-				Choose model file to upload
-			</text>
-			<line_editor
-			 border_style="line"
-			 border_thickness="1"
-			 follows="left|top"
-			 font="SansSerifSmall"
-			 height="20"
-			 layout="topleft"
-			 left_delta="0"
-			 max_length="4096"
-			 name="lod_file"
-			 top_pad="5"
-			 width="230" />
-			<button
-			 follows="left|top"
-			 height="23"
-			 label="Browse..."
-			 label_selected="Browse..."
-			 layout="topleft"
-			 left_pad="5"
-			 name="browse"
-			 top_delta="-1"
-			 width="85">
-			</button>
-			<text
-			 type="string"
-			 length="1"
-			 text_color="White" 
-			 follows="left|top"
-			 top_pad="5"
-			 height="10"
-			 layout="topleft"
-			 left="10"
-			 name="Model types"
-			 width="320">
-				Second Life supports COLLADA (.dae) files
-			</text>
-			<!-- Placeholder panel for 3D preview render -->
-			<panel
-			 top="30"
-			 right="-10"
-			 name="choose_file_preview_panel"
-			 bevel_style="none"
-			 highlight_light_color="0.09 0.09 0.09 1"
-			 border="true"
-			 border_style="line"
-			 height="150"
-			 follows="all"
-			 width="150">
-			</panel>
-			<text
-			 top_pad="10"
-			 width="130"
-			 height="14"
-			 left_delta="0"
-			 text_color="White"
-			 word_wrap="true">
-				Dimensions (meters):
-			</text>
-			<text
-			 top_pad="0"
-			 width="160"
-			 height="15"
-			 font="SansSerifSmallBold" 
-			 text_color="White"
-			 name="dimensions"
-			 left_delta="0">
-				X         Y         Z 
-			</text>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_x"
-			 left="356"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_y"
-			 left="403"/>
-			<text
-			 top_delta="0"
-			 width="160"
-			 height="15"
-			 name="dimension_z"
-			 left="450"/>
-            <text
-             height="16"
-             left="10"
-             name="warning_label"
-             text_color="Yellow"
-             top="200"
-             visible="false"
-             width="320">
-                WARNING:
-            </text>
-            <text
-             height="50"
-             left="10"
-             name="warning_text"
-             top_pad="0"
-             visible="false"
-             width="320"
-             word_wrap="true">
-                You will not be able to complete the final step of uploading this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to set up your account for mesh model uploads. 
-            </text>
-		</panel>
-	</panel>
-
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="optimize_panel"
-		 visible="true"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="optimize_header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="optimize_header_text"
-			 top="3"
-			 text_color="White"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Optimize model
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="460"
-		 height="20"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="optimize_description"
-		 word_wrap="true"
-		 left_delta="5">
-			We have optimized the model for performance. Adjust it further if you wish.
-		</text>
-		<panel
-		 top_delta="40"
-		 visible="false"
-		 left="15"
-		 height="270"
-		 width="505"
-		 name="optimize_content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-			<text
-			 top="20"
-			 width="300"
-			 height="12"
-			 font="SansSerifBold"
-			 left="112">Generating Level of Detail</text>
-			<progress_bar
-			  name="optimize_progress_bar"
-              image_fill="model_wizard\progress_light.png"
-			  color_bg="1 1 1 1"
-			  color_bar="1 1 1 0.96"
-			  follows="left|right|top"
-			  width="260"
-			  height="16"
-			  image_bar="model_wizard\progress_bar_bg.png"
-			  top_pad="14"
-			  left="110"/>
-			<icon
-			 top_pad="10"
-			 left_delta="0"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="high_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: High</text>
-			<icon
-			 top_pad="10"
-			 left_delta="-18"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="medium_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: Medium</text>
-			<icon
-			 top_pad="10"
-			 left_delta="-18"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="low_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: Low</text>
-			<icon
-			 top_pad="10"
-			 left_delta="-18"
-			 width="13"
-			 height="12"
-			 image_name="model_wizard\check_mark.png"/>
-			<text
-			 top_delta="0"
-			 left_delta="18"
-			 name="lowest_detail_text"
-			 width="200"
-			 height="14">Generate Level of Detail: Lowest</text>
-		</panel>
-		<panel
-				 top_delta="0"
-				 left_delta="0"
-				 height="270"
-				 width="505"
-				 name="content2"
-				 bg_opaque_color="DkGray2"
-				 background_visible="true"
-				 background_opaque="true">
-			<text top="69" left="10" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Performance</text>
-			<text top="85" left="10" width="120" word_wrap="true" font="SansSerifSmall" height="40">Faster rendering
-Less detail
-Lower prim weight</text>
-			<text top="69" left="184" text_color="White" font="SansSerifSmallBold" width="120" height="16" wrap="true">Accuracy</text>
-			<text top="85" left="184" width="120" word_wrap="true" font="SansSerifSmall" height="40">Slower rendering
-More detail
-Higher prim weight</text>
-
-          <slider
-		   follows="left|top"
-		   height="20"
-		   increment="1"
-		   layout="topleft"
-		   left="10"
-		   max_val="2"
-		   initial_value="1"
-		   min_val="0"
-		   name="accuracy_slider"
-		   show_text="false"
-		   top="130"
-		   width="290" />
-          <text 
-			font="SansSerifSmall" 
-			top_pad="0"  
-			width="5" 
-			left_delta="6" 
-			height="4">'  
-          </text>
-          <text 
-			font="SansSerifSmall" 
-			top_delta="0"  
-			width="5" 
-			left_delta="137" 
-			height="4">'  
-          </text>
-          <text 
-			font="SansSerifSmall" 
-			top_delta="0"  
-			width="5" 
-			left_delta="137" 
-			height="4">'  
-          </text>
-          <button
-			follows="left|top"
-			height="20"
-			label="Recalculate Geometry"
-			layout="topleft"
-			left="80"
-			name="recalculate_geometry_btn"
-			top_pad="15"
-            width="150">
-          </button>
-			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
-				Geometry preview
-			</text>
-			<panel
-				 right="-10"
-				 top="32"
-				 name="optimize_preview_panel"
-				 bevel_style="none"
-				 highlight_light_color="0.09 0.09 0.09 1"
-				 border_style="line"
-				 border="true"
-				 height="185"
-				 follows="all"
-				 width="185">
-			</panel>
-			<combo_box left_delta="75" top_pad="10"  follows="left|top" list_position="below" height="22"
-	     name="preview_lod_combo" width="110" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High detail
-				</combo_item>
-				<combo_item name="medium">
-					Medium detail
-				</combo_item>
-				<combo_item name="low">
-					Low detail
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest detail
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="physics_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="physics_header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="physics_header_text"
-			 top="3"
-			 height="10"
-			 font="SansSerifBig"
-			 text_color="White" 
-			 layout="topleft">
-				Adjust physics
-			</text>
-		</panel>
-		<text
-		 top_pad="10"
-		 width="474"
-		 height="50"
-		 font="SansSerifSmall"
-		 layout="topleft"
-		 name="physics_description"
-		 word_wrap="true"
-		 left_delta="5">
-			We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model.
-		</text>
-    <panel
-		 top_delta="44"
-		 left="15"
-		 height="270"
-		 width="505"
-		 name="physics_content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-      <text top="10" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Performance</text>
-      <text top="26" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Faster rendering
-Less detail
-Lower prim weight</text>
-      <text top="174" left="10" text_color="White" font="SansSerifSmallBold" width="120" halign="right" height="16" wrap="true">Accuracy</text>
-      <text top="190" left="10" width="120" word_wrap="true" font="SansSerifSmall" halign="right" height="40">Slower rendering
-More detail
-Higher prim weight</text>
-
-      <slider
-		   follows="left|top"
-		   height="190"
-		   increment=".1"
-		   layout="topleft"
-		   left="140"
-		   max_val="1"
-		   initial_value="0.5"
-		   min_val="0"
-		   name="physics_slider"
-		   orientation="vertical"
-		   show_text="false"
-		   top="25"
-		   width="22" />
-      <text top="10" width="120" word_wrap="true" left_pad="10" height="50">Examples:
-Moving objects
-Flying objects
-Vehicles</text>
-      <text top="95" width="120" word_wrap="true" left_delta="0" height="50">Examples:
-Small static objects
-Less detailed objects
-Simple furniture</text>
-      <text top="180" width="120" word_wrap="true" left_delta="0" height="50">Examples:
-Static objects
-Detailed objects
-Buildings</text>
-          <button
-			follows="left|top"
-			height="20"
-			label="Recalculate physics"
-			layout="topleft"
-			left="80"
-			name="recalculate_physics_btn"
-			top_pad="10"
-            width="150">
-          </button>
-          <button
-            enabled="false"
-			follows="left|top"
-			height="20"
-			label="Recalculating..."
-			layout="topleft"
-			left_delta="0"
-			name="recalculating_physics_btn"
-			top_delta="0"
-			visible="false"
-            width="150">
-          </button>
-			<text top="10" right="-10" width="185" text_color="White" follows="left|top" height="15" name="lod_label">
-				Physics preview
-			</text>
-			<panel
-				 right="-10"
-				 top="32"
-				 name="physics_preview_panel"
-				 bevel_style="none"
-				 highlight_light_color="0.09 0.09 0.09 1"
-				 border_style="line"
-				 border="true"
-				 height="185"
-				 follows="all"
-				 width="185">
-			</panel>
-			<combo_box left_delta="75" top_pad="10"  follows="left|top" list_position="below" height="22"
-	     name="preview_lod_combo2" width="110" tool_tip="LOD to view in preview render">
-				<combo_item name="high">
-					High detail
-				</combo_item>
-				<combo_item name="medium">
-					Medium detail
-				</combo_item>
-				<combo_item name="low">
-					Low detail
-				</combo_item>
-				<combo_item name="lowest">
-					Lowest detail
-				</combo_item>
-			</combo_box>
-    </panel>
-	</panel>
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="review_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="review_header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="review_header_text"
-			 text_color="White" 
-			 top="3"
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Review
-			</text>
-		</panel>
-		<panel
-		 top_pad="14"
-		 left="15"
-		 height="310"
-		 width="505"
-		 name="review_content"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true">
-			<text
-			 top="20"
-			 width="485"
-			 font="SansSerifMedium"
-			 text_color="White"
-			 left="10"
-			 name="review_prim_equiv"
-			 height="16">Impact to parcel/region: [EQUIV] prim equivalents
-			</text>
-			<text
-			 top_pad="20"
-			 width="485"
-			 font="SansSerifMedium"
-			 text_color="White"
-			 left="10"
-			 name="review_fee"
-			 height="16">Your account will be charged an upload fee of L$ [FEE].
-			</text>
-			<text 
-			 top_pad="20"
-			 width="485"
-			 font="SansSerifMedium"
-			 text_color="White"
-			 left="10"
-			 name="review_confirmation"
-			 height="32"
-			 word_wrap="true">By clicking the upload button, you confirm that you have the appropriate rights to the material contained in the model.
-			</text>
-      </panel>
-	</panel>
-
-
-
-
-	<panel
-		 height="388"
-		 top_delta="0"
-		 name="upload_panel"
-		 visible="false"
-		 width="535"
-		 left="0">
-		<panel
-		 height="22"
-		 top_pad="15"
-		 name="upload_header_panel"
-		 width="505"
-		 bg_opaque_color="DkGray2"
-		 background_visible="true"
-		 background_opaque="true"
-		 left="15">
-			<text
-			 width="200"
-			 left="10"
-			 name="upload_header_text"
-			 top="3"
-			 text_color="White" 
-			 height="10"
-			 font="SansSerifBig"
-			 layout="topleft">
-				Upload complete
-			</text>
-		</panel>
-		<text
-		 top_pad="14"
-		 width="495"
-		 height="16"
-		 font="SansSerifMedium"
-		 layout="topleft"
-		 name="model_uploaded_text"
-		 text_color="White"
-		 word_wrap="true"
-		 left="25">
-			Your model has been uploaded.
-		</text>
-		<text
-		 top_pad="5"
-		 width="495"
-		 height="16"
-		 font="SansSerifMedium"
-		 layout="topleft"
-		 name="inventory_text"
-		 text_color="White"
-		 word_wrap="true"
-		 left="25">
-			You will find it in the Objects folder in your inventory.
-		</text>
-		<text
-		 top_pad="20"
-		 width="495"
-		 font="SansSerifMedium"
-		 text_color="White"
-		 left="25"
-		 name="charged_fee"
-		 height="16">Your account has been charged L$ [FEE].
-		</text>
-	</panel>
-
-
-
-	<button
-	 top="440"
-	 right="-285"
-	 width="90"
-	 height="22"
-	 name="back"
-	 label="&lt;&lt; Back" />
-	<button
-	 top_delta="0"
-	 right="-190"
-	 width="90"
-	 height="22"
-	 name="next"
-	 label="Next &gt;&gt; " />
-	<button
-	 top_delta="0"
-	 left_delta="0"
-	 width="160"
-	 height="22"
-	 name="calculate"
-	 label="Calculate weights &amp; fee &gt;&gt; " />
-	<button
-	 enabled="false"
-	 visible="false"
-	 top_delta="0"
-	 left_delta="0"
-	 width="160"
-	 height="22"
-	 name="calculating"
-	 label="Calculating... " />
-	<button
-	 enabled="false"
-	 top_delta="0"
-	 right="-150"
-	 width="90"
-	 height="22"
-	 visible="false" 
-	 name="upload" 
-	 tool_tip="Upload to simulator"
-	 label="Upload" />
-	<button
-	 top_delta="0"
-	 right="-15"
-	 width="90"
-	 height="22"
-	 name="cancel"
-	 label="Cancel" />
-	<button
-	 top_delta="0"
-	 right="-15"
-	 width="90"
-	 height="22"
-	 name="close"
-	 visible="false" 
-	 label="Close" />
-	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
-
-	<string name="status_idle">Idle</string>
-  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
-	<string name="status_reading_file">Loading...</string>
-	<string name="status_generating_meshes">Generating Meshes...</string>
-	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
-	<string name="bad_element">Error: element is invalid</string>
-	<string name="high">High</string>
-	<string name="medium">Medium</string>
-	<string name="low">Low</string>
-	<string name="lowest">Lowest</string>
-	<string name="mesh_status_good">Ship it!</string>
-	<string name="mesh_status_na">N/A</string>
-	<string name="mesh_status_none">None</string>
-	<string name="mesh_status_submesh_mismatch">Levels of detail have a different number of textureable faces.</string>
-	<string name="mesh_status_mesh_mismatch">Levels of detail have a different number of mesh instances.</string>
-	<string name="mesh_status_too_many_vertices">Level of detail has too many vertices.</string>
-	<string name="mesh_status_missing_lod">Missing required level of detail.</string>
-	<string name="layer_all">All</string>
-	<!-- Text to display in physics layer combo box for "all layers" -->
-
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 4e7ee7913f..5e84283ab0 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  positioning="specified"
- left="320"
- bottom="-80"
+ right="-693"
+ bottom="-50"
  legacy_header_height="18"
  can_dock="false"
  can_minimize="true"
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 22b0a1783f..22b0a1783f 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
index fdea7a821a..fdea7a821a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
index 184f296255..178987962b 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml
@@ -6,7 +6,7 @@
  height="570"
  help_topic="sidebar_inventory"
  min_width="333"
- min_height="440"
+ min_height="570"
  name="floater_my_inventory"
  save_rect="true"
  save_visibility="true"
diff --git a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
index df46fc198f..df46fc198f 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_my_web_profile.xml
diff --git a/indra/newview/skins/default/xui/en/floater_notification.xml b/indra/newview/skins/default/xui/en/floater_notification.xml
index 1f9ddecac2..1f9ddecac2 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_notification.xml
+++ b/indra/newview/skins/default/xui/en/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_console.xml b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
index e243ccd2f9..e243ccd2f9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/en/floater_object_weights.xml b/indra/newview/skins/default/xui/en/floater_object_weights.xml
index eb283a1043..eb283a1043 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/en/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/en/floater_openobject.xml b/indra/newview/skins/default/xui/en/floater_openobject.xml
index f526970ad0..f526970ad0 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/en/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
index bbe280582b..bbe280582b 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/en/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index ffbb6aa28b..ffbb6aa28b 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..46ee113b69
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    positioning="cascading"
+    can_resize="true"
+    can_tear_off="false"
+    height="273"
+    width="635"
+    min_height="273"
+    min_width="635"
+    layout="topleft"
+    name="floater_pathfinding_characters"
+    help_topic="floater_pathfinding_characters"
+    reuse_instance="true"
+    save_rect="false"
+    single_instance="true"
+    title="Pathfinding characters">
+  <floater.string name="messaging_initial"></floater.string>
+  <floater.string name="messaging_get_inprogress">Querying for pathfinding characters ...</floater.string>
+  <floater.string name="messaging_get_error">Error detected while querying for pathfinding characters.</floater.string>
+  <floater.string name="messaging_set_inprogress"></floater.string>
+  <floater.string name="messaging_set_error"></floater.string>
+  <floater.string name="messaging_complete_none_found">No pathfinding characters.</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
+  <floater.string name="character_owner_loading">[Loading]</floater.string>
+  <floater.string name="character_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="character_owner_group">[group]</floater.string>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right|bottom"
+      layout="topleft"
+      height="191"
+      width="635">
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="all"
+        height="135"
+        layout="topleft"
+        left="18"
+        top_pad="10"
+        tab_stop="false"
+        multi_select="true"
+        name="objects_scroll_list"
+        width="600">
+      <scroll_list.columns
+          label="Name"
+          name="name"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Description"
+          name="description"
+          width="172" />
+      <scroll_list.columns
+          label="Owner"
+          name="owner"
+          width="141" />
+      <scroll_list.columns
+          label="CPU"
+          name="cpu_time"
+          width="60" />
+      <scroll_list.columns
+          label="Altitude"
+          name="altitude"
+          width="64" />
+    </scroll_list>
+    <text
+        height="26"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|bottom|right"
+        layout="topleft"
+        name="messaging_status"
+        top_pad="17"
+        width="238">
+      Characters:
+    </text>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Refresh list"
+        layout="topleft"
+        name="refresh_objects_list"
+        top_pad="-29"
+        left_pad="0"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select all"
+        layout="topleft"
+        name="select_all_objects"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select none"
+        layout="topleft"
+        name="select_none_objects"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|right|bottom"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
+      left="18"
+      width="600"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|right|bottom"
+      layout="topleft"
+      left="0"
+      height="67"
+      width="635">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        length="1"
+        follows="left|bottom|right"
+        layout="topleft"
+        name="actions_label"
+        left="18"
+        top_pad="8"
+        width="242">
+      Actions on selected characters:
+    </text>
+    <check_box
+        height="19"
+        follows="left|bottom"
+        label="Show beacon"
+        layout="topleft"
+        name="show_beacon"
+        top_pad="-16"
+        left_pad="0"
+        width="150" />
+    <check_box
+        height="19"
+        follows="left|bottom"
+        label="Show physics capsule"
+        layout="topleft"
+        name="show_physics_capsule"
+        top_pad="-19"
+        left_pad="0"
+        width="150" />
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Take"
+        layout="topleft"
+        name="take_objects"
+        top_pad="9"
+        left="18"
+        width="94"/>
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Take copy"
+        layout="topleft"
+        name="take_copy_objects"
+        top_pad="-22"
+        left_pad="6"
+        width="94"/>
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_object"
+        tool_tip="Enabled only when one character is selected."
+        top_pad="-22"
+        left_pad="26"
+        width="159"/>
+    <button
+        follows="right|bottom"
+        height="22"
+        label="Return"
+        layout="topleft"
+        name="return_objects"
+        top_pad="-22"
+        left_pad="26"
+        width="94"/>
+    <button
+        follows="right|bottom"
+        height="22"
+        label="Delete"
+        layout="topleft"
+        name="delete_objects"
+        top_pad="-22"
+        left_pad="6"
+        width="94"/>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..2629313069
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    positioning="cascading"
+    can_tear_off="false"
+    height="498"
+    layout="topleft"
+    name="floater_pathfinding_console"
+    help_topic="floater_pathfinding_console"
+    reuse_instance="true"
+    save_rect="true"
+    single_instance="true"
+    title="Pathfinding view / test"
+    width="240">
+  <floater.string name="navmesh_viewer_status_unknown"></floater.string>
+  <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="navmesh_viewer_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="navmesh_viewer_status_region_loading">Waiting for the region to finish loading.</floater.string>
+  <floater.string name="navmesh_viewer_status_checking_version">Checking the status of the navmesh.</floater.string>
+  <floater.string name="navmesh_viewer_status_downloading">Downloading the navmesh.</floater.string>
+  <floater.string name="navmesh_viewer_status_updating">The navmesh has changed on the server. Downloading the latest navmesh.</floater.string>
+  <floater.string name="navmesh_viewer_status_has_navmesh">Latest navmesh has been downloaded.</floater.string>
+  <floater.string name="navmesh_viewer_status_error">Unable to download navmesh successfully.</floater.string>
+  <floater.string name="navmesh_simulator_status_unknown"></floater.string>
+  <floater.string name="navmesh_simulator_status_pending">Navmesh has pending changes.</floater.string>
+  <floater.string name="navmesh_simulator_status_building">Navmesh is building.</floater.string>
+  <floater.string name="navmesh_simulator_status_some_pending">Some navmesh regions have pending changes.</floater.string>
+  <floater.string name="navmesh_simulator_status_some_building">Some navmesh regions are building.</floater.string>
+  <floater.string name="navmesh_simulator_status_pending_and_building">Some navmesh regions have pending changes and others are building.</floater.string>
+  <floater.string name="navmesh_simulator_status_complete">Navmesh is up-to-date.</floater.string>
+  <floater.string name="pathing_unknown"></floater.string>
+  <floater.string name="pathing_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="pathing_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
+  <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
+  <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
+  <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
+  <floater.string name="pathing_path_invalid">A path between the chosen points cannot be found.</floater.string>
+  <floater.string name="pathing_error">An error occurred during path generation.</floater.string>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      height="61"
+      width="214">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="0"
+        width="214">
+      Viewer status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="PathfindingGoodColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="pathfinding_viewer_status"
+        top_pad="8"
+        width="214">
+    </text>
+  </panel>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      height="66"
+      width="214">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="5"
+        width="214">
+      Simulator status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="PathfindingGoodColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="pathfinding_simulator_status"
+        top_pad="8"
+        width="214">
+    </text>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      left="12"
+      top="179"
+      height="305"
+      width="213"
+      visible="true" />
+  <tab_container
+      follows="left|top"
+      layout="topleft"
+      tab_position="top"
+      name="view_test_tab_container"
+      left="12"
+      top="157"
+      height="328"
+      width="214">
+    <panel
+        border="false"
+        bevel_style="none"
+        follows="left|top"
+        layout="topleft"
+        name="view_panel"
+        label="View">
+      <text
+          height="13"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="show_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="20"
+          left="12"
+          width="200">
+        Show:
+      </text>
+      <check_box
+          height="19"
+          label="World"
+          layout="topleft"
+          name="show_world"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Movables only"
+          layout="topleft"
+          left="32"
+          name="show_world_movables_only"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Navmesh"
+          left="12"
+          layout="topleft"
+          name="show_navmesh"
+          top_pad="7"
+          width="90" />
+      <text
+          height="13"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="show_walkability_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left="32"
+          width="180">
+        Show walkability map:
+      </text>
+      <combo_box
+          height="19"
+          layout="topleft"
+          left="32"
+          name="show_heatmap_mode"
+          top_pad="8"
+          width="156">
+        <combo_box.item
+            label="Do not show"
+            name="show_heatmap_mode_none"
+            value="0" />
+        <combo_box.item
+            label="Character type A"
+            name="show_heatmap_mode_a"
+            value="1" />
+        <combo_box.item
+            label="Character type B"
+            name="show_heatmap_mode_b"
+            value="2" />
+        <combo_box.item
+            label="Character type C"
+            name="show_heatmap_mode_c"
+            value="3" />
+        <combo_box.item
+            label="Character type D"
+            name="show_heatmap_mode_d"
+            value="4" />
+      </combo_box>
+      <check_box
+          height="19"
+          label="Walkables"
+          layout="topleft"
+          left="12"
+          name="show_walkables"
+          top_pad="10"
+          width="90" />
+      <check_box
+          height="19"
+          label="Material volumes"
+          layout="topleft"
+          name="show_material_volumes"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Static obstacles"
+          layout="topleft"
+          name="show_static_obstacles"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Exclusion volumes"
+          layout="topleft"
+          name="show_exclusion_volumes"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Water plane"
+          layout="topleft"
+          name="show_water_plane"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="With X-ray vision"
+          layout="topleft"
+          name="show_xray"
+          top_pad="4"
+          width="90" />
+    </panel>
+    <panel
+        border="false"
+        bevel_style="none"
+        follows="left|top"
+        layout="topleft"
+        name="test_panel"
+        label="Test path">
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="ctrl_click_label"
+          length="1"
+          left="12"
+          follows="left|top"
+          layout="topleft"
+          top_pad="20"
+          width="202">
+        Ctrl-click to select start point.
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="shift_click_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="5"
+          width="202">
+        Shift-click to select end point.
+      </text>
+      <view_border
+          bevel_style="none"
+          follows="top|left"
+          layout="topleft"
+          height="0"
+          width="185"
+          top_pad="13"
+          visible="true" />
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="character_width_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="14"
+          width="202">
+        Character width
+      </text>
+      <slider
+          decimal_digits="1"
+          height="14"
+          increment="0.1"
+          layout="topleft"
+          follows="left|top"
+          max_val="2"
+          min_val="0.2"
+          name="character_width"
+          top_pad="5"
+          value="1"
+          width="145" />
+      <text
+          height="14"
+          word_wrap="false"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="character_width_unit_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="-14"
+          left_pad="0"
+          width="20">
+        m
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="character_type_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left_pad="-165"
+          top_pad="13"
+          width="202">
+        Character type
+      </text>
+      <combo_box
+          follows="top|left"
+          layout="topleft"
+          height="19"
+          width="156"
+          top_pad="5"
+          name="path_character_type">
+        <combo_box.item
+            label="None"
+            name="path_character_type_none"
+            value="0" />
+        <combo_box.item
+            label="A"
+            name="path_character_type_a"
+            value="1" />
+        <combo_box.item
+            label="B"
+            name="path_character_type_b"
+            value="2" />
+        <combo_box.item
+            label="C"
+            name="path_character_type_c"
+            value="3" />
+        <combo_box.item
+            label="D"
+            name="path_character_type_d"
+            value="4" />
+      </combo_box>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="PathfindingGoodColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          name="path_test_status"
+          top_pad="11"
+          width="202">
+      </text>
+      <button
+          follows="left|top"
+          height="22"
+          label="Clear path"
+          layout="topleft"
+          name="clear_path"
+          top_pad="27"
+          width="96"/>
+    </panel>
+  </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..4a457fb929
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -0,0 +1,597 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    positioning="cascading"
+    can_resize="true"
+    can_tear_off="false"
+    height="395"
+    width="1075"
+    min_height="395"
+    min_width="990"
+    layout="topleft"
+    name="floater_pathfinding_linksets"
+    help_topic="floater_pathfinding_linksets"
+    reuse_instance="true"
+    save_rect="false"
+    single_instance="true"
+    title="Pathfinding linksets">
+  <floater.string name="messaging_initial"></floater.string>
+  <floater.string name="messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="messaging_get_error">Error detected while querying for pathfinding linksets.</floater.string>
+  <floater.string name="messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
+  <floater.string name="messaging_set_error">Error detected while modifying selected pathfinding linksets.</floater.string>
+  <floater.string name="messaging_complete_none_found">No pathfinding linksets.</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
+  <floater.string name="linkset_terrain_description">--</floater.string>
+  <floater.string name="linkset_terrain_owner">--</floater.string>
+  <floater.string name="linkset_terrain_scripted">--</floater.string>
+  <floater.string name="linkset_terrain_land_impact">--</floater.string>
+  <floater.string name="linkset_terrain_dist_from_you">--</floater.string>
+  <floater.string name="linkset_owner_loading">[Loading]</floater.string>
+  <floater.string name="linkset_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="linkset_owner_group">[group]</floater.string>
+  <floater.string name="linkset_is_scripted">Yes</floater.string>
+  <floater.string name="linkset_is_not_scripted">No</floater.string>
+  <floater.string name="linkset_is_unknown_scripted">Unknown</floater.string>
+  <floater.string name="linkset_use_walkable">Walkable</floater.string>
+  <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
+  <floater.string name="linkset_use_dynamic_obstacle">Movable obstacle</floater.string>
+  <floater.string name="linkset_use_material_volume">Material volume</floater.string>
+  <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
+  <floater.string name="linkset_use_dynamic_phantom">Movable phantom</floater.string>
+  <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
+  <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
+  <floater.string name="linkset_is_non_volume_state">[concave]</floater.string>
+  <floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
+  <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right|bottom"
+      layout="topleft"
+      height="226"
+      width="1059">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="20"
+        top_pad="14"
+        width="67">
+      Filter by:
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        width="62">
+      Name
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top"
+        height="20"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-18"
+        max_length_chars="255"
+        name="filter_by_name"
+        width="161" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="22"
+        top_pad="-15"
+        width="88">
+      Description
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top"
+        height="20"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-17"
+        max_length_chars="255"
+        name="filter_by_description"
+        width="162" />
+    <combo_box
+        height="20"
+        layout="topleft"
+        follows="left|top"
+        name="filter_by_linkset_use"
+        left_pad="32"
+        top_pad="-20"
+        width="199">
+      <combo_box.item
+          label="Filter by linkset use..."
+          name="filter_by_linkset_use_none"
+          value="0" />
+      <combo_box.item
+          label="Walkable"
+          name="filter_by_linkset_use_walkable"
+          value="1" />
+      <combo_box.item
+          label="Static obstacle"
+          name="filter_by_linkset_use_static_obstacle"
+          value="2" />
+      <combo_box.item
+          label="Movable obstacle"
+          name="filter_by_linkset_use_dynamic_obstacle"
+          value="3" />
+      <combo_box.item
+          label="Material volume"
+          name="filter_by_linkset_use_material_volume"
+          value="4" />
+      <combo_box.item
+          label="Exclusion volume"
+          name="filter_by_linkset_use_exclusion_volume"
+          value="5" />
+      <combo_box.item
+          label="Movable phantom"
+          name="filter_by_linkset_use_dynamic_phantom"
+          value="6" />
+    </combo_box>
+    <button
+        follows="right|top"
+        height="21"
+        label="Apply"
+        layout="topleft"
+        name="apply_filters"
+        top_pad="-21"
+        left_pad="91"
+        width="73"/>
+    <button
+        follows="right|top"
+        height="21"
+        label="Clear"
+        layout="topleft"
+        name="clear_filters"
+        top_pad="-21"
+        left_pad="8"
+        width="73"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="all"
+        height="135"
+        layout="topleft"
+        left="18"
+        top_pad="15"
+        tab_stop="false"
+        multi_select="true"
+        name="objects_scroll_list"
+        width="1040">
+      <scroll_list.columns
+          label="Name (root prim)"
+          name="name"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Description (root prim)"
+          name="description"
+          width="158" />
+      <scroll_list.columns
+          label="Owner"
+          name="owner"
+          width="141" />
+      <scroll_list.columns
+          label="Scripted"
+          name="scripted"
+          width="60" />
+      <scroll_list.columns
+          label="Impact"
+          name="land_impact"
+          width="55" />
+      <scroll_list.columns
+          label="Distance"
+          name="dist_from_you"
+          width="65" />
+      <scroll_list.columns
+          label="Linkset use"
+          name="linkset_use"
+          width="236" />
+      <scroll_list.columns
+          label="A %"
+          name="a_percent"
+          width="41" />
+      <scroll_list.columns
+          label="B %"
+          name="b_percent"
+          width="41" />
+      <scroll_list.columns
+          label="C %"
+          name="c_percent"
+          width="41" />
+      <scroll_list.columns
+          label="D %"
+          name="d_percent"
+          width="41" />
+    </scroll_list>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|bottom|right"
+        layout="topleft"
+        name="messaging_status"
+        top_pad="17"
+        width="679">
+      Linksets:
+    </text>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Refresh list"
+        layout="topleft"
+        name="refresh_objects_list"
+        top_pad="-16"
+        left_pad="0"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select all"
+        layout="topleft"
+        name="select_all_objects"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select none"
+        layout="topleft"
+        name="select_none_objects"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|bottom|right"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
+      left="18"
+      width="1039"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|right|bottom"
+      layout="topleft"
+      left="0"
+      height="67"
+      width="1010">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        length="1"
+        left="18"
+        follows="left|bottom|right"
+        layout="topleft"
+        top_pad="8"
+        width="580">
+      Actions on selected linksets (If a linkset is removed from the world, its attributes may be lost):
+    </text>
+    <check_box
+        height="19"
+        follows="left|bottom"
+        label="Show beacon"
+        layout="topleft"
+        name="show_beacon"
+        left_pad="0"
+        top_pad="-16"
+        width="90" />
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Take"
+        layout="topleft"
+        name="take_objects"
+        top_pad="9"
+        left="18"
+        width="95"/>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Take copy"
+        layout="topleft"
+        name="take_copy_objects"
+        top_pad="-21"
+        left_pad="6"
+        width="95"/>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_object"
+        top_pad="-21"
+        left_pad="239"
+        width="160"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Return"
+        layout="topleft"
+        name="return_objects"
+        top_pad="-21"
+        left_pad="252"
+        width="95"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Delete"
+        layout="topleft"
+        name="delete_objects"
+        top_pad="-21"
+        left_pad="6"
+        width="95"/>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|bottom|right"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
+      left="18"
+      width="1039"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|right|bottom"
+      layout="topleft"
+      left="0"
+      height="75"
+      width="1010">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left="18"
+        top_pad="8"
+        width="972">
+      Edit attributes of selected linksets and press the button to apply changes
+    </text>
+    <combo_box
+        height="20"
+        layout="topleft"
+        follows="left|top"
+        name="edit_linkset_use"
+        left="18"
+        top_pad="17"
+        width="199">
+    </combo_box>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="walkability_coefficients_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="36"
+        top_pad="-17"
+        width="110">
+      Walkability:
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_a_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="18">
+      A
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_a_value"
+        tool_tip="Walkability for characters of type A.  Example character type is humanoid."
+        width="45" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_b_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="44"
+        top_pad="-15"
+        width="18">
+      B
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_b_value"
+        tool_tip="Walkability for characters of type B.  Example character type is creature."
+        width="45" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_c_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="44"
+        top_pad="-15"
+        width="18">
+      C
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_c_value"
+        tool_tip="Walkability for characters of type C.  Example character type is mechanical."
+        width="45" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_d_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="44"
+        top_pad="-15"
+        width="18">
+      D
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_d_value"
+        tool_tip="Walkability for characters of type D.  Example character type is other."
+        width="45" />
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Apply changes"
+        layout="topleft"
+        name="apply_edit_values"
+        top_pad="-21"
+        left_pad="40"
+        width="140"/>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_a_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left="363"
+        top_pad="5"
+        width="107">
+      (Humanoid)
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_b_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="107">
+      (Creature)
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_c_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="107">
+      (Mechanical)
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_d_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="107">
+      (Other)
+    </text>
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pay.xml b/indra/newview/skins/default/xui/en/floater_pay.xml
index 41a7134b1d..41a7134b1d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_pay.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/en/floater_pay_object.xml b/indra/newview/skins/default/xui/en/floater_pay_object.xml
index d3a35c2051..d3a35c2051 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 08d0b00a83..701233ba4a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -6,21 +6,21 @@
   can_resize="true"
   height="570"
   help_topic="sidebar_people"
-  min_height="440"
-  min_width="333"
+  min_height="220"
+  min_width="260"
   layout="topleft"
   name="floater_people"
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
   title="PEOPLE"
-  width="333">
+  width="370">
     <panel_container
       default_panel_name="panel_people"
       follows="all"
       height="570"
       name="main_panel"
-      width="333">
+      width="370">
       <panel
         class="panel_people"
         name="panel_people"
@@ -31,11 +31,5 @@
         filename="panel_group_info_sidetray.xml"
         label="Group Profile"
         font="SansSerifBold"/>
-      <panel
-        class="panel_block_list_sidetray"
-        name="panel_block_list_sidetray"
-        filename="panel_block_list_sidetray.xml"
-        label="Blocked Residents &amp; Objects"
-        font="SansSerifBold"/>
     </panel_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_picks.xml b/indra/newview/skins/default/xui/en/floater_picks.xml
index 984894b016..984894b016 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_picks.xml
+++ b/indra/newview/skins/default/xui/en/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
index b241e265a9..b241e265a9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_places.xml
+++ b/indra/newview/skins/default/xui/en/floater_places.xml
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
index 05943a10d3..05943a10d3 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/en/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index bd6faf4ed8..bd6faf4ed8 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
index 93bfe53aae..93bfe53aae 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/en/floater_preview_animation.xml b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
index 3ea5f54f2c..3ea5f54f2c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 8baa0a56f7..8baa0a56f7 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index be3b2d179d..2e1c8ce670 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -70,6 +70,7 @@
      max_length="65536"
      name="Notecard Editor"
      parse_urls="false" 
+     spellcheck="true"
      tab_group="1"
      top="46"
      width="392"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_sound.xml b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
index 83a1f5a96f..83a1f5a96f 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 137e278ddc..137e278ddc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
index 6312366b86..6312366b86 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/en/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/en/floater_publish_classified.xml b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
index 322e34272c..322e34272c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/en/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
index 7c7ee2df4c..7c7ee2df4c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 3b58cd08f6..3b58cd08f6 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index e6d749a3f0..9561f67941 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -155,6 +155,7 @@
      name="object_name"
      top_delta="0"
      translate="false"
+     parse_urls="false"
      use_ellipses="true"
      width="185">
         Consetetur Sadipscing
diff --git a/indra/newview/skins/default/xui/en/floater_script.xml b/indra/newview/skins/default/xui/en/floater_script.xml
index bd4edb81c8..bd4edb81c8 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script.xml
+++ b/indra/newview/skins/default/xui/en/floater_script.xml
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml
index 53d4925214..53d4925214 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
index b5dd2f97b9..b5dd2f97b9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/en/floater_script_limits.xml b/indra/newview/skins/default/xui/en/floater_script_limits.xml
index 6b36cdfcc5..6b36cdfcc5 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/en/floater_script_preview.xml b/indra/newview/skins/default/xui/en/floater_script_preview.xml
index 91a9e67e4c..91a9e67e4c 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/en/floater_script_queue.xml b/indra/newview/skins/default/xui/en/floater_script_queue.xml
index f4aca7bb3d..f4aca7bb3d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/en/floater_script_search.xml b/indra/newview/skins/default/xui/en/floater_script_search.xml
index ade0156bc7..ade0156bc7 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index c3e7028dc5..c3e7028dc5 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 4e89df5a73..4e89df5a73 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml
index 52de9ddd47..52de9ddd47 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index 3ed2bd7206..3ed2bd7206 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
index 9f14e9ae0a..9f14e9ae0a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
+++ b/indra/newview/skins/default/xui/en/floater_side_bar_tab.xml
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 49d64767cc..853c209bca 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -21,7 +21,11 @@
         Sending Email
     </string>
     <string
-     name="profile_progress_str">
+        name="facebook_progress_str">
+        Posting to Facebook
+    </string>
+    <string
+        name="profile_progress_str">
         Posting
     </string>
     <string
@@ -33,7 +37,11 @@
         Saving to Computer
     </string>
  	<string
- 	 name="profile_succeeded_str">
+        name="facebook_succeeded_str">
+ 	    Image uploaded
+ 	</string>
+ 	<string
+        name="profile_succeeded_str">
  	    Image uploaded
  	</string>
  	<string
@@ -49,7 +57,11 @@
  	    Saved to Computer!
  	</string>
  	<string
- 	 name="profile_failed_str">
+        name="facebook_failed_str">
+ 	    Failed to upload image to your Facebook timeline.
+ 	</string>
+ 	<string
+        name="profile_failed_str">
  	    Failed to upload image to your Profile Feed.
  	</string>
  	<string
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
new file mode 100644
index 0000000000..b7ff374d5f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="false"
+  help_topic="floater_social"
+  layout="topleft"
+  name="floater_social"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="POST TO FACEBOOK"
+  height="482"
+  width="304">
+  <panel
+   height="482"
+   width="304"
+   visible="true"
+   name="background"
+   follows="all"
+   top="0"
+   left="0">
+   <tab_container
+     name="tabs"
+     tab_group="1"
+     tab_min_width="70"
+     tab_height="30"
+     tab_position="top"
+     top="7"
+     height="437"
+     halign="center">
+     <panel
+       filename="panel_social_status.xml"
+       class="llsocialstatuspanel"
+       follows="all"
+       label="STATUS"
+       name="panel_social_status"/>
+     <panel
+       filename="panel_social_photo.xml"
+       class="llsocialphotopanel"
+       follows="all"
+       label="PHOTO"
+       name="panel_social_photo"/>
+     <panel
+       filename="panel_social_place.xml"
+       class="llsocialcheckinpanel"
+       follows="all"
+       label="CHECK IN"
+       name="panel_social_place"/>
+     <panel
+       filename="panel_social_account.xml"
+       class="llsocialaccountpanel"
+       follows="all"
+       label="ACCOUNT"
+       name="panel_social_account"/>     
+    </tab_container>
+    <panel
+     name="connection_status_panel"
+     follows="left|bottom|right"
+     height="24">
+     <text
+      name="connection_error_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left="9"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="DrYellow"
+      font="SansSerif">
+      Error
+     </text>
+     <loading_indicator
+      follows="left|bottom|right"
+      height="24"
+      width="24"
+      name="connection_loading_indicator"
+      top="2"
+      left="9"
+      visible="true"/>
+     <text
+      name="connection_loading_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left_pad="5"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="EmphasisColor"
+      font="SansSerif">
+      Loading...
+    </text>
+  </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
index dec0e9b6c6..dec0e9b6c6 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/en/floater_sound_preview.xml b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
index af791466b6..af791466b6 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
new file mode 100755
index 0000000000..76a350dd29
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ border="true"
+ can_close="true"
+ can_minimize="true"
+ save_rect="true"
+ help_topic="spelling_settings"
+ can_resize="false"
+ height="315"
+ width="490"
+ name="spellcheck_floater"
+ title="Spell Checker Settings">
+  <check_box
+   bottom_delta="30"
+   control_name="SpellCheck"
+   left_delta="15"
+   height="16"
+   width="100"
+   follows="left|top"
+   label="Enable spell checker"
+   name="spellcheck_enable" />
+  <view_border
+   top_pad="10"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor1"/>
+  <text
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="10"
+   layout="topleft"
+   left="38"
+   mouse_opaque="false"
+   name="spellcheck_main"
+   top_pad="15"
+   type="string"
+   width="90"
+  >
+    Main dictionary :
+  </text>
+  <combo_box
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   name="spellcheck_main_combo"
+   top_pad="-15"
+   width="175"
+  />
+  <text
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="10"
+   label="Logs:"
+   layout="topleft"
+   left="38"
+   mouse_opaque="false"
+   name="spellcheck_additional"
+   top_pad="15"
+   type="string"
+   width="190"
+  >
+    Additional dictionaries :
+  </text>
+  <text
+   follows="top|left"
+   height="12"
+   layout="topleft"
+   left="55"
+   length="1"
+   name="spellcheck_available"
+   top_pad="10"
+   type="string"
+   width="175">
+      Available
+  </text>
+  <text
+   follows="top|left"
+   height="12"
+   type="string"
+   left_pad="45"
+   length="1"
+   layout="topleft"
+   name="spellcheck_active"
+   width="175">
+      Active
+  </text>
+  <scroll_list
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="155"
+   layout="topleft"
+   left="55"
+   multi_select="true"
+   name="spellcheck_available_list"
+   sort_column="0"
+   sort_ascending="true" 
+   width="175" />
+  <button
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="26"
+   image_overlay="Arrow_Right"
+   hover_glow_amount="0.15"
+   layout="topleft"
+   left_pad="10"
+   name="spellcheck_moveright_btn"
+   top_delta="50"
+   width="25">
+  </button>
+  <button
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="26"
+   image_overlay="Arrow_Left"
+   hover_glow_amount="0.15"
+   layout="topleft"
+   name="spellcheck_moveleft_btn"
+   top_delta="30"
+   width="25">
+  </button>
+  <scroll_list
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="155"
+   layout="topleft"
+   left_pad="10"
+   multi_select="true"
+   name="spellcheck_active_list"
+   sort_column="0"
+   sort_ascending="true" 
+   top_pad="-105"
+   width="175"
+  />
+  <button
+   enabled="false"
+   follows="left|top"
+   height="23"
+   label="Remove"
+   layout="topleft"
+   left="55"
+   name="spellcheck_remove_btn"
+   top_pad="5"
+   width="80" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Import..."
+   layout="topleft"
+   left_pad="15"
+   name="spellcheck_import_btn"
+   top_delta="0"
+   width="80" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..b54090015d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck_import.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ border="true"
+ can_close="true"
+ can_minimize="true"
+ bottom="275"
+ left="300"
+ can_resize="false"
+ height="140"
+ width="400"
+ name="spellcheck_import"
+ title="Import Dictionary">
+  <text
+   follows="top|left"
+   height="16"
+   layout="topleft"
+   left="25"
+   top="15"
+   type="string"
+   width="65">
+   Dictionary:
+  </text>
+  <line_editor
+   enabled="false"
+   follows="left|top"
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   max_length_bytes="255"
+   name="dictionary_path"
+   top_delta="-5"
+   width="200" />
+  <button
+   follows="left|top"
+   height="23"
+   label="Browse"
+   label_selected="Browse"
+   layout="topleft"
+   left_pad="5"
+   name="dictionary_path_browse"
+   top_delta="0"
+   width="75" />
+  <text
+   follows="top|left"
+   height="16"
+   layout="topleft"
+   left="25"
+   top_pad="8"
+   type="string"
+   width="65">
+   Name:
+  </text>
+  <line_editor
+   enabled="false"
+   follows="left|top"
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   max_length_bytes="255"
+   name="dictionary_name"
+   top_delta="-5"
+   width="200" />
+  <text
+   follows="top|left"
+   height="16"
+   layout="topleft"
+   left="25"
+   top_pad="8"
+   type="string"
+   width="65">
+   Language:
+  </text>
+  <line_editor
+   follows="left|top"
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   max_length_bytes="255"
+   name="dictionary_language"
+   top_delta="-5"
+   width="200" />
+  <view_border
+   top_pad="10"
+   left="2"
+   height="0"
+   width="396"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor"/>
+  <button
+   top_pad="10"
+   right="280"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="ok_btn"
+   label="Import" />
+  <button
+   top_delta="0"
+   right="380"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="cancel_btn"
+   label="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 2fd932786b..f9eb16d224 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -149,6 +149,19 @@
 				 show_per_sec="true"
 				 show_bar="false">
 			  </stat_bar>
+       <stat_bar
+				 name="object_cache_hits"
+				 label="Object Cache Hit Rate"
+				 stat="object_cache_hits"
+				 bar_min="0"
+				 bar_max="100"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
 			</stat_view>
         <!--Texture Stats-->
 			<stat_view
@@ -156,6 +169,32 @@
 			   label="Texture"
 			   show_label="true">
 			  <stat_bar
+				 name="texture_cache_hits"
+				 label="Cache Hit Rate"
+				 stat="texture_cache_hits"
+				 bar_min="0.f"
+				 bar_max="100.f"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
+				 name="texture_cache_read_latency"
+				 label="Cache Read Latency"
+         unit_label="msec"
+				 stat="texture_cache_read_latency"
+				 bar_min="0.f"
+				 bar_max="1000.f"
+				 tick_spacing="100"
+				 label_spacing="200"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
 				 name="numimagesstat"
 				 label="Count"
 				 stat="numimagesstat" 
@@ -532,6 +571,20 @@
 			   show_bar="false"
 			   show_mean="false" >
 			</stat_bar>
+        <stat_bar
+            name="simpctscriptsrun"
+            label="Scripts Run"
+            unit_label=" %"
+            stat="simpctscriptsrun"
+            bar_min="0"
+            bar_max="100"
+            tick_spacing="10"
+            label_spacing="20"
+            precision="3"
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="true">
+        </stat_bar>
 
 			<stat_bar
 			   name="simscripteps"
@@ -548,6 +601,53 @@
 			   show_mean="false" >
 			</stat_bar>
 
+        <stat_view
+            name="simpathfinding"
+            label="Pathfinding"
+            show_label="true">
+          <stat_bar
+              name="simsimaistepmsec"
+              label="  AI Step Time"
+              stat="simsimaistepmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f"
+              tick_spacing="10.f"
+              label_spacing="20.f"
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+          <stat_bar
+              name="simsimskippedsilhouettesteps"
+              label="  Skipped Silhouette Steps"
+              stat="simsimskippedsilhouettesteps"
+              unit_label="/sec"
+              precision="0"
+              bar_min="0"
+              bar_max="45"
+              tick_spacing="4"
+              label_spacing="8"
+              show_per_sec="false"
+              show_bar="false">
+          </stat_bar>
+          <stat_bar
+              name="simsimpctsteppedcharacters"
+              label="  Characters Updated"
+              unit_label=" %"
+              stat="simsimpctsteppedcharacters"
+              bar_min="0"
+              bar_max="100"
+              tick_spacing="10"
+              label_spacing="20"
+              precision="1"
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="true">
+          </stat_bar>
+        </stat_view>
+
 			<stat_bar
 			   name="siminpps"
 			   label="Packets In"
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index ecedb27438..ecedb27438 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/en/floater_telehub.xml b/indra/newview/skins/default/xui/en/floater_telehub.xml
index 547613fb67..547613fb67 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/en/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml
index 9bc05107a2..9bc05107a2 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_button.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_button.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 95aaadfcf3..95aaadfcf3 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
index 45e2e34da7..45e2e34da7 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
index 209285da2e..209285da2e 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_inspectors.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout.xml b/indra/newview/skins/default/xui/en/floater_test_layout.xml
index 94f7e0b798..94f7e0b798 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_layout.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index a04050e7eb..a04050e7eb 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
index 2894ad2a32..2894ad2a32 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_line_editor.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_list_view.xml b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
index 32ccc31dfd..32ccc31dfd 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_list_view.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_list_view.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
index f4a50ecc96..f4a50ecc96 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
index db14ecae83..db14ecae83 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_radiogroup.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_slider.xml b/indra/newview/skins/default/xui/en/floater_test_slider.xml
index 20bd555a03..20bd555a03 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_slider.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_slider.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
index acd49aa492..acd49aa492 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
index e1fefc3631..e1fefc3631 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_editor.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
index d11373ce1d..d11373ce1d 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 1d31fbd6dc..1d31fbd6dc 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 067c1fed82..067c1fed82 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 10854f5a49..10854f5a49 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
diff --git a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
index ffb8b842f0..6021ba0a5a 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
@@ -134,6 +134,16 @@
      top_delta="-25"
      name="Pipette"
      width="28" />
+   <text
+     follows="left|bottom"
+     height="20"
+     layout="topleft"
+     left="8"
+     name="preview_disabled"
+     top="266"
+     value="Preview Disabled"
+     visible="false"
+     width="120" />
     <filter_editor
      follows="left|top|right"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..1ea256b8b3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="600"
+ layout="topleft"
+ name="TexFetchDebugger"
+ help_topic="texfetchdebugger"
+ title="Texture Fetching Debugger"
+ width="540">
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left="10"
+   name="total_num_fetched_label"
+   top="30"
+   width="400">
+    1, Total number of fetched textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_fetching_requests_label"
+   top_delta="25"
+   width="400">
+    2, Total number of fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_cache_hits_label"
+   top_delta="25"
+   width="400">
+    3, Total number of cache hits: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_label"
+   top_delta="25"
+   width="400">
+    4, Total number of visible textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_fetch_req_label"
+   top_delta="25"
+   width="450">
+    5, Total number of visible texture fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_data_label"
+   top_delta="25"
+   width="530">
+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_vis_data_label"
+   top_delta="25"
+   width="480">
+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_rendered_data_label"
+   top_delta="25"
+   width="530">
+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_read_label"
+   top_delta="25"
+   width="400">
+    9, Total time on cache readings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_write_label"
+   top_delta="25"
+   width="400">
+    10, Total time on cache writings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_decode_label"
+   top_delta="25"
+   width="400">
+    11, Total time on decodings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_gl_label"
+   top_delta="25"
+   width="400">
+    12, Total time on gl texture creation: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_http_label"
+   top_delta="25"
+   width="400">
+    13, Total time on HTTP fetching: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_fetch_label"
+   top_delta="25"
+   width="400">
+    14, Total time on entire fetching: [TIME] seconds
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_cache_label"
+  top_delta="25"
+  width="540">
+    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_all_cache_label"
+  top_delta="25"
+  width="540">
+    16, Refetching all textures from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_http_label"
+  top_delta="25"
+  width="540">
+    17, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_all_http_label"
+  top_delta="25"
+  width="540">
+    18, Refetching all textures from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <spinner
+     decimal_digits="2"
+     follows="left|top"
+     height="20"
+     increment="0.01"
+     initial_value="1.0"
+     label="19, Ratio of Texel/Pixel:"
+     label_width="130"
+     layout="topleft"
+     left_delta="0"
+     max_val="10.0"
+     min_val="0.01"
+     name="texel_pixel_ratio"
+     top_delta="30"
+     width="200">
+    <spinner.commit_callback
+		function="TexFetchDebugger.ChangeTexelPixelRatio" />
+  </spinner>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="texture_source_label"
+  top_delta="30"
+  width="110">
+    20, Texture Source:
+  </text>
+  <radio_group
+     control_name="TextureFetchSource"
+     follows="top|left"
+     draw_border="false"
+     height="25"
+     layout="topleft"
+     left_pad="0"
+     name="texture_source"
+     top_delta="0"
+     width="264">
+    <radio_item
+     height="16"
+     label="Cache + HTTP"
+     layout="topleft"
+     left="3"
+     name="0"
+     top="0"
+     width="100" />
+    <radio_item
+     height="16"
+     label="HTTP Only"
+     layout="topleft"
+     left_delta="100"
+     name="1"
+     top_delta="0"
+     width="200" />
+  </radio_group>
+  <button
+   follows="left|top"
+   height="20"
+   label="Start"
+   layout="topleft"
+   left="10"
+   name="start_btn"
+   top_delta="20"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Start" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Reset"
+   layout="topleft"
+   left_pad="7"
+   name="clear_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Clear" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Close"
+   layout="topleft"
+   left_pad="7"
+   name="close_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Close" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Read"
+   layout="topleft"
+   left="10"
+   name="cacheread_btn"
+   top_delta="20"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheRead" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Write"
+   layout="topleft"
+   left_pad="7"
+   name="cachewrite_btn"
+   top_delta="0"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheWrite" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="http_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.HTTPLoad" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Decode"
+   layout="topleft"
+   left_pad="7"
+   name="decode_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Decode" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="GL Texture"
+   layout="topleft"
+   left_pad="7"
+   name="gl_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.GLTexture" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis Cache"
+   layout="topleft"
+   left="10"
+   name="refetchviscache_btn"
+   top_delta="20"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch All Cache"
+   layout="topleft"
+   left_pad="7"
+   name="refetchallcache_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchAllCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchvishttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisHTTP" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch All HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchallhttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchAllHTTP" />
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index e37740d20c..8b9733df17 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="580"
+ height="590"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -877,6 +877,14 @@
                 You can't modify these objects
             </panel.string>
             <panel.string
+             name="text modify info 5">
+                You can't modify this object across a region boundary
+            </panel.string>
+            <panel.string
+             name="text modify info 6">
+                You can't modify these objects across a region boundary
+            </panel.string>
+            <panel.string
              name="text modify warning">
                 You must select entire object to set permissions
             </panel.string>
@@ -941,7 +949,7 @@
              left="10"
              length="1"
              follows="left|top"
-             height="19"
+             height="29"
              layout="topleft"
              name="Creator:"
              top_pad="7"
@@ -954,7 +962,7 @@
              length="1"
              follows="left|top"
              left_pad="0"
-             height="20"
+             height="29"
              layout="topleft"
              name="Creator Name"
              top_delta="0"
@@ -969,10 +977,10 @@
              length="1"
              left="10"
              follows="left|top"
-             height="19"
+             height="29"
              layout="topleft"
              name="Owner:"
-             top_pad="13"
+             top_pad="3"
              width="90">
                 Owner:
             </text>
@@ -981,7 +989,7 @@
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="29"
              layout="topleft"
              name="Owner Name"
              left_pad="0"
@@ -1000,7 +1008,7 @@
              left="10"
              height="18"
              name="Group:"
-             top_pad="17"
+             top_pad="3"
              width="75">
                 Group:
             </text>
@@ -1029,7 +1037,7 @@
              layout="topleft"
              name="checkbox share with group"
              tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             top_pad="10"
+             top_pad="5"
              left="100"
              width="87" />
             <button
@@ -1051,7 +1059,7 @@
              top_pad="10"
              left="10"
              name="label click action"
-             width="118">
+             width="82">
                 Click to:
             </text>
             <combo_box
@@ -1059,7 +1067,7 @@
              height="23"
              layout="topleft"
              name="clickaction"
-             width="148"
+             width="130"
              left_pad="10">
                 <combo_box.item
                  label="Touch  (default)"
@@ -1092,19 +1100,39 @@
              layout="topleft"
              name="checkbox for sale"
              left="7"
-             width="100" />
-<!-- NEW SALE TYPE COMBO BOX -->
+             width="97" />
+  <!-- NEW PRICE SPINNER
+Objects are allowed to be for sale for L$0 to invoke buy UI behavior
+even though the user gets a free copy.
+-->
+  <spinner
+      follows="left|top"
+      decimal_digits="0"
+      increment="1"
+      left_pad="0"
+      control_name="Edit Cost"
+      name="Edit Cost"
+      label="L$"
+      label_width="15"
+      label_text.valign="center"
+      valign="center"
+      width="85"
+      min_val="0"
+      height="20"
+      max_val="999999999" />
+  <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
-            left_pad="10"
+            left_pad="8"
             layout="topleft"
             follows="left|top"
             allow_text_entry="false"
             height="23"
+            top_pad="-23"
             initial_value="2"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
-            width="168">
+            width="89">
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -1118,31 +1146,13 @@
            label="Original"
            value="1" />
       </combo_box>
-<!-- NEW PRICE SPINNER
-Objects are allowed to be for sale for L$0 to invoke buy UI behavior
-even though the user gets a free copy.
--->
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        top_pad="8"
-        left="118"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price: L$"
-        label_width="65"
-        width="165"
-        min_val="0"
-        height="20"
-        max_val="999999999" />
       <check_box
 	   height="15"
 	   width="110"
 	   top_pad="5"
 	   label="Show in search"
        layout="topleft"
-	   left="100"
+	   left="7"
        name="search_check"
        tool_tip="Let people see this object in search results" />
 		<panel
@@ -1155,15 +1165,16 @@ even though the user gets a free copy.
          name="perms_build"
          left="0"
          top_pad="4"
-         height="105"
+         height="121"
          width="290">
             <text
              type="string"
              length="1"
              left="10"
+             word_wrap="true"
              top_pad="9"
              text_color="EmphasisColor"
-             height="16"
+             height="32"
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
@@ -1233,7 +1244,7 @@ even though the user gets a free copy.
              type="string"
              text_color="EmphasisColor"
              length="1"
-             top="9"
+             top="23"
              follows="left|top"
              layout="topleft"
              left="230"
@@ -1308,7 +1319,36 @@ even though the user gets a free copy.
                 F:
             </text>
         </panel>
-      </panel>
+		<panel
+         border="false"
+         follows="left|top"
+         layout="topleft"
+         mouse_opaque="false"
+         name="pathfinding_attrs_panel"
+         left="0"
+         top_pad="0"
+         height="25"
+         width="290">
+      <text
+         type="string"
+         follows="left|top"
+         name="pathfinding_attributes_label"
+         top_pad="4"
+         width="150"
+         left="10">
+        Pathfinding attributes:
+      </text>
+      <text
+         type="string"
+         follows="left|top"
+         text_color="EmphasisColor"
+         name="pathfinding_attributes_value"
+         width="130"
+         word_wrap="false"
+         left_pad="0">
+      </text>
+    </panel>
+  </panel>
       <!-- Object tab -->
       <panel
          border="false"
@@ -1355,8 +1395,7 @@ even though the user gets a free copy.
              tool_tip="Causes object to not collide with other objects or avatars"
              top_pad="0"
              width="123" />
-
-            <text
+        <text
              type="string"
              length="1"
              follows="left|top"
@@ -2452,534 +2491,10 @@ even though the user gets a free copy.
              width="132" />
         </panel>
          <panel
-         border="false"
-         follows="all"
-         height="367"
          label="Texture"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
          help_topic="toolbox_texture_tab"
          name="Texture"
-         top_delta="0"
-         width="295">
-            <panel.string
-             name="string repeats per meter">
-                Repeats Per Meter
-            </panel.string>
-            <panel.string
-             name="string repeats per face">
-                Repeats Per Face
-            </panel.string>
-            <texture_picker
-             can_apply_immediately="true"
-             default_image_name="Default"
-             fallback_image="locked_image.j2c"
-             follows="left|top"
-             height="80"
-             label="Texture"
-             layout="topleft"
-             left="10"
-             name="texture control"
-             tool_tip="Click to choose a picture"
-             top="8"
-             width="64" />
-            <color_swatch
-             can_apply_immediately="true"
-             follows="left|top"
-             height="80"
-             label="Color"
-             layout="topleft"
-             left_pad="15"
-             name="colorswatch"
-             tool_tip="Click to open color picker"
-             top_delta="0"
-             width="64" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="15"
-             name="color trans"
-             text_readonly_color="LabelDisabledColor"
-             top="6"
-             width="110">
-                Transparency %
-            </text>
-            <spinner
-             decimal_digits="0"
-             follows="left|top"
-             height="19"
-             increment="2"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             max_val="100"
-             name="ColorTrans"
-             top_pad="4"
-             width="80" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_delta="0"
-             name="glow label"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="8"
-             width="80">
-                Glow
-            </text>
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             layout="topleft"
-             left_delta="0"
-             name="glow"
-             top_pad="4"
-             width="80" />
-            <check_box
-             height="19"
-             label="Full Bright"
-             layout="topleft"
-             left_delta="-5"
-             name="checkbox fullbright"
-             top_pad="4"
-             width="81" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex gen"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="5"
-             width="90">
-                Mapping
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox texgen"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="Default"
-                 name="Default"
-                 value="Default" />
-                <combo_box.item
-                 label="Planar"
-                 name="Planar"
-                 value="Planar" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label shininess"
-             left_pad="4"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Shininess
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox shininess"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Low"
-                 name="Low"
-                 value="Low" />
-                <combo_box.item
-                 label="Medium"
-                 name="Medium"
-                 value="Medium" />
-                <combo_box.item
-                 label="High"
-                 name="High"
-                 value="High" />
-            </combo_box>
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left_pad="4"
-             name="label bumpiness"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="-37"
-             width="90">
-                Bumpiness
-            </text>
-            <combo_box
-             height="23"
-             layout="topleft"
-             left_delta="0"
-             name="combobox bumpiness"
-             top_pad="4"
-             width="90">
-                <combo_box.item
-                 label="None"
-                 name="None"
-                 value="None" />
-                <combo_box.item
-                 label="Brightness"
-                 name="Brightness"
-                 value="Brightness" />
-                <combo_box.item
-                 label="Darkness"
-                 name="Darkness"
-                 value="Darkness" />
-                <combo_box.item
-                 label="woodgrain"
-                 name="woodgrain"
-                 value="woodgrain" />
-                <combo_box.item
-                 label="bark"
-                 name="bark"
-                 value="bark" />
-                <combo_box.item
-                 label="bricks"
-                 name="bricks"
-                 value="bricks" />
-                <combo_box.item
-                 label="checker"
-                 name="checker"
-                 value="checker" />
-                <combo_box.item
-                 label="concrete"
-                 name="concrete"
-                 value="concrete" />
-                <combo_box.item
-                 label="crustytile"
-                 name="crustytile"
-                 value="crustytile" />
-                <combo_box.item
-                 label="cutstone"
-                 name="cutstone"
-                 value="cutstone" />
-                <combo_box.item
-                 label="discs"
-                 name="discs"
-                 value="discs" />
-                <combo_box.item
-                 label="gravel"
-                 name="gravel"
-                 value="gravel" />
-                <combo_box.item
-                 label="petridish"
-                 name="petridish"
-                 value="petridish" />
-                <combo_box.item
-                 label="siding"
-                 name="siding"
-                 value="siding" />
-                <combo_box.item
-                 label="stonetile"
-                 name="stonetile"
-                 value="stonetile" />
-                <combo_box.item
-                 label="stucco"
-                 name="stucco"
-                 value="stucco" />
-                <combo_box.item
-                 label="suction"
-                 name="suction"
-                 value="suction" />
-                <combo_box.item
-                 label="weave"
-                 name="weave"
-                 value="weave" />
-            </combo_box>
-          <!--
-            <line_editor
-             bevel_style="in"
-             border_style="line"
-             border_thickness="1"
-             follows="left|top"
-             height="16"
-             layout="topleft"
-             left="10"
-             max_length_bytes="63"
-             name="Home Url"
-             select_on_focus="true"
-             top="134"
-             width="250" />
-            <check_box
-             height="16"
-             label="Media Face"
-             layout="topleft"
-             left_delta="0"
-             name="has media"
-             top_pad="6"
-             width="70" />
-            <button
-             follows="left|top"
-             font="SansSerifSmall"
-             height="20"
-             label="Set Media Info"
-             label_selected="Set Media Info"
-             layout="topleft"
-             left_pad="60"
-             name="media info set"
-             top_delta="-4"
-             width="120" />
--->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             left="17"
-             name="checkbox planar align"
-             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="26"
-             width="140" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="rpt"
-             text_readonly_color="LabelDisabledColor"
-             top_pad="2"
-             width="140">
-                Repeats / Face
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleU"
-             top_pad="5"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip s"
-             top_delta="0"
-             width="70" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             max_val="100"
-             name="TexScaleV"
-             width="185" />
-            <check_box
-             height="19"
-             label="Flip"
-             layout="topleft"
-             left_pad="5"
-             name="checkbox flip t"
-             top_delta="0"
-             width="70" />
-            <spinner
-             decimal_digits="2"
-             follows="left|top"
-             height="19"
-             increment="1"
-             initial_value="0"
-			 label="Rotation˚"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="9999"
-             min_val="-9999"
-             name="TexRot"
-             width="195" />
-
-            <spinner
-             decimal_digits="1"
-             follows="left|top"
-             height="23"
-             initial_value="1"
-			 label="Repeats / Meter"
-             layout="topleft"
-			 label_width="135"
-             left="10"
-             max_val="10"
-             min_val="0.1"
-             name="rptctrl"
-             width="195" />
-            <button
-             follows="left|top"
-             height="23"
-             label="Apply"
-             label_selected="Apply"
-             layout="topleft"
-             left_pad="5"
-             name="button apply"
-             width="75" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             left="10"
-             name="tex offset"
-             text_readonly_color="LabelDisabledColor"
-             width="200">
-                Texture Offset
-            </text>
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Horizontal (U)"
-             label_width="125"
-             layout="topleft"
-             left="20"
-             min_val="-1"
-             name="TexOffsetU"
-             width="185" />
-            <spinner
-             follows="left|top"
-             height="19"
-             initial_value="0"
-             label="Vertical (V)"
-             label_width="125"
-             layout="topleft"
-             left_delta="0"
-             min_val="-1"
-             name="TexOffsetV"
-             top_pad="1"
-             width="185" />
-        <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="Add_Media"
-         left="0"
-         height="47"
-         width="290">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="18"
-             layout="topleft"
-             left="10"
-             top_pad="3"
-             name="media_tex"
-             width="190">
-              Media
-			</text>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="AddItem_Press"
-			 image_unselected="AddItem_Off"
-			 image_disabled="AddItem_Disabled"
-			 layout="topleft"
-			 left_pad="0"
-			 name="add_media"
-			 tab_stop="false"
-			 top_delta="0"
-			 tool_tip="Add Media"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.AddMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 height="18"
-			 image_selected="TrashItem_Press"
-			 image_unselected="TrashItem_Off"
-			 layout="topleft"
-			 left_pad="5"
-			 name="delete_media"
-			 tool_tip="Delete this media texture"
-			 top_delta="0"
-			 width="18">
-				<button.commit_callback
-				function="BuildTool.DeleteMedia"/>
-			</button>
-			<button
-			 follows="top|left"
-			 tool_tip="Edit this Media"
-			 height="12"
-             image_disabled="Icon_Gear_Background"
-             image_selected="Icon_Gear_Press"
-             image_unselected="Icon_Gear_Foreground"
-			 layout="topleft"
-			 left_pad="10"
-			 name="edit_media"
-			 top_delta="3"
-			 width="12">
-				<button.commit_callback
-				function="BuildTool.EditMedia"/>
-			</button>
-      <text
-			 follows="left|top|right"
-			 height="9"
-			 layout="topleft"
-			 left="10"
-                         use_ellipses="true"
-			 read_only="true"
-			 name="media_info"
-			 width="280" />
-      <web_browser
-        visible="false"
-        enabled="false"
-        border_visible="true"
-        bottom_delta="0"
-        follows="top|left"
-        left="0"
-        name="title_media"
-        width="4"
-        height="4"
-        start_url="about:blank"
-        decouple_texture_size="true" />
-     <button
-			 follows="right|top"
-			 height="22"
-			 label="Align"
-			 label_selected="Align Media"
-			 layout="topleft"
-			 right="-16"
-			 name="button align"
-			 top_delta="-4"
-			 tool_tip="Align media texture (must load first)"
-			 width="80" />
-		</panel>
+         filename="panel_tools_texture.xml">
 	   </panel>
        <panel
          border="false"
diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml
index 4dfdcd15c7..0b71177345 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="350"
+ height="372"
  layout="topleft"
  min_height="300"
  min_width="450"
@@ -23,10 +23,6 @@
         Time
     </floater.string>
     <floater.string
-     name="scripts_mono_time_label">
-        Mono Time
-    </floater.string>
-    <floater.string
      name="top_colliders_title">
         Top Colliders
     </floater.string>
@@ -68,31 +64,35 @@
         <scroll_list.columns
          label="Score"
          name="score"
-         width="55" />
+         width="45" />
         <scroll_list.columns
          label="Name"
          name="name"
-         width="140" />
+         width="130" />
         <scroll_list.columns
          label="Owner"
          name="owner"
-         width="105" />
+         width="100" />
         <scroll_list.columns
          label="Location"
          name="location"
-         width="130" />
+         width="120" />
+        <scroll_list.columns
+         label="Parcel"
+         name="parcel"
+         width="120" />
         <scroll_list.columns
          label="Time"
          name="time"
-         width="150" />
-        <scroll_list.columns
-         label="Mono Time"
-         name="mono_time"
-         width="100" />
+         width="130" />
           <scroll_list.columns
           	label="URLs"
           	name="URLs"
-          	width="100" />
+         width="40" />
+        <scroll_list.columns
+         label="Memory (KB)"
+         name="memory"
+         width="40" />
 		<scroll_list.commit_callback
           function="TopObjects.CommitObjectsList" />
     </scroll_list>
@@ -193,6 +193,38 @@
       <button.commit_callback
           function="TopObjects.GetByOwnerName" />
     </button>
+    <text
+     type="string"
+     length="1"
+     follows="left|bottom"
+     height="20"
+     layout="topleft"
+     left="10"
+     top_pad="5"
+     name="parcel_name_text"
+     width="107">
+        Parcel:
+    </text>
+    <line_editor
+     follows="left|bottom|right"
+     height="20"
+     layout="topleft"
+     left_pad="3"
+     name="parcel_name_editor"
+     top_delta="-3"
+     width="568" />
+    <button
+     follows="bottom|right"
+     height="23"
+     label="Filter"
+     layout="topleft"
+     left_pad="5"
+     name="filter_parcel_btn"
+     top_delta="0"
+     width="100">
+      <button.commit_callback
+          function="TopObjects.GetByParcelName" />
+    </button>
     <button
      follows="bottom|right"
      height="22"
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index af1617eb39..af1617eb39 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index d8211c24a7..d8211c24a7 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/en/floater_translation_settings.xml b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
index a212ce7889..a212ce7889 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 06d4327293..eb01294831 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -5,7 +5,7 @@
  height="640"
  layout="topleft"
  min_height="230"
- min_width="650"
+ min_width="750"
  name="gui_preview_tool"
  help_topic="gui_preview_tool"
  single_instance="true"
diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml
index 29fb29fabf..29fb29fabf 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
new file mode 100755
index 0000000000..5c71fd3bc6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE CHAT VOLUME"
+ visible="true"
+ width="245">
+	<slider
+		control_name="AudioLevelVoice"
+		disabled_control="MuteAudio"
+		follows="left|top"
+		height="16"
+		increment="0.025"
+		initial_value="0.5"
+		label="Voice Chat"
+		label_width="50"
+		layout="topleft"
+		left="15"
+		top="50"
+		name="chat_voice_volume"
+		show_text="false"
+		slider_label.halign="right"
+		volume="true"
+		width="200">
+	</slider>
+	<button
+		control_name="MuteVoice"
+		disabled_control="MuteAudio"
+		follows="top|left"
+		height="16"
+		image_selected="AudioMute_Off"
+		image_unselected="Audio_Off"
+		is_toggle="true"
+		layout="topleft"
+		left_pad="5"
+		name="mute_audio"
+		tab_stop="false"
+		width="16" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
deleted file mode 100644
index dce2720cf8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- positioning="cascading"
- can_resize="true"
- can_minimize="true"
- can_close="true"
- chrome="true"
- height="205"
- layout="topleft"
- min_height="124"
- min_width="190"
- name="floater_voice_controls"
- help_topic="floater_voice_controls"
- title="VOICE CONTROLS"
- save_dock_state="true"
- save_visibility="true"
- save_rect="true"
- single_instance="true"
- width="282">
-    <string
-     name="title_nearby">
-        VOICE SETTINGS
-    </string>
-    <string
-     name="title_group">
-        GROUP CALL WITH [GROUP]
-    </string>
-    <string
-     name="title_adhoc">
-        CONFERENCE CALL
-    </string>
-    <string
-     name="title_peer_2_peer">
-        CALL WITH [NAME]
-    </string>
-    <string
-     name="no_one_near">
-        No one near has voice enabled
-    </string>
-      <layout_stack
-         clip="false"
-         follows="all"
-         height="189"
-         layout="topleft"
-         left="10"
-         mouse_opaque="false"
-         name="my_call_stack"
-         orientation="vertical"
-         width="263">
-        <layout_panel
-         follows="top|left|right"
-         auto_resize="false"
-         layout="topleft"
-         min_height="20"
-         height="20"
-         name="my_panel">
-            <avatar_icon
-             enabled="false"
-             follows="left|top"
-             height="18"
-             default_icon_name="Generic_Person"
-             layout="topleft"
-             left="5"
-             name="user_icon"
-             top="0"
-             width="18" />
-            <text
-             follows="top|left|right"
-             font="SansSerifSmallBold"
-             height="16"
-             layout="topleft"
-             left_pad="10"
-             name="user_text"
-             text_color="White"
-             top="4"
-             use_ellipses="true"
-             value="My Avatar:"
-             width="210" />
-            <output_monitor
-             auto_update="true"
-             draw_border="false"
-             follows="top|right"
-             height="16"
-             layout="topleft"
-             right="-3"
-             name="speaking_indicator"
-             left_pad="5"
-             visible="true"
-             width="20" />
-        </layout_panel>
-        <layout_panel name="leave_call_panel" height="26" min_height="26" auto_resize="false">
-        <layout_stack
-         clip="true"
-         follows="left|top|right"
-         height="26"
-         layout="topleft"
-         mouse_opaque="false"
-         name="voice_effect_and_leave_call_stack"
-         orientation="horizontal"
-         width="262">
-          <layout_panel
-            height="26"
-            width="200">
-            <panel
-             class="panel_voice_effect"
-             name="panel_voice_effect"
-             visiblity_control="VoiceMorphingEnabled"
-             filename="panel_voice_effect.xml" />
-          </layout_panel>
-          <layout_panel
-           auto_resize="false"
-           follows="top|right"
-           height="23"
-           visible="true"
-           layout="topleft"
-           name="leave_call_btn_panel"
-           width="100">
-            <button
-             follows="right|top"
-             height="23"
-             label="Leave Call"
-             name="leave_call_btn"
-             width="100" />
-          </layout_panel>
-        </layout_stack>
-          </layout_panel>
-      <layout_panel
-          follows="all"
-          layout="topleft"
-          left="2"
-          top_pad="0"
-          height="132"
-          name="callers_panel"
-          auto_resize="true"
-          width="280">
-        <avatar_list
-         follows="all"
-         height="132"
-         ignore_online_status="true"
-         layout="topleft"
-         multi_select="true"
-         name="speakers_list"
-         width="280" />
-        <panel
-         filename="panel_avatar_list_item.xml"
-         follows="left|right|top"
-         height="24"
-         layout="topleft"
-         left="0"
-         name="non_avatar_caller"
-         top="10"
-         width="276" />
-      </layout_panel>
-    </layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 35cb2670d0..146c3d7e30 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -5,12 +5,13 @@
  height="500"
  name="voice_effects"
  help_topic="voice_effects"
- title="VOICE MORPHING"
+ title="VOICE MORPHING PREVIEW"
  background_visible="true"
  label="Places"
  layout="topleft"
  min_height="360"
  min_width="200"
+ save_rect="true"
  width="300">
   <string name="no_voice_effect">
     (No Voice Morph)
diff --git a/indra/newview/skins/default/xui/en/floater_voice_volume.xml b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
new file mode 100755
index 0000000000..9346295d5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_voice_volume.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater
+ legacy_header_height="25"
+ bevel_style="in"
+ bg_opaque_image="Inspector_Background"
+ can_close="false"
+ can_minimize="false"
+ height="90"
+ layout="topleft"
+ name="floater_voice_volume"
+ single_instance="true"
+ sound_flags="0"
+ title="VOICE VOLUME"
+ visible="true"
+ width="245">
+    <text
+     follows="top|left|right"
+     font="SansSerifSmall"
+     height="21"
+     left="10"
+     name="avatar_name"
+     parse_urls="false"
+     top="35"
+     text_color="White"
+     translate="false"
+     use_ellipses="true"
+     value="TestString PleaseIgnore"
+     width="225" />
+    <slider
+     follows="top|left"
+     height="23"
+     increment="0.01"
+     left="1"
+     max_val="0.95"
+     min_val="0.05"
+     name="volume_slider"
+     show_text="false"
+     tool_tip="Voice volume"
+     top_pad="0"
+     value="0.5"
+     width="200" />
+    <button
+     follows="top|left"
+     height="16"
+     image_disabled="Audio_Off"
+     image_disabled_selected="AudioMute_Off"
+     image_hover_selected="AudioMute_Over"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     left_pad="0"
+     top_delta="4"
+     name="mute_btn"
+     width="16" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index cea10adca8..a80440e844 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -125,10 +125,10 @@
       <icon
         name="media_secure_lock_flag"
         height="16"
-        follows="top|right"
+        follows="top|left"
         image_name="Lock2"
         layout="topleft"
-        left_delta="620"
+        left_delta="2"
         top_delta="2"
         visible="false" 
         tool_tip="Secured Browsing"
diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml
index d0225f78a9..d0225f78a9 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_web_profile.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
index 897d959b98..897d959b98 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/en/floater_window_size.xml b/indra/newview/skins/default/xui/en/floater_window_size.xml
index 115fe413f3..115fe413f3 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/en/floater_window_size.xml
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index 83407069d2..83407069d2 100644..100755
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index ebbb53729d..ebbb53729d 100644..100755
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index bc3bcd331b..ef4f19cd4c 100644..100755
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -2,14 +2,14 @@
 <!--
   Not can_close / no title to avoid window chrome
   Single instance - only have one at a time, recycle it each spawn
--->
+--> 
 <floater
  legacy_header_height="25"
  bevel_style="in"
  bg_opaque_image="Inspector_Background"
  can_close="false"
  can_minimize="false"
- height="164"
+ height="160"
  layout="topleft"
  name="inspect_avatar"
  single_instance="true"
@@ -98,13 +98,13 @@
      follows="top|left"
      height="23"
      increment="0.01"
-     left="1"
+     left="10"
      max_val="0.95"
      min_val="0.05"
      name="volume_slider"
      show_text="false"
      tool_tip="Voice volume"
-     top_pad="0"
+     top_pad="5"
      value="0.5"
      width="200" />
     <button
@@ -116,10 +116,21 @@
      image_selected="AudioMute_Off"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="0"
+     left_pad="5"
      top_delta="4"
      name="mute_btn"
      width="16" />
+    <text
+     follows="top|left"
+     height="16"
+     left="8"
+     name="avatar_profile_link"
+     font="SansSerifSmall"
+     text_color="White"
+     top_pad="5"
+     translate="false"
+     value="[[LINK] View full profile]"
+     width="175" />
     <avatar_icon
      follows="top|left"
      height="38"
@@ -130,83 +141,4 @@
      name="avatar_icon"
      top="10"
      width="38" />
-<!-- Overlapping buttons for default actions
-    llinspectavatar.cpp makes visible the most likely default action 
--->
-    <button
-     follows="top|left"
-     height="20"
-     label="Add Friend"
-     left="8"
-     top="135"
-     name="add_friend_btn"
-     width="90" />
-    <button
-     follows="top|left"
-     height="20"
-     label="IM"
-     left_delta="0"
-     top_delta="0"
-     name="im_btn"
-     width="80"
-     commit_callback.function="InspectAvatar.IM"/>
-	<button
-     follows="top|left"
-     height="20"
-     label="Profile"
-     layout="topleft"
-     name="view_profile_btn"
-     left_delta="96"
-     top_delta="0"
-     tab_stop="false"
-     width="80" />
-      <!--  gear buttons here -->
-  <menu_button
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_avatar_gear.xml"
-     name="gear_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-	<menu_button
-     follows="top|left"
-     height="20"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_self_gear.xml"
-     name="gear_self_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-  <panel 
-    follows="top|left" 
-    top="164" 
-    left="0" 
-    height="60" 
-    width="228" 
-    visible="false"
-    background_visible="true"
-    name="moderator_panel"
-    background_opaque="true" 
-    bg_opaque_color="MouseGray">
-    <button
-      name="disable_voice"
-      label="Disable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      commit_callback.function="InspectAvatar.DisableVoice"/>
-    <button
-      name="enable_voice"
-      label="Enable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      visible="false" 
-      commit_callback.function="InspectAvatar.EnableVoice"/>
-  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index 324ff3eabd..324ff3eabd 100644..100755
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index bfeb8fc470..bfeb8fc470 100644..100755
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/en/inspect_remote_object.xml b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
index e83257d2a0..e83257d2a0 100644..100755
--- a/indra/newview/skins/default/xui/en/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/en/inspect_toast.xml b/indra/newview/skins/default/xui/en/inspect_toast.xml
index 0221397a8c..0221397a8c 100644..100755
--- a/indra/newview/skins/default/xui/en/inspect_toast.xml
+++ b/indra/newview/skins/default/xui/en/inspect_toast.xml
diff --git a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
index a7ecc39ed8..a7ecc39ed8 100644..100755
--- a/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/inspector_info_ctrl.xml
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index 51779e4bfd..51779e4bfd 100644..100755
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index a87027a113..a87027a113 100644..100755
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
diff --git a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
index 5033ea9546..5033ea9546 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index b46b62ec4d..ba91b0b5d9 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
@@ -104,4 +112,50 @@
          <menu_item_call.on_enable
           function="Object.EnableInspect" />
    </menu_item_call>
+
+   <menu_item_separator />
+    
+      <menu_item_check
+        name="Normal"
+        label="Normal Rendering">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="0" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="0" />
+      </menu_item_check>
+      <menu_item_check
+        name="Always use impostor"
+        label="Always use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="1" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="1" />
+      </menu_item_check>
+      <menu_item_check
+        name="Never use impostor"
+        label="Never use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="2" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="2" />
+      </menu_item_check>
+
+  <menu_item_separator
+       layout="topleft" name="Impostor seperator"/>
+
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index b8128da358..bcbc8d5b86 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -123,6 +123,14 @@ name="Edit Outfit">
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
   <menu_item_separator
   layout="topleft" />
   <menu_item_call
@@ -135,4 +143,15 @@ name="Edit Outfit">
     <menu_item_call.on_enable
      function="Attachment.EnableDrop" />
   </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
index 50910dff32..77b9095f7c 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml
@@ -17,7 +17,7 @@
          parameter="profile" />
     </menu_item_call>
     <menu_item_call
-     label="Send IM..."
+     label="IM"
      layout="topleft"
      name="Send IM">
         <menu_item_call.on_click
@@ -25,7 +25,26 @@
          parameter="im" />
     </menu_item_call>
     <menu_item_call
-     label="Add Friend..."
+     label="Offer teleport"
+     layout="topleft"
+     name="Offer Teleport">
+        <on_click function="AvatarIcon.Action" parameter="teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="Voice Call">
+        <on_click function="AvatarIcon.Action" parameter="voice_call"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="Chat History">
+        <on_click function="AvatarIcon.Action" parameter="chat_history"/>   
+    </menu_item_call>
+    <menu_item_separator layout="topleft" name="separator_chat_history"/>
+    <menu_item_call
+     label="Add friend"
      layout="topleft"
      name="Add Friend">
         <menu_item_call.on_click
@@ -33,11 +52,56 @@
          parameter="add" />
     </menu_item_call>
     <menu_item_call
-     label="Remove Friend..."
+     label="Remove friend"
      layout="topleft"
      name="Remove Friend">
         <menu_item_call.on_click
          function="AvatarIcon.Action"
          parameter="remove" />
     </menu_item_call>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="Invite Group">
+      <on_click function="AvatarIcon.Action" parameter="invite_to_group" />   
+    </menu_item_call>
+    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>
+    <menu_item_call
+     label="Zoom In"
+     layout="topleft"
+     name="Zoom In">
+      <on_click function="AvatarIcon.Action" parameter="zoom_in" />
+    </menu_item_call>
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="Map">
+       <on_click function="AvatarIcon.Action" parameter="map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+       <on_click function="AvatarIcon.Action" parameter="share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+       <on_click function="AvatarIcon.Action" parameter="pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block Voice"
+     layout="topleft"
+     name="Block Unblock">
+       <on_click function="AvatarIcon.Action" parameter="block_unblock" />
+       <on_check function="AvatarIcon.Check" parameter="is_blocked" />
+    </menu_item_check>
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="Mute Text">
+       <on_click function="AvatarIcon.Action" parameter="mute_unmute" />
+       <on_check function="AvatarIcon.Check" parameter="is_muted" />   
+  </menu_item_check>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 276b5f106f..8bd013f14b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -39,8 +39,10 @@
       <menu_item_call.on_click
          function="Avatar.InviteToGroup" />
       </menu_item_call>
+    
    <menu_item_separator />
-    <menu_item_call
+   
+     <menu_item_call
      enabled="false"
      label="Block"
      name="Avatar Mute">
@@ -79,6 +81,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
@@ -95,4 +105,50 @@
         <menu_item_call.on_enable
          function="EnablePayAvatar" />
     </menu_item_call>
+
+   <menu_item_separator />
+    
+      <menu_item_check
+        name="Normal"
+        label="Normal Rendering">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="0" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="0" />
+      </menu_item_check>
+      <menu_item_check
+        name="Always use impostor"
+        label="Always use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="1" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="1" />
+      </menu_item_check>
+      <menu_item_check
+        name="Never use impostor"
+        label="Never use impostor">
+        <menu_item_check.on_check
+          function="Avatar.CheckImpostorMode"
+          parameter="2" />
+	    <menu_item_check.on_click
+	      function="Avatar.SetImpostorMode"
+	      parameter="2" />
+      </menu_item_check>
+
+  <menu_item_separator 
+    layout="topleft"  name="Impostor seperator"/>
+
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index d9bdfece38..ca0c9bd5e4 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,24 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
index c402100fb1..c402100fb1 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
index f0e8461360..f0e8461360 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_body_part.xml
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 206d49e8c7..206d49e8c7 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/en/menu_cof_gear.xml b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
index a6e9a40e31..45cf780557 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_cof_gear.xml
@@ -9,5 +9,5 @@
     <menu
      label="New Body Parts"
      layout="topleft"
-     name="COF.Geear.New_Body_Parts" />
+     name="COF.Gear.New_Body_Parts" />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml
new file mode 100755
index 0000000000..31b1d091ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation.xml
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ bottom="806"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_conversation_participant"
+ visible="false">
+     <menu_item_call
+     label="Close conversation"
+     layout="topleft"
+     name="close_conversation">
+        <on_click function="Avatar.DoToSelected" parameter="close_conversation"/>
+	 </menu_item_call>	 
+     <menu_item_call
+     label="Open voice conversation"
+     layout="topleft"
+     name="open_voice_conversation">
+        <on_click function="Avatar.DoToSelected" parameter="open_voice_conversation"/>
+     </menu_item_call>	
+     <menu_item_call
+     label="Disconnect from voice"
+     layout="topleft"
+     name="disconnect_from_voice">
+        <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/>
+    </menu_item_call>	
+	<menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/>	
+	<menu_item_call
+     label="Close Selected"
+     layout="topleft"
+     name="close_selected_conversations">
+        <on_click function="Avatar.DoToSelected" parameter="close_selected_conversations"/>
+	 </menu_item_call>
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="view_profile">
+        <on_click function="Avatar.DoToSelected" parameter="view_profile"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_view_profile"/>
+    </menu_item_call>
+    <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="im">
+        <on_click function="Avatar.DoToSelected" parameter="im"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_im"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Offer teleport"
+     layout="topleft"
+     name="offer_teleport">
+        <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Request teleport"
+     layout="topleft"
+     name="request_teleport">
+        <on_click function="Avatar.DoToSelected" parameter="request_teleport"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="voice_call">
+        <on_click function="Avatar.DoToSelected" parameter="voice_call"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_call" />
+    </menu_item_call>
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="chat_history">
+        <on_click function="Avatar.DoToSelected" parameter="chat_history"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_chat_history"/>
+    </menu_item_call>	
+    <menu_item_separator layout="topleft" name="separator_chat_history"/>	
+    <menu_item_call
+     label="Add friend"
+     layout="topleft"
+     name="add_friend">
+        <on_click function="Avatar.DoToSelected" parameter="add_friend"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableItem" parameter="can_delete" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Remove friends"
+     layout="topleft"
+     name="remove_friends">
+        <on_click function="Avatar.DoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableItem" parameter="can_delete" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="invite_to_group">
+        <on_click function="Avatar.DoToSelected" parameter="invite_to_group" />
+        <on_enable function="Avatar.EnableItem" parameter="can_invite" />
+    </menu_item_call>
+    <menu_item_separator layout="topleft" name="separator_invite_to_group"/>
+    <menu_item_call
+     label="Zoom In"
+     layout="topleft"
+     name="zoom_in">
+      <on_click function="Avatar.DoToSelected" parameter="zoom_in" />
+      <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" />
+    </menu_item_call>
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="map">
+        <on_click function="Avatar.DoToSelected" parameter="map" />
+        <on_enable function="Avatar.EnableItem" parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="share">
+        <on_click function="Avatar.DoToSelected" parameter="share" />
+        <on_enable function="Avatar.EnableItem" parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="pay">
+        <on_click function="Avatar.DoToSelected" parameter="pay" />
+        <on_enable function="Avatar.EnableItem" parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block Voice"
+     layout="topleft"
+     name="block_unblock">
+        <on_click function="Avatar.DoToSelected" parameter="block_unblock" />
+		<on_check function="Avatar.CheckItem" parameter="is_blocked" />
+		<on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="MuteText">
+     <on_click function="Avatar.DoToSelected" parameter="mute_unmute" />
+     <on_check function="Avatar.CheckItem" parameter="is_muted" />
+     <on_enable  function="Avatar.EnableItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_call
+     label="Group Profile"
+     layout="topleft"
+     name="group_profile">
+        <on_click function="Group.DoToSelected" parameter="group_profile"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_group_profile" />
+    </menu_item_call>	
+    <menu_item_call
+     label="Activate Group"
+     layout="topleft"
+     name="activate_group">
+        <on_click function="Group.DoToSelected" parameter="activate_group"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_activate_group" />
+    </menu_item_call>		
+    <menu_item_call
+     label="Leave Group"
+     layout="topleft"
+     name="leave_group">
+        <on_click function="Group.DoToSelected" parameter="leave_group"/>
+        <on_enable function="Avatar.EnableItem" parameter="can_leave_group" />
+    </menu_item_call>
+	<menu_item_separator layout="topleft" name="Moderator Options Separator"/>
+	<context_menu
+	 label="Moderator Options"
+	 layout="topleft"
+	 name="Moderator Options">
+		<menu_item_check
+		 label="Allow text chat"
+		 layout="topleft"
+		 name="AllowTextChat">
+			<on_check function="Avatar.CheckItem" parameter="is_allowed_text_chat" />
+			<on_click function="Avatar.DoToSelected" parameter="toggle_allow_text_chat" />
+			<on_enable function="Avatar.EnableItem" parameter="can_allow_text_chat" />
+		</menu_item_check>
+		<menu_item_separator layout="topleft" name="moderate_voice_separator" />
+		<menu_item_call
+		 label="Mute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceMuteSelected">
+			<on_click function="Avatar.DoToSelected" parameter="selected" />
+      <on_enable function="Avatar.EnableItem" parameter="can_mute" />
+      <on_visible function="Avatar.VisibleItem" parameter="show_mute" />
+    </menu_item_call>
+    <menu_item_call
+		 label="Unmute this participant"
+		 layout="topleft"
+		 name="ModerateVoiceUnMuteSelected">
+      <on_click function="Avatar.DoToSelected" parameter="selected" />
+      <on_enable function="Avatar.EnableItem" parameter="can_unmute" />
+      <on_visible function="Avatar.VisibleItem" parameter="show_unmute" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Mute everyone"
+		 layout="topleft"
+		 name="ModerateVoiceMute">
+			<on_click function="Avatar.DoToSelected" parameter="mute_all" />
+			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
+		</menu_item_call>
+		<menu_item_call
+		 label="Unmute everyone"
+		 layout="topleft"
+		 name="ModerateVoiceUnmute">
+			<on_click function="Avatar.DoToSelected" parameter="unmute_all" />
+			<on_enable function="Avatar.EnableItem" parameter="can_moderate_voice" />
+		</menu_item_call>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
new file mode 100755
index 0000000000..a1a3afbf68
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Context Menu">
+    <menu_item_call
+     label="IM..."
+     layout="topleft"
+     name="IM">
+        <on_click
+         function="Calllog.Action"
+         parameter="im" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_im" />
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call..."
+     layout="topleft"
+     name="Call">
+        <on_click
+         function="Calllog.Action"
+         parameter="call" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_call" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open chat history..."
+     layout="topleft"
+     name="Chat history">
+        <on_click
+         function="Calllog.Action"
+         parameter="chat_history" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_view_chat_history" />
+    </menu_item_call>
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <on_click
+         function="Calllog.Action"
+         parameter="view_profile" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_view_profile" />
+    </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="teleport">
+      <on_click
+       function="Calllog.Action"
+       parameter="offer_teleport"/>
+      <on_enable
+      function="Calllog.Enable"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+    label="Request Teleport"
+    name="request_teleport">
+      <on_click
+       function="Calllog.Action"
+       parameter="request_teleport"/>
+      <on_enable
+      function="Calllog.Enable"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="add_friend">
+        <on_click
+         function="Calllog.Action"
+         parameter="add_friend"/>
+        <on_visible
+         function="Calllog.Check"
+         parameter="is_not_friend" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove Friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click
+         function="Calllog.Action"
+         parameter="remove_friend"/>
+        <on_visible
+         function="Calllog.Check"
+         parameter="is_friend" />
+    </menu_item_call>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="Invite">
+        <on_click
+         function="Calllog.Action"
+         parameter="invite_to_group"/>
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_invite_to_group" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="Map">
+        <on_click
+         function="Calllog.Action"
+         parameter="show_on_map" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <on_click
+         function="Calllog.Action"
+         parameter="share" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <on_click
+         function="Calllog.Action"
+         parameter="pay" />
+        <on_enable
+         function="Calllog.Enable"
+         parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_check
+     label="Block/Unblock"
+     layout="topleft"
+     name="Block/Unblock">
+        <menu_item_check.on_click
+         function="Calllog.Action"
+         parameter="block"/>
+        <menu_item_check.on_check
+         function="Calllog.Check"
+         parameter="is_blocked" />
+        <menu_item_check.on_enable
+         function="Calllog.Enable"
+         parameter="can_block" />
+    </menu_item_check>
+
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
new file mode 100755
index 0000000000..ce65b23971
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+     name="menu_conversation_view"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by name"
+   name="sort_by_name">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_by_name"/>
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_by_name"/>
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by date"
+   name="sort_by_date">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_by_date" />
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_by_date" />
+  </menu_item_check>
+  <menu_item_separator />
+  <menu_item_check
+   label="Sort friends on top"
+   name="sort_by_friends">
+      <on_click
+       function="CallLog.Action"
+       parameter="sort_friends_on_top" />
+      <on_check
+       function="CallLog.Check"
+       parameter="sort_friends_on_top" />
+  </menu_item_check>
+  <menu_item_separator />
+  <menu_item_call
+   label="View Nearby chat history..."
+   name="view_nearby_chat_history">
+      <on_click
+       function="CallLog.Action"
+       parameter="view_nearby_chat_history" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_edit.xml b/indra/newview/skins/default/xui/en/menu_edit.xml
index 99061e089a..99061e089a 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_edit.xml
+++ b/indra/newview/skins/default/xui/en/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/en/menu_favorites.xml b/indra/newview/skins/default/xui/en/menu_favorites.xml
index be380e11e5..be380e11e5 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/en/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
index b08d21e8f4..b08d21e8f4 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/en/menu_group_plus.xml b/indra/newview/skins/default/xui/en/menu_group_plus.xml
index fce7414d80..eca9e7f3c9 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_group_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_group_plus"
+<toggleable_menu name="menu_group_plus"
      left="0" bottom="0" visible="false"
      mouse_opaque="false">
   <menu_item_call name="item_join" label="Join Group...">
@@ -8,4 +8,4 @@
   <menu_item_call name="item_new" label="New Group...">
     <menu_item_call.on_click function="People.Group.Plus.Action" userdata="new_group" />
   </menu_item_call>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
index b517fd7957..b517fd7957 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/en/menu_im_conversation.xml b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
new file mode 100755
index 0000000000..43287c6ec3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_im_conversation.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Conversation Gear Menu">
+    <menu_item_call
+     label="View Profile"
+     layout="topleft"
+     name="View Profile">
+        <on_click function="Avatar.GearDoToSelected" parameter="view_profile" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_view_profile" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend"
+     layout="topleft"
+     name="Add Friend">
+        <on_click function="Avatar.GearDoToSelected" parameter="add_friend" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_add" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove friend"
+     layout="topleft"
+     name="remove_friend">
+        <on_click function="Avatar.GearDoToSelected" parameter="remove_friend" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Offer teleport"
+     layout="topleft"
+     name="offer_teleport">
+        <on_click function="Avatar.GearDoToSelected" parameter="offer_teleport"/>
+        <on_enable function="Avatar.EnableGearItem" parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Invite to group..."
+     layout="topleft"
+     name="invite_to_group">
+        <on_click function="Avatar.GearDoToSelected" parameter="invite_to_group" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_invite" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"
+     name="View Icons Separator" />
+    <menu_item_call
+     label="Chat history..."
+     layout="topleft"
+     name="chat_history">
+        <on_click function="Avatar.GearDoToSelected" parameter="chat_history"/>
+        <on_enable function="Avatar.EnableGearItem" parameter="can_chat_history"/>
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_call
+       label="Zoom In"
+       layout="topleft"
+       name="zoom_in">
+      <on_click function="Avatar.DoToSelected" parameter="zoom_in" />
+      <on_enable function="Avatar.EnableItem" parameter="can_zoom_in" />
+    </menu_item_call>
+    <menu_item_call
+     label="Map"
+     layout="topleft"
+     name="map">
+        <on_click function="Avatar.GearDoToSelected" parameter="map" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_show_on_map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Share"
+     layout="topleft"
+     name="Share">
+        <on_click function="Avatar.GearDoToSelected" parameter="share" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_share" />
+    </menu_item_call>
+    <menu_item_call
+     label="Pay"
+     layout="topleft"
+     name="Pay">
+        <on_click function="Avatar.GearDoToSelected" parameter="pay" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_pay" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft"/>
+    <menu_item_check
+     label="Block Voice"
+     layout="topleft"
+     name="Block/Unblock">
+        <on_check function="Avatar.CheckGearItem" parameter="is_blocked" />
+        <on_click function="Avatar.GearDoToSelected" parameter="block_unblock" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_check
+     label="Block Text"
+     layout="topleft"
+     name="MuteText">
+        <on_check function="Avatar.CheckGearItem" parameter="is_muted" />
+        <on_click function="Avatar.GearDoToSelected" parameter="mute_unmute" />
+        <on_enable function="Avatar.EnableGearItem" parameter="can_block" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft"/>
+</toggleable_menu>
+
diff --git a/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
new file mode 100755
index 0000000000..b0adca0e0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_modes"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+       label="Compact view"
+       name="compact_view">
+      <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="compact_view"/>
+      <menu_item_check.on_check
+         function="IMSession.Menu.CompactExpandedModes.CheckItem"
+         parameter="compact_view"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Expanded view"
+       name="expanded_view">
+      <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="expanded_view"/>
+      <menu_item_check.on_check
+         function="IMSession.Menu.CompactExpandedModes.CheckItem"
+         parameter="expanded_view"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="IMShowTime" label="Show time">
+        <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="IMShowTime" />
+        <menu_item_check.on_check
+         function="IMSession.Menu.ShowModes.CheckItem"
+         parameter="IMShowTime" />
+        <menu_item_check.on_enable
+         function="IMSession.Menu.ShowModes.Enable"
+         parameter="IMShowTime" />
+    </menu_item_check>
+    <menu_item_check name="IMShowNamesForP2PConv" label="Show names in one-to-one conversations">
+        <menu_item_check.on_click
+         function="IMSession.Menu.Action"
+         parameter="IMShowNamesForP2PConv" />
+        <menu_item_check.on_check
+         function="IMSession.Menu.ShowModes.CheckItem"
+         parameter="IMShowNamesForP2PConv" />
+        <menu_item_check.on_enable
+         function="IMSession.Menu.ShowModes.Enable"
+         parameter="IMShowNamesForP2PConv" />    
+    </menu_item_check>      
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_im_well_button.xml b/indra/newview/skins/default/xui/en/menu_im_well_button.xml
deleted file mode 100644
index f8dfba91ff..0000000000
--- a/indra/newview/skins/default/xui/en/menu_im_well_button.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<context_menu
- layout="topleft"
- name="IM Well Button Context Menu">
-    <menu_item_call
-     label="Close All"
-     layout="topleft"
-     name="Close All">
-        <menu_item_call.on_click
-         function="IMWellChicletMenu.Action"
-         parameter="close all" />
-        <menu_item_call.on_enable
-         function="IMWellChicletMenu.EnableItem"
-         parameter="can close all" />
-    </menu_item_call>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
index eb5e31b57d..eb5e31b57d 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
index 8cbe62cfb0..8cbe62cfb0 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
index 038b8328cb..038b8328cb 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
deleted file mode 100644
index 76b188220d..0000000000
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<toggleable_menu
-         create_jump_keys="true"
-         layout="topleft"
-         mouse_opaque="false"
-         visible="false"
-         name="Gear Menu">
-  <menu_item_call
-   label="View Profile"
-   enabled="true" 
-   name="view_profile">
-    <menu_item_call.on_click
-     function="InspectAvatar.ViewProfile"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Add Friend"
-   name="add_friend">
-    <menu_item_call.on_click
-     function="InspectAvatar.AddFriend"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.Enable"/>
-  </menu_item_call>
-  <menu_item_call
-   label="IM"
-   name="im">
-    <menu_item_call.on_click
-     function="InspectAvatar.IM"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Call"
-   enabled="true"
-   name="call">
-    <menu_item_call.on_click
-     function="InspectAvatar.Call"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.EnableCall"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Teleport"
-   name="teleport">
-    <menu_item_call.on_click
-     function="InspectAvatar.Teleport"/>
-    <menu_item_call.on_enable
-     function="InspectAvatar.Gear.EnableTeleportOffer"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Invite to Group"
-   name="invite_to_group">
-    <menu_item_call.on_click
-     function="InspectAvatar.InviteToGroup"/>
-  </menu_item_call>
-  <menu_item_separator />
-  <menu_item_call
-   label="Block"
-   name="block">
-    <menu_item_call.on_click
-     function="InspectAvatar.ToggleMute"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableMute" />
-  </menu_item_call>
-  <menu_item_call
-   label="Unblock"
-   name="unblock">
-    <menu_item_call.on_click
-     function="InspectAvatar.ToggleMute"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableUnmute" />
-  </menu_item_call>
-  <menu_item_call
-   label="Report"
-   name="report">
-    <menu_item_call.on_click
-     function="InspectAvatar.Report"/>
-  </menu_item_call>  
-  <menu_item_call
-   label="Freeze"
-   name="freeze">
-    <menu_item_call.on_click
-     function="InspectAvatar.Freeze"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFreeze"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Eject"
-   name="eject">
-    <menu_item_call.on_click
-     function="InspectAvatar.Eject"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleEject"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Kick"
-   name="kick">
-    <menu_item_call.on_click
-     function="InspectAvatar.Kick"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableGod"/>
-  </menu_item_call>
-  <menu_item_call
-  label="CSR"
-  name="csr">
-    <menu_item_call.on_click
-     function="InspectAvatar.CSR" />
-    <menu_item_call.on_visible
-     function="InspectAvatar.EnableGod" />
-  </menu_item_call>
-  <menu_item_call
-   label="Debug Textures"
-   name="debug">
-    <menu_item_call.on_click
-     function="Avatar.Debug"/>
-    <menu_item_call.on_visible
-     function="IsGodCustomerService"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Find On Map"
-   name="find_on_map">
-    <menu_item_call.on_click
-     function="InspectAvatar.FindOnMap"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleFindOnMap"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Zoom In"
-   name="zoom_in">
-    <menu_item_call.on_click
-     function="InspectAvatar.ZoomIn"/>
-    <menu_item_call.on_visible
-     function="InspectAvatar.VisibleZoomIn"/>
-  </menu_item_call>  
-  <menu_item_call
-   label="Pay"
-   name="pay">
-    <menu_item_call.on_click
-     function="InspectAvatar.Pay"/>
-  </menu_item_call>
-  <menu_item_call
-   label="Share"
-   name="share">
-    <menu_item_call.on_click
-     function="InspectAvatar.Share"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
index 63e154697b..2c420aa1e3 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
@@ -57,7 +57,7 @@
    layout="topleft"
    name="take_copy">
     <menu_item_call.on_click
-     function="InspectObject.TakeFreeCopy"/>
+     function="Tools.TakeCopy"/>
     <menu_item_call.on_visible
       function="Tools.EnableTakeCopy"/>
   </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
deleted file mode 100644
index 5e7b16ed4a..0000000000
--- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
- layout="topleft"
- name="Self Pie">
-  <menu_item_call
-   label="Sit Down"
-   layout="topleft"
-   name="Sit Down Here">
-    <menu_item_call.on_click
-     function="Self.SitDown"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableSitDown" />
-  </menu_item_call>
-  <menu_item_call
-   label="Stand Up"
-   layout="topleft"
-   name="Stand Up">
-    <menu_item_call.on_click
-     function="Self.StandUp"
-     parameter="" />
-    <menu_item_call.on_enable
-     function="Self.EnableStandUp" />
-  </menu_item_call>
-  <context_menu
-   label="Take Off"
-   layout="topleft"
-   name="Take Off &gt;">
-    <context_menu
-     label="Clothes"
-     layout="topleft"
-     name="Clothes &gt;">
-      <menu_item_call
-       enabled="false"
-       label="Shirt"
-       layout="topleft"
-       name="Shirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Pants"
-       layout="topleft"
-       name="Pants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="pants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="pants" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Skirt"
-       layout="topleft"
-       name="Skirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="skirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="skirt" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Shoes"
-       layout="topleft"
-       name="Shoes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="shoes" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="shoes" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Socks"
-       layout="topleft"
-       name="Socks">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="socks" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="socks" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Jacket"
-       layout="topleft"
-       name="Jacket">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="jacket" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="jacket" />
-      </menu_item_call>
-      <menu_item_call
-       enabled="false"
-       label="Gloves"
-       layout="topleft"
-       name="Gloves">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="gloves" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="gloves" />
-      </menu_item_call>
-      <menu_item_call
-            enabled="false"
-            label="Undershirt"
-            layout="topleft"
-            name="Self Undershirt">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="undershirt" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="undershirt" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Underpants"
-        layout="topleft"
-        name="Self Underpants">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="underpants" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="underpants" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Tattoo"
-        layout="topleft"
-        name="Self Tattoo">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="tattoo" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="tattoo" />
-      </menu_item_call>
-      <menu_item_call
-        enabled="false"
-        label="Alpha"
-        layout="topleft"
-        name="Self Alpha">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="alpha" />
-        <menu_item_call.on_enable
-         function="Edit.EnableTakeOff"
-         parameter="alpha" />
-      </menu_item_call>
-      <menu_item_separator
-       layout="topleft" />
-      <menu_item_call
-       label="All Clothes"
-       layout="topleft"
-       name="All Clothes">
-        <menu_item_call.on_click
-         function="Edit.TakeOff"
-         parameter="all" />
-      </menu_item_call>
-    </context_menu>
-    <context_menu
-     label="HUD"
-     layout="topleft"
-     name="Object Detach HUD" />
-    <context_menu
-     label="Detach"
-     layout="topleft"
-     name="Object Detach" />
-    <menu_item_call
-     label="Detach All"
-     layout="topleft"
-     name="Detach All">
-      <menu_item_call.on_click
-       function="Self.RemoveAllAttachments"
-       parameter="" />
-      <menu_item_call.on_enable
-       function="Self.EnableRemoveAllAttachments" />
-    </menu_item_call>
-  </context_menu>
-  <menu_item_call
-  label="Change Outfit"
-  layout="topleft"
-  name="Chenge Outfit">
-    <menu_item_call.on_click
-     function="CustomizeAvatar" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit My Outfit"
-  layout="topleft"
-  name="Edit Outfit">
-    <menu_item_call.on_click
-     function="EditOutfit" />
-    <menu_item_call.on_enable
-     function="Edit.EnableCustomizeAvatar" />
-  </menu_item_call>
-  <menu_item_call label="Edit My Shape"
-  layout="topleft"
-  name="Edit My Shape">
-    <menu_item_call.on_click
-     function="EditShape" />
-    <menu_item_call.on_enable
-     function="Edit.EnableEditShape" />
-  </menu_item_call>
-  <menu_item_call
-    label="My Friends"
-    layout="topleft"
-    name="Friends...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="friends_panel" />
-  </menu_item_call>
-  <menu_item_call
-   label="My Groups"
-   layout="topleft"
-   name="Groups...">
-    <menu_item_call.on_click
-     function="SideTray.PanelPeopleTab"
-     parameter="groups_panel" />
-  </menu_item_call>
-  <menu_item_call
-    label="My Profile"
-    layout="topleft"
-    name="Profile...">
-    <menu_item_call.on_click
-     function="ShowAgentProfile"
-     parameter="agent" />
-  </menu_item_call>
-  <menu_item_call
-   label="Debug Textures"
-       name="Debug...">
-    <menu_item_call.on_click
-     function="Avatar.Debug" />
-    <menu_item_call.on_visible
-     function="IsGodCustomerService"/>
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
index 45a0a6635b..45a0a6635b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/en/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index b13bf5b508..512205ba43 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -537,6 +537,14 @@
      layout="topleft"
      name="Landmark Separator" />
     <menu_item_call
+    label="Copy SLurl"
+    layout="topleft"
+    name="url_copy">
+       <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="copy_slurl" />
+   </menu_item_call> 
+   <menu_item_call
      label="About Landmark"
      layout="topleft"
      name="About Landmark">
@@ -583,6 +591,14 @@
          parameter="lure" />
     </menu_item_call>
     <menu_item_call
+     label="Request Teleport..."
+     layout="topleft"
+     name="Request Teleport...">
+        <menu_item_call.on_click
+        function="Inventory.DoToSelected"
+        parameter="request_lure" />
+    </menu_item_call>
+    <menu_item_call
      label="Start Conference Chat"
      layout="topleft"
      name="Conference Chat">
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index 8bc4df6c79..afeb1bf226 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -3,7 +3,7 @@
  layout="topleft"
  left="0"
  mouse_opaque="false"
- can_tear_off="true"
+ can_tear_off="false"
  name="menu_inventory_add"
  visible="false">
             <menu
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index d2519a5aa4..d2519a5aa4 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index cc6d8ad9c1..2ad5cbbe95 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -61,4 +61,15 @@
         <menu_item_call.on_enable
          function="EnableEdit" />
     </menu_item_call>
+   <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml
index 93b6db222a..93b6db222a 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 101e104eab..52c4fb1613 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -180,7 +180,8 @@
        name="Set Logging Level"
        tear_off="true">
         <menu_item_check
-          label="Debug">
+         name="Debug"
+         label="Debug">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="0" />
@@ -189,7 +190,8 @@
            parameter="0" />
         </menu_item_check>
         <menu_item_check
-          label="Info">
+         name="Info"
+         label="Info">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="1" />
@@ -198,7 +200,8 @@
            parameter="1" />
         </menu_item_check>
         <menu_item_check
-          label="Warning">
+         name="Warning"
+         label="Warning">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="2" />
@@ -207,7 +210,8 @@
            parameter="2" />
         </menu_item_check>
         <menu_item_check
-          label="Error">
+         name="Error"
+         label="Error">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="3" />
@@ -216,7 +220,8 @@
            parameter="3" />
         </menu_item_check>
         <menu_item_check
-          label="None">
+         name="None"
+         label="None">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="4" />
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
index 960da4bd7a..960da4bd7a 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index ea263d05ce..ea263d05ce 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
index 2650903f88..2650903f88 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/en/menu_mute_particle.xml b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
new file mode 100644
index 0000000000..a4261bf39e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_mute_particle.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu
+ layout="topleft"
+ name="Mute Particle Pie">
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
+  </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index b71b866c4b..b71b866c4b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
index ff89e20ea5..ff89e20ea5 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
index 263ac40f4e..263ac40f4e 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/en/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 719509301b..52ab7da515 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -1,179 +1,210 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
- layout="topleft"
- name="Object Pie">
-   <menu_item_call
-     enabled="false"
-     label="Touch"
-     name="Object Touch">
-        <menu_item_call.on_click
-         function="Object.Touch" />
-        <menu_item_call.on_enable
-         function="Object.EnableTouch"
-         name="EnableTouch"
-         parameter="Touch" />
-   </menu_item_call>
-   <menu_item_call
-     label="Edit"
-     name="Edit...">
-        <menu_item_call.on_click
-         function="Object.Edit" />
+    layout="topleft"
+    name="Object Pie">
+  <menu_item_call
+      enabled="false"
+      label="Touch"
+      name="Object Touch">
+    <menu_item_call.on_click
+        function="Object.Touch" />
     <menu_item_call.on_enable
-         function="EnableEdit"/>
-    </menu_item_call>
-    <menu_item_call
+        function="Object.EnableTouch"
+        name="EnableTouch"
+        parameter="Touch" />
+  </menu_item_call>
+  <menu_item_call
+      label="Edit"
+      name="Edit...">
+    <menu_item_call.on_click
+        function="Object.Edit" />
+    <menu_item_call.on_enable
+        function="EnableEdit"/>
+  </menu_item_call>
+  <menu_item_call
       label="Build"
       name="Build">
-      <menu_item_call.on_click
+    <menu_item_call.on_click
         function="Object.Build" />
-        <menu_item_call.on_enable
-         function="EnableEdit"/>
-    </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Open"
-     name="Open">
-        <menu_item_call.on_click
-         function="Object.Open" />
-        <menu_item_call.on_enable
-         function="Object.EnableOpen" />
-   </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Sit Here"
-     name="Object Sit">
-        <menu_item_call.on_click
-         function="Object.SitOrStand" />
-        <menu_item_call.on_enable
-         function="Object.EnableSit" />
-   </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Stand Up"
-     name="Object Stand Up">
-        <menu_item_call.on_click
-         function="Object.SitOrStand" />
-        <menu_item_call.on_enable
-         function="Object.EnableStandUp" />
-   </menu_item_call>
-   <menu_item_call
-       label="Object Profile"
-       name="Object Inspect">
-         <menu_item_call.on_click
-          function="Object.Inspect" />
-         <menu_item_call.on_enable
-          function="Object.EnableInspect" />
-   </menu_item_call>
-  <menu_item_call
-       label="Zoom In"
-       name="Zoom In">
-    <menu_item_call.on_click
-     function="Object.ZoomIn" />
-  </menu_item_call>
-<menu_item_separator layout="topleft" />
-   <context_menu
-         label="Put On"
-         name="Put On" >
-   <menu_item_call
+    <menu_item_call.on_enable
+        function="EnableEdit"/>
+  </menu_item_call>
+  <menu_item_call
       enabled="false"
-      label="Wear"
-      name="Wear">
-            <menu_item_call.on_click
-             function="Object.AttachToAvatar" />
-            <menu_item_call.on_enable
-             function="Object.EnableWear" />
-   </menu_item_call>
-   <menu_item_call
+      label="Open"
+      name="Open">
+    <menu_item_call.on_click
+        function="Object.Open" />
+    <menu_item_call.on_enable
+        function="Object.EnableOpen" />
+  </menu_item_call>
+  <menu_item_call
       enabled="false"
-      label="Add"
-      name="Add">
-            <menu_item_call.on_click
-             function="Object.AttachAddToAvatar" />
-            <menu_item_call.on_enable
-             function="Object.EnableWear" />
-   </menu_item_call>
-   <context_menu
-         label="Attach"
-         name="Object Attach" />
-   <context_menu
-         label="Attach HUD"
-         name="Object Attach HUD" />
-   </context_menu>
-   <context_menu
-         label="Manage"
-         name="Remove">
-   <menu_item_call
-         enabled="false"
-         label="Report Abuse"
-         name="Report Abuse...">
-            <menu_item_call.on_click
-             function="Object.ReportAbuse" />
-            <menu_item_call.on_enable
-             function="Object.EnableReportAbuse" />
-   </menu_item_call>
-   <menu_item_call
-          enabled="false"
-          label="Block"
-          name="Object Mute">
-             <menu_item_call.on_click
-              function="Object.Mute" />
-             <menu_item_call.on_enable
-              function="Object.EnableMute" />
-   </menu_item_call>
-   <menu_item_call
+      label="Sit Here"
+      name="Object Sit">
+    <menu_item_call.on_click
+        function="Object.SitOrStand" />
+    <menu_item_call.on_enable
+        function="Object.EnableSit" />
+  </menu_item_call>
+  <menu_item_call
       enabled="false"
-      label="Return"
-      name="Return...">
-         <menu_item_call.on_click
-          function="Object.Return" />
-         <menu_item_call.on_enable
-          function="Object.EnableReturn" />
-     </menu_item_call>
-    </context_menu>
-   <menu_item_separator layout="topleft" />
-   <menu_item_call
-     label="Take"
-     layout="topleft"
-     name="Pie Object Take">
+      label="Stand Up"
+      name="Object Stand Up">
+    <menu_item_call.on_click
+        function="Object.SitOrStand" />
+    <menu_item_call.on_enable
+        function="Object.EnableStandUp" />
+  </menu_item_call>
+  <menu_item_call
+      label="Object Profile"
+      name="Object Inspect">
+    <menu_item_call.on_click
+        function="Object.Inspect" />
+    <menu_item_call.on_enable
+        function="Object.EnableInspect" />
+  </menu_item_call>
+  <menu_item_call
+      label="Zoom In"
+      name="Zoom In">
+    <menu_item_call.on_click
+        function="Object.ZoomIn" />
+  </menu_item_call>
+  <menu_item_call
+      label="Show in linksets"
+      name="show_in_linksets">
+    <menu_item_call.on_click
+        function="Pathfinding.Linksets.Select" />
+    <menu_item_call.on_enable
+        function="EnableSelectInPathfindingLinksets"/>
+    <menu_item_call.on_visible
+        function="EnableSelectInPathfindingLinksets"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Show in characters"
+      name="show_in_characters">
+    <menu_item_call.on_click
+        function="Pathfinding.Characters.Select" />
+    <menu_item_call.on_enable
+        function="EnableSelectInPathfindingCharacters"/>
+    <menu_item_call.on_visible
+        function="EnableSelectInPathfindingCharacters"/>
+  </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <context_menu
+      label="Put On"
+      name="Put On" >
+    <menu_item_call
+        enabled="false"
+        label="Wear"
+        name="Wear">
       <menu_item_call.on_click
-       function="Object.Take"/>
+          function="Object.AttachToAvatar" />
       <menu_item_call.on_enable
-       function="Object.VisibleTake"/>
-   </menu_item_call>
-   <menu_item_call
-   enabled="false"
-   label="Take Copy"
-   name="Take Copy">
+          function="Object.EnableWear" />
+    </menu_item_call>
+    <menu_item_call
+        enabled="false"
+        label="Add"
+        name="Add">
       <menu_item_call.on_click
-       function="Tools.TakeCopy" />
+          function="Object.AttachAddToAvatar" />
       <menu_item_call.on_enable
-       function="Tools.EnableTakeCopy" />
-  </menu_item_call>
-   <menu_item_call
-   enabled="false"
-   label="Pay"
-   name="Pay...">
-  <menu_item_call.on_click
-   function="PayObject" />
-  <menu_item_call.on_enable
-   function="EnablePayObject" />
-</menu_item_call>
-  <menu_item_call
-   enabled="false"
-   label="Buy"
-   name="Buy...">
+          function="Object.EnableWear" />
+    </menu_item_call>
+    <context_menu
+        label="Attach"
+        name="Object Attach" />
+    <context_menu
+        label="Attach HUD"
+        name="Object Attach HUD" />
+  </context_menu>
+  <context_menu
+      label="Manage"
+      name="Remove">
+    <menu_item_call
+        enabled="false"
+        label="Report Abuse"
+        name="Report Abuse...">
       <menu_item_call.on_click
-       function="Object.Buy" />
+          function="Object.ReportAbuse" />
       <menu_item_call.on_enable
-       function="Object.EnableBuy" />
-   </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Delete"
-     name="Delete">
+          function="Object.EnableReportAbuse" />
+    </menu_item_call>
+    <menu_item_call
+        enabled="false"
+        label="Block"
+        name="Object Mute">
       <menu_item_call.on_click
-       function="Object.Delete" />
+          function="Object.Mute" />
       <menu_item_call.on_enable
-       function="Object.EnableDelete" />
+          function="Object.EnableMute" />
+    </menu_item_call>
+    <menu_item_call
+        enabled="false"
+        label="Return"
+        name="Return...">
+      <menu_item_call.on_click
+          function="Object.Return" />
+      <menu_item_call.on_enable
+          function="Object.EnableReturn" />
+    </menu_item_call>
+  </context_menu>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call
+      label="Take"
+      layout="topleft"
+      name="Pie Object Take">
+    <menu_item_call.on_click
+        function="Object.Take"/>
+    <menu_item_call.on_enable
+        function="Object.VisibleTake"/>
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Take Copy"
+      name="Take Copy">
+    <menu_item_call.on_click
+        function="Tools.TakeCopy" />
+    <menu_item_call.on_enable
+        function="Tools.EnableTakeCopy" />
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Pay"
+      name="Pay...">
+    <menu_item_call.on_click
+        function="PayObject" />
+    <menu_item_call.on_enable
+        function="EnablePayObject" />
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Buy"
+      name="Buy...">
+    <menu_item_call.on_click
+        function="Object.Buy" />
+    <menu_item_call.on_enable
+        function="Object.EnableBuy" />
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Delete"
+      name="Delete">
+    <menu_item_call.on_click
+        function="Object.Delete" />
+    <menu_item_call.on_enable
+        function="Object.EnableDelete" />
+  </menu_item_call>
+  <menu_item_separator
+       layout="topleft" />
+  <menu_item_call
+     enabled="false"
+     label="Block Particle Owner"
+     name="Mute Particle">
+    <menu_item_call.on_click
+     function="Particle.Mute" />
+    <menu_item_call.on_enable
+     function="EnableMuteParticle" />
   </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index 0c8a2af002..2d4f1792c2 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -24,4 +24,22 @@
          function="ObjectIcon.Action"
          parameter="block" />
     </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Show on Map"
+     layout="topleft"
+     name="show_on_map">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action" 
+         parameter="map" />
+    </menu_item_call>
+    <menu_item_call
+     label="Teleport to Object Location"
+     layout="topleft"
+     name="teleport_to_object">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="teleport" />
+    </menu_item_call>
 </menu>
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 fc7272b904..3b8ace6308 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_gear.xml
@@ -195,6 +195,20 @@
 
     <menu_item_separator name="sepatator2" />
     <menu_item_call
+     label="Expand all folders"
+     layout="topleft"
+     name="expand">
+        <on_click
+         function="Gear.Expand" />
+    </menu_item_call>
+    <menu_item_call
+     label="Collapse all folders"
+     layout="topleft"
+     name="collapse">
+        <on_click
+         function="Gear.Collapse" />
+    </menu_item_call>
+    <menu_item_call
      label="Rename Outfit"
      layout="topleft"
      name="rename">
diff --git a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
index 8c8bb29baf..8c8bb29baf 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 2c32d9d303..2c32d9d303 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
new file mode 100755
index 0000000000..7ea87ee05c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="participant_manu_view">
+    <menu_item_check
+     label="Sort conversations by type"
+     layout="topleft"
+     name="sort_sessions_by_type">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_type" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_type" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort conversations by name"
+     layout="topleft"
+     name="sort_sessions_by_name">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_name" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort conversations by recent activity"
+     layout="topleft"
+     name="sort_sessions_by_recent">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_sessions_by_recent" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_sessions_by_recent" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_check
+     label="Sort participants by name"
+     layout="topleft"
+     name="sort_participants_by_name">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_name" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_name" />
+    </menu_item_check>
+    <menu_item_check
+     label="Sort participants by recent activity"
+     layout="topleft"
+     name="sort_participants_by_recent">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="sort_participants_by_recent" />
+        <on_check
+         function="IMFloaterContainer.Check"
+         parameter="sort_participants_by_recent" />
+    </menu_item_check>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+         label="Chat preferences..."
+         name="chat_preferences">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="chat_preferences" />
+      </menu_item_call>
+    <menu_item_call
+         label="Privacy preferences..."
+         name="privacy_preferences">
+        <on_click
+         function="IMFloaterContainer.Action"
+         parameter="privacy_preferences" />
+    </menu_item_call>
+    <menu_item_check
+         label="Conversation log..."
+         name="Conversation"
+         visible="true">
+        <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="conversation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="conversation" />
+        <menu_item_check.on_enable
+         function="Avatar.EnableItem"
+         parameter="conversation_log" />
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="Translate_chat" label="Translate Nearby chat">
+        <menu_item_check.on_click
+         function="IMFloaterContainer.Action" 
+         parameter="Translating.Toggle" />
+        <menu_item_check.on_check
+         function="IMFloaterContainer.Check" 
+         parameter="Translating.On" />
+        <menu_item_check.on_enable
+         function="IMFloaterContainer.Check" 
+         parameter="Translating.Enabled" />
+    </menu_item_check>
+    <menu_item_check name="Translation_settings" label="Translation settings...">
+    <menu_item_check.on_check
+         function="Floater.Visible"
+         parameter="prefs_translation" />
+        <menu_item_check.on_click
+         function="Floater.Toggle"
+         parameter="prefs_translation" />
+    </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
new file mode 100755
index 0000000000..63295ea27b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_gear"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Unblock"
+   name="unblock">
+      <on_click
+       function="Block.Action"
+       parameter="unblock_item" />
+      <on_enable
+       function="Block.Enable"
+       parameter="unblock_item" /> 
+  </menu_item_call>
+  <menu_item_call
+   label="Profile..."
+   name="profile">
+      <on_click
+       function="Block.Action"
+       parameter="profile_item"/>
+      <on_enable
+       function="Block.Enable"
+       parameter="profile_item" />
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
new file mode 100755
index 0000000000..0c7155667e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_call
+   label="Block Resident by name..."
+   name="block_resident_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="block_res_by_name"/>
+  </menu_item_call>
+  <menu_item_call
+   label="Block object by name"
+   name="block_object_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="block_obj_by_name"/>
+  </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
new file mode 100755
index 0000000000..2efb70ee37
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_blocked_view.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_blocked_view"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Sort by name"
+   name="sort_by_name">
+      <on_click
+       function="Block.Action"
+       parameter="sort_by_name"/>
+      <on_check
+       function="Block.Check"
+       parameter="sort_by_name"/>
+  </menu_item_check>
+  <menu_item_check
+   label="Sort by type"
+   name="sort_by_type">
+      <on_click
+       function="Block.Action"
+       parameter="sort_by_type" />
+      <on_check
+       function="Block.Check"
+       parameter="sort_by_type" />
+  </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
index b452f96e7a..8790fde7c5 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view.xml
@@ -40,8 +40,14 @@
      function="CheckControl"
      parameter="FriendsListShowPermissions" />
   </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" />
-  </menu_item_call>
+  <menu_item_check name="view_conversation" label="View Conversation Log...">
+    <menu_item_check.on_check
+     function="Floater.Visible"
+     parameter="conversation" />
+    <menu_item_check.on_enable
+     function="Conversation.IsConversationLoggingAllowed" />
+    <menu_item_check.on_click
+     function="Floater.Toggle"
+     parameter="conversation" />
+  </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups.xml b/indra/newview/skins/default/xui/en/menu_people_groups.xml
index 8f89d37dbb..1e0364b84e 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="menu_group_plus"
+<toggleable_menu name="menu_group_plus"
  left="0" bottom="0" visible="false"
  mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
   <menu_item_call
+   label="Activate"
+   name="Activate">
+    <menu_item_call.on_click
+     function="People.Groups.Action"
+     parameter="activate" />
+    <menu_item_call.on_enable
+     function="People.Groups.Enable"
+     parameter="activate" />
+  </menu_item_call>
+  <menu_item_call
    label="View Info"
    name="View Info">
     <menu_item_call.on_click
@@ -23,7 +33,7 @@
      parameter="chat" />
   </menu_item_call>
   <menu_item_call
-   label="Call"
+   label="Voice call"
    name="Call">
     <menu_item_call.on_click
      function="People.Groups.Action"
@@ -34,17 +44,6 @@
   </menu_item_call>
   <menu_item_separator />
   <menu_item_call
-   label="Activate"
-   name="Activate">
-    <menu_item_call.on_click
-     function="People.Groups.Action"
-     parameter="activate" />
-    <menu_item_call.on_enable
-     function="People.Groups.Enable"
-     parameter="activate" />
-  </menu_item_call>
-  <menu_item_separator />
-  <menu_item_call
    label="Leave"
    name="Leave">
     <menu_item_call.on_click
@@ -54,4 +53,4 @@
      function="People.Groups.Enable"
      parameter="leave" />
   </menu_item_call>
-</menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
index c710fe3b9b..73f79f1e70 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view.xml
@@ -14,13 +14,4 @@
        function="CheckControl"
        parameter="GroupListShowIcons" />
   </menu_item_check>
-  <menu_item_call
-   label="Leave Selected Group"
-   layout="topleft"
-   name="Leave Selected Group">
-      <menu_item_call.on_click
-       function="People.Group.Minus.Action"/>
-      <menu_item_call.on_enable
-       function="People.Group.Minus.Enable"/>
-  </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index d2e35e4cc0..f12226ebeb 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -1,28 +1,78 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
  layout="topleft"
- name="Avatar Context Menu">
+ name="Nearby People Context Menu">
     <menu_item_call
      label="View Profile"
      layout="topleft"
-     name="View Profile">
+     name="view_profile">
         <menu_item_call.on_click
          function="Avatar.Profile" />
     </menu_item_call>
     <menu_item_call
+     label="IM"
+     layout="topleft"
+     name="im">
+        <menu_item_call.on_click
+         function="Avatar.IM" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_im"/> 
+    </menu_item_call>
+    <menu_item_call
+    label="Offer Teleport"
+    name="offer_teleport">
+      <menu_item_call.on_click
+       function="Avatar.OfferTeleport"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+    label="Request Teleport"
+    name="request_teleport">
+      <menu_item_call.on_click
+       function="Avatar.TeleportRequest"/>
+      <menu_item_call.on_enable
+      function="Avatar.EnableItem"
+      parameter="can_offer_teleport"/>
+    </menu_item_call>
+    <menu_item_call
+     label="Voice call"
+     layout="topleft"
+     name="voice_call">
+        <menu_item_call.on_click
+         function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_call" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call
+     label="View chat history..."
+     layout="topleft"
+     name="chat_history">
+        <menu_item_call.on_click
+         function="Avatar.Calllog" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_callog"/>
+    </menu_item_call>
+    <menu_item_separator name="separator_chat_history"/>
+    <menu_item_call
      label="Add Friend"
      layout="topleft"
-     name="Add Friend">
+     name="add_friend">
         <menu_item_call.on_click
          function="Avatar.AddFriend" />
-        <menu_item_call.on_enable
+        <menu_item_call.on_visible
          function="Avatar.EnableItem"
          parameter="can_add" />
     </menu_item_call>
     <menu_item_call
      label="Remove Friend"
      layout="topleft"
-     name="Remove Friend">
+     name="remove_friend">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
         <menu_item_call.on_enable
@@ -30,26 +80,30 @@
          parameter="can_delete" />
     </menu_item_call>
     <menu_item_call
-     label="IM"
+     label="Invite to group..."
      layout="topleft"
-     name="IM">
+     name="invite_to_group">
         <menu_item_call.on_click
-         function="Avatar.IM" />
+         function="Avatar.InviteToGroup" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_invite"/>
     </menu_item_call>
+    <menu_item_separator name="separator_invite_to_group"/>
     <menu_item_call
-     label="Call"
+     label="Zoom In"
      layout="topleft"
-     name="Call">
-        <menu_item_call.on_click
-         function="Avatar.Call" />
-        <menu_item_call.on_enable
-         function="Avatar.EnableItem"
-         parameter="can_call" />
+     name="zoom_in">
+      <menu_item_call.on_click
+       function="Avatar.ZoomIn" />
+      <menu_item_call.on_enable
+       function="Avatar.EnableItem"
+       parameter="can_zoom_in"/>
     </menu_item_call>
     <menu_item_call
      label="Map"
      layout="topleft"
-     name="Map">
+     name="map">
         <menu_item_call.on_click
          function="Avatar.ShowOnMap" />
         <menu_item_call.on_enable
@@ -59,21 +113,27 @@
     <menu_item_call
      label="Share"
      layout="topleft"
-     name="Share">
+     name="share">
         <menu_item_call.on_click
          function="Avatar.Share" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_share"/>
     </menu_item_call>
     <menu_item_call
      label="Pay"
      layout="topleft"
-     name="Pay">
+     name="pay">
         <menu_item_call.on_click
          function="Avatar.Pay" />
+        <menu_item_call.on_enable
+      	 function="Avatar.EnableItem"
+         parameter="can_pay"/> 
     </menu_item_call>
     <menu_item_check
      label="Block/Unblock"
      layout="topleft"
-     name="Block/Unblock">
+     name="block_unblock">
         <menu_item_check.on_click
          function="Avatar.BlockUnblock" />
         <menu_item_check.on_check
@@ -83,13 +143,4 @@
          function="Avatar.EnableItem"
          parameter="can_block" />
     </menu_item_check>
-    <menu_item_call
-    label="Offer Teleport"
-    name="teleport">
-      <menu_item_call.on_click
-       function="Avatar.OfferTeleport"/>
-      <menu_item_call.on_enable
-      function="Avatar.EnableItem"
-      parameter="can_offer_teleport"/>
-    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index 5d58a9d289..5f973088fd 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -6,7 +6,7 @@
      enabled="false"
      label="Add Friends"
      layout="topleft"
-     name="Add Friends">
+     name="add_friends">
         <on_click
          function="Avatar.AddFriends" />
         <on_enable
@@ -16,7 +16,7 @@
     <menu_item_call
      label="Remove Friends"
      layout="topleft"
-     name="Remove Friend">
+     name="remove_friends">
         <menu_item_call.on_click
          function="Avatar.RemoveFriend" />
         <menu_item_call.on_enable
@@ -26,7 +26,7 @@
     <menu_item_call
      label="IM"
      layout="topleft"
-     name="IM">
+     name="im">
         <on_click
          function="Avatar.IM" />
     </menu_item_call>
@@ -34,7 +34,7 @@
      enabled="false"
      label="Call"
      layout="topleft"
-     name="Call">
+     name="call">
         <on_click
          function="Avatar.Call" />
         <on_enable
@@ -45,7 +45,7 @@
      enabled="false"
      label="Share"
      layout="topleft"
-     name="Share">
+     name="share">
         <on_click
          function="Avatar.Share" />
     </menu_item_call>
@@ -53,13 +53,13 @@
      enabled="false"
      label="Pay"
      layout="topleft"
-     name="Pay">
+     name="pay">
         <on_click
          function="Avatar.Pay" />
     </menu_item_call>
     <menu_item_call
     label="Offer Teleport"
-    name="teleport">
+    name="offer_teleport">
       <menu_item_call.on_click
        function="Avatar.OfferTeleport"/>
       <menu_item_call.on_enable
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
new file mode 100755
index 0000000000..da88ca9f4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ name="menu_group_plus"
+ left="0" bottom="0" visible="false"
+ mouse_opaque="false">
+    <menu_item_check
+       label="Sort by Recent Speakers"
+       name="sort_by_recent_speakers">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+       parameter="sort_by_recent_speakers"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_by_recent_speakers"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Sort by Name"
+       name="sort_name">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="sort_name"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_name"/>
+    </menu_item_check>
+    <menu_item_check
+       label="Sort by Distance"
+       name="sort_distance">
+      <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="sort_distance"/>
+      <menu_item_check.on_check
+         function="People.Nearby.ViewSort.CheckItem"
+         parameter="sort_distance"/>
+    </menu_item_check>
+    <menu_item_separator layout="topleft" />
+    <menu_item_check name="view_icons" label="View People Icons">
+        <menu_item_check.on_click
+         function="People.Nearby.ViewSort.Action"
+         parameter="view_icons" />
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="NearbyListShowIcons" />
+    </menu_item_check>
+    <menu_item_check name ="view_map" label="View Map">
+        <menu_item_check.on_check
+         function="CheckControl"
+         parameter="NearbyListShowMap" />
+        <menu_item_check.on_click
+         function="ToggleControl"
+         parameter="NearbyListShowMap" />
+    </menu_item_check>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
deleted file mode 100644
index 614dd693c5..0000000000
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<toggleable_menu
-     name="menu_group_plus"
-     left="0" bottom="0" visible="false"
-     mouse_opaque="false">
-  <menu_item_check
-     label="Sort by Recent Speakers"
-     name="sort_by_recent_speakers">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_by_recent_speakers"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_by_recent_speakers"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Name"
-     name="sort_name">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_name"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_name"/>
-  </menu_item_check>
-  <menu_item_check
-     label="Sort by Distance"
-     name="sort_distance">
-    <menu_item_check.on_click
-       function="People.Nearby.ViewSort.Action"
-       parameter="sort_distance"/>
-    <menu_item_check.on_check
-       function="People.Nearby.ViewSort.CheckItem"
-       parameter="sort_distance"/>
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_check name="view_icons" label="View People Icons">
-    <menu_item_check.on_click
-     function="People.Nearby.ViewSort.Action"
-     parameter="view_icons" />
-    <menu_item_check.on_check
-     function="CheckControl"
-     parameter="NearbyListShowIcons" />
-  </menu_item_check>
-  <menu_item_check name ="view_map" label="View Map">
-    <menu_item_check.on_check
-      function="CheckControl"
-      parameter="NearbyListShowMap" />
-    <menu_item_check.on_click
-      function="ToggleControl"
-      parameter="NearbyListShowMap" />
-  </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
index 485a5a658c..1dbc90dd2b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view.xml
@@ -32,8 +32,4 @@
      function="CheckControl"
      parameter="RecentListShowIcons" />
   </menu_item_check>
-  <menu_item_separator layout="topleft" />
-  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" />
-  </menu_item_call>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_picks.xml b/indra/newview/skins/default/xui/en/menu_picks.xml
index ebb49c9004..ebb49c9004 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_picks.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/en/menu_picks_plus.xml b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
index f3b207e36c..f3b207e36c 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/en/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/en/menu_place.xml b/indra/newview/skins/default/xui/en/menu_place.xml
index 288811d2f6..288811d2f6 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_place.xml
+++ b/indra/newview/skins/default/xui/en/menu_place.xml
diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
index e3a39a1242..e3a39a1242 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
index 1aeb166e01..1aeb166e01 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index ff5fdd3795..ff5fdd3795 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index b0b7b554b0..b0b7b554b0 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
index 6285bf7417..6285bf7417 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
index db29d9cebc..db29d9cebc 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/en/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/en/menu_slurl.xml b/indra/newview/skins/default/xui/en/menu_slurl.xml
index ee37d49946..ee37d49946 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/en/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
index bc7d4fe33b..bc7d4fe33b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index 0160d52b17..0160d52b17 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
index ecc1d8a954..ecc1d8a954 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml
index fe8489166b..70b40dd89b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml
@@ -2,6 +2,85 @@
 <context_menu
  name="Text editor context menu">
   <menu_item_call
+   label="(unknown)"
+   layout="topleft"
+   name="Suggestion 1">
+    <menu_item_call.on_click
+     function="SpellCheck.ReplaceWithSuggestion"
+     parameter="0" />
+    <menu_item_call.on_visible
+     function="SpellCheck.VisibleSuggestion"
+     parameter="0" />
+  </menu_item_call>
+  <menu_item_call
+   label="(unknown)"
+   layout="topleft"
+   name="Suggestion 2">
+    <menu_item_call.on_click
+     function="SpellCheck.ReplaceWithSuggestion"
+     parameter="1" />
+    <menu_item_call.on_visible
+     function="SpellCheck.VisibleSuggestion"
+     parameter="1" />
+  </menu_item_call>
+  <menu_item_call
+   label="(unknown)"
+   layout="topleft"
+   name="Suggestion 3">
+    <menu_item_call.on_click
+     function="SpellCheck.ReplaceWithSuggestion"
+     parameter="2" />
+    <menu_item_call.on_visible
+     function="SpellCheck.VisibleSuggestion"
+     parameter="2" />
+  </menu_item_call>
+  <menu_item_call
+   label="(unknown)"
+   layout="topleft"
+   name="Suggestion 4">
+    <menu_item_call.on_click
+     function="SpellCheck.ReplaceWithSuggestion"
+     parameter="3" />
+    <menu_item_call.on_visible
+     function="SpellCheck.VisibleSuggestion"
+     parameter="3" />
+  </menu_item_call>
+  <menu_item_call
+   label="(unknown)"
+   layout="topleft"
+   name="Suggestion 5">
+    <menu_item_call.on_click
+     function="SpellCheck.ReplaceWithSuggestion"
+     parameter="4" />
+    <menu_item_call.on_visible
+     function="SpellCheck.VisibleSuggestion"
+     parameter="4" />
+  </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="Suggestion Separator" />
+  <menu_item_call
+   label="Add to Dictionary"
+   layout="topleft"
+   name="Add to Dictionary">
+    <menu_item_call.on_click
+     function="SpellCheck.AddToDictionary" />
+    <menu_item_call.on_enable
+     function="SpellCheck.EnableAddToDictionary" />
+  </menu_item_call>
+  <menu_item_call
+   label="Add to Ignore"
+   layout="topleft"
+   name="Add to Ignore">
+    <menu_item_call.on_click
+     function="SpellCheck.AddToIgnore" />
+    <menu_item_call.on_enable
+     function="SpellCheck.EnableAddToIgnore" />
+  </menu_item_call>
+  <menu_item_separator
+   layout="topleft"
+   name="Spellcheck Separator" />
+  <menu_item_call
    label="Cut"
    layout="topleft"
    name="Cut">
diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml
index fbe40a7244..fbe40a7244 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/en/menu_topinfobar.xml b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
index cbe249ed4d..cbe249ed4d 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/en/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
index 73f0fa7979..e8b6116026 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -1,14 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
  layout="topleft"
- name="Url Popup">
+ name="Url Popup">  
     <menu_item_call
-     label="Show Resident Profile"
+     label="View Profile"
      layout="topleft"
      name="show_agent">
         <menu_item_call.on_click
-         function="Url.ShowProfile" />
+         function="Url.ShowProfile" />         
     </menu_item_call>
+    <menu_item_call
+     label="Send IM..."
+     layout="topleft"
+     name="send_im">
+        <menu_item_call.on_click
+         function="Url.SendIM" />        
+    </menu_item_call>
+    <menu_item_call
+     label="Add Friend..."
+     layout="topleft"
+     name="add_friend">
+        <menu_item_call.on_click
+         function="Url.AddFriend" />
+    </menu_item_call>
+    <menu_item_call
+     label="Remove Friend..."
+     layout="topleft"
+     name="remove_friend">
+        <menu_item_call.on_click
+         function="Url.RemoveFriend" />
+        </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
index 2cb125ce09..2cb125ce09 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml
index 7a4b1e619b..7a4b1e619b 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_inventory.xml b/indra/newview/skins/default/xui/en/menu_url_inventory.xml
index cf9d1d5881..cf9d1d5881 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_map.xml b/indra/newview/skins/default/xui/en/menu_url_map.xml
index 2ca9e3b3fe..2ca9e3b3fe 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
index 35c2269b0d..b9d003b841 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -3,12 +3,19 @@
  layout="topleft"
  name="Url Popup">
     <menu_item_call
-     label="Show Object Information"
+     label="Object Profile..."
      layout="topleft"
      name="show_object">
         <menu_item_call.on_click
          function="Url.Execute" />
     </menu_item_call>
+    <menu_item_call
+     label="Block..."
+     layout="topleft"
+     name="block_object">
+        <menu_item_call.on_click
+         function="Url.Block" />
+    </menu_item_call>
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
index f477c310fb..f477c310fb 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
index 6d1060b633..6d1060b633 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
index 98abc206a5..98abc206a5 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
index 289e32bcf4..289e32bcf4 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c660ef13ae..554c7c95e4 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -16,6 +16,14 @@
          parameter="agent" />
       </menu_item_call>
       <menu_item_call
+        label="Post to Facebook..."
+        name="PostToFacebook">
+        <menu_item_call.on_click
+          function="Floater.Toggle"
+          parameter="social"/>
+      </menu_item_call>      
+      <menu_item_separator/>
+      <menu_item_call
        label="Appearance..."
        name="ChangeOutfit">
         <menu_item_call.on_click
@@ -93,7 +101,7 @@
         <menu_item_check
          label="Fly"
          name="Fly"
-         shortcut="Home">
+         shortcut="HOME">
           <menu_item_check.on_check
            function="Agent.getFlying" />
           <menu_item_check.on_click
@@ -101,6 +109,15 @@
           <menu_item_check.on_enable
            function="Agent.enableFlying" />
         </menu_item_check>
+        <menu_item_call
+         label="Stop flying"
+         name="Stop flying"
+         shortcut="HOME">
+          <menu_item_call.on_click
+           function="Agent.toggleFlying" />
+          <menu_item_call.on_enable
+           function="Agent.getFlying" />
+        </menu_item_call>	
         <menu_item_check
          label="Always Run"
          name="Always Run"
@@ -130,19 +147,24 @@
        label="Status"
        name="Status"
        tear_off="true">
-        <menu_item_call
-         label="Away"
-         name="Set Away">
-          <menu_item_call.on_click
+        <menu_item_check
+         name="Away"
+         label="Away">
+          <menu_item_check.on_check
+           function="View.Status.CheckAway" />
+          <menu_item_check.on_click
            function="World.SetAway" />
-        </menu_item_call>
-        <menu_item_call
-         label="Busy"
-         name="Set Busy">
-          <menu_item_call.on_click
-           function="World.SetBusy"/>
-        </menu_item_call>
-      </menu>
+        </menu_item_check>
+        <menu_item_check
+         name="Do Not Disturb"
+         label="Do Not Disturb">
+          <menu_item_check.on_check
+           function="View.Status.CheckDoNotDisturb" />
+          <menu_item_check.on_click
+           function="World.SetDoNotDisturb"/>
+        </menu_item_check>
+      
+    </menu>
 
       <menu_item_separator/>
 
@@ -175,13 +197,12 @@
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
-             function="Floater.Show"
+             function="Floater.Toggle"
              parameter="preferences" />
         </menu_item_call>
          <menu_item_call
          label="Toolbar buttons..."
-         name="Toolbars"
-         shortcut="control|T">
+         name="Toolbars">
             <menu_item_call.on_click
              function="Floater.Toggle"
              parameter="toybox" />
@@ -193,6 +214,15 @@
            <menu_item_call.on_click
             function="View.ToggleUI" />
          </menu_item_call>
+         <menu_item_check
+         label="Show HUD Attachments"
+         name="Show HUD Attachments"
+         shortcut="alt|shift|H">
+           <menu_item_check.on_check
+            function="View.CheckHUDAttachments" />
+            <menu_item_check.on_click
+             function="View.ShowHUDAttachments" />
+         </menu_item_check>
 
         <menu_item_separator/>
 
@@ -209,17 +239,28 @@
      label="Communicate"
      name="Communicate"
      tear_off="true">
-        <menu_item_check
-         label="Chat..."
+       <menu_item_check
+         label="Conversations..."
+         name="Conversations"
+         shortcut="control|T">
+            <menu_item_check.on_check
+             function="Floater.IsOpen"
+             parameter="im_container" />
+            <menu_item_check.on_click
+             function="Floater.ToggleOrBringToFront"
+             parameter="im_container" />
+	</menu_item_check>
+	<menu_item_check
+         label="Nearby Chat..."
          name="Nearby Chat"
          shortcut="control|H"
          use_mac_ctrl="true">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="chat_bar" />
+             parameter="nearby_chat" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="chat_bar" />
+             function="Floater.ToggleOrBringToFront"
+             parameter="nearby_chat" />
         </menu_item_check>
         <menu_item_check
          label="Speak"
@@ -235,26 +276,48 @@
              parameter="speak" />
         </menu_item_check>
         <menu_item_check
-         label="Voice settings..."
-         name="Nearby Voice">
+         name="Conversation Log..."
+         label="Conversation Log...">
             <menu_item_check.on_check
              function="Floater.Visible"
-             parameter="voice_controls" />
+             parameter="conversation" />
+            <menu_item_check.on_enable
+             function="Conversation.IsConversationLoggingAllowed" />
             <menu_item_check.on_click
              function="Floater.Toggle"
-             parameter="voice_controls" />
+             parameter="conversation" />
         </menu_item_check>
-        <menu_item_check
-         label="Voice morphing..."
-         name="ShowVoice"
+        <menu_item_separator/>
+        <menu
+         label="Voice morphing"
+         name="VoiceMorphing"
          visibility_control="VoiceMorphingEnabled">
-            <menu_item_check.on_check
-             function="Floater.Visible"
-             parameter="voice_effect" />
-            <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="voice_effect" />
-        </menu_item_check>
+            <menu_item_check
+             label="No voice morphing"
+             name="NoVoiceMorphing">
+                <menu_item_check.on_check
+                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" />
+                <menu_item_check.on_click
+                 function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" />
+            </menu_item_check>
+            <menu_item_separator/>
+            <menu_item_check
+             label="Preview..."
+             name="Preview">
+                <menu_item_check.on_check
+                 function="Floater.Visible"
+                 parameter="voice_effect" />
+                <menu_item_check.on_click
+                 function="Floater.Toggle"
+                 parameter="voice_effect" />
+            </menu_item_check>
+            <menu_item_call
+             label="Subscribe..."
+             name="Subscribe">
+                <menu_item_call.on_click
+                 function="Communicate.VoiceMorphing.Subscribe" />
+            </menu_item_call>
+        </menu>
         <menu_item_check
          label="Gestures..."
          name="Gestures"
@@ -267,30 +330,56 @@
              parameter="gestures" />
         </menu_item_check>
         <menu_item_separator/>
-        <menu_item_call
+        <menu_item_check
          label="Friends"
          name="My Friends"
          shortcut="control|shift|F">
-            <menu_item_call.on_click
+            <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="friends_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="friends_panel" />
-            </menu_item_call>
-        <menu_item_call
+            </menu_item_check>
+        <menu_item_check
          label="Groups"
          name="My Groups"
          shortcut="control|shift|G">
-            <menu_item_call.on_click
+         	<menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="groups_panel" />
+            <menu_item_check.on_click
              function="SideTray.PanelPeopleTab"
              parameter="groups_panel" />
-        </menu_item_call>
-        <menu_item_call
+        </menu_item_check>
+        <menu_item_check
          label="Nearby people"
          name="Active Speakers"
          shortcut="control|shift|A">
-            <menu_item_call.on_click
+        	 <menu_item_check.on_check
+             function="SideTray.CheckPanelPeopleTab"
+             parameter="nearby_panel" />
+            <menu_item_check.on_click
               function="SideTray.PanelPeopleTab"
               parameter="nearby_panel" />
+        </menu_item_check>
+        <menu_item_call
+         label="Block List"
+         name="Block List">
+            <menu_item_call.on_click
+              function="SideTray.PanelPeopleTab"
+              parameter="blocked_panel" />
         </menu_item_call>
+      <menu_item_separator/>
+      <menu_item_check
+       name="Do Not Disturb"
+       label="Do Not Disturb">
+        <menu_item_check.on_check
+         function="View.Status.CheckDoNotDisturb" />
+        <menu_item_check.on_click
+         function="World.SetDoNotDisturb"/>
+      </menu_item_check>
+
     </menu>
     <menu
      create_jump_keys="true"
@@ -802,6 +891,15 @@
                  function="Tools.EnableSelectNextPart" />
             </menu_item_call>
         </menu>
+        <menu_item_call
+            label="Linksets..."
+            name="pathfinding_linkset_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
+        </menu_item_call> 
         <menu_item_separator/>
 
         <menu_item_call
@@ -824,7 +922,7 @@
           <menu_item_call.on_enable
              function="Tools.SomethingSelectedNoHUD" />
         </menu_item_call>
-
+		 
         <menu_item_separator/>
 
         <menu
@@ -861,14 +959,6 @@
                function="Tools.EnableTakeCopy" />
           </menu_item_call>
           <menu_item_call
-			 label="Save Back to My Inventory"
-			 name="Save Object Back to My Inventory">
-			<menu_item_call.on_click
-               function="Tools.SaveToInventory" />
-			<menu_item_call.on_enable
-               function="Tools.EnableSaveToInventory" />
-          </menu_item_call>
-          <menu_item_call
 			 label="Save Back to Object Contents"
 			 name="Save Object Back to Object Contents">
 			<menu_item_call.on_click
@@ -937,7 +1027,50 @@
           </menu_item_call>
         </menu>
 
-        <menu_item_separator/>
+      <menu
+         create_jump_keys="true"
+         label="Pathfinding"
+         name="Pathfinding"
+         tear_off="true">
+        <menu_item_call
+            label="Linksets..."
+            name="pathfinding_linksets_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
+        </menu_item_call>
+        <menu_item_call
+            label="Characters..."
+            name="pathfinding_characters_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_characters" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
+        </menu_item_call>
+        <menu_item_call
+            label="View / test..."
+            name="pathfinding_console_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_console" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfindingView" />
+        </menu_item_call>
+        <menu_item_call
+            label="Rebake region"
+            name="pathfinding_rebake_navmesh_item">
+          <menu_item_call.on_click
+              function="Tools.DoPathfindingRebakeRegion"/>
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfindingRebakeRegion" />
+        </menu_item_call>
+      </menu>
+
+
+      <menu_item_separator/>
 
         <menu
          create_jump_keys="true"
@@ -1165,19 +1298,19 @@
      tear_off="true">
         <menu_item_call
          label="How to..."
-         name="How To">
+         name="How To"
+         shortcut="F1">
             <menu_item_call.on_click
              function="Help.ToggleHowTo"
              parameter="" />
         </menu_item_call>
         <menu_item_call
-         label="[SECOND_LIFE] Help"
-         name="Second Life Help"
-         shortcut="F1">
-            <menu_item_call.on_click
-             function="ShowHelp"
-             parameter="f1_help" />
-        </menu_item_call>
+           label="Quickstart"
+           name="Quickstart">
+        <menu_item_call.on_click
+            function="Advanced.ShowURL"
+            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
+        </menu_item_call>              
 <!--        <menu_item_call
          label="Tutorial"
          name="Tutorial">
@@ -1185,7 +1318,50 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>-->
-
+		<menu_item_separator/>
+      <menu_item_call
+           label="Knowledge Base"
+           name="Knowledge Base">
+        <menu_item_call.on_click
+            function="Advanced.ShowURL"
+            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+      </menu_item_call>
+        <menu_item_call
+             label="Wiki"
+             name="Wiki">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://wiki.secondlife.com"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Community Forums"
+             name="Community Forums">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/>
+        </menu_item_call>         
+        <menu_item_call
+             label="Support portal"
+             name="Support portal">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="https://support.secondlife.com/"/>         
+        </menu_item_call>
+        <menu_item_separator/>
+        <menu_item_call
+             label="[SECOND_LIFE] News"
+             name="Second Life News">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>  
+        </menu_item_call>
+        <menu_item_call
+             label="[SECOND_LIFE] Blogs"
+             name="Second Life Blogs">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
+        </menu_item_call>
         <menu_item_separator/>
 
         <menu_item_call
@@ -1367,15 +1543,6 @@
                  function="View.HighlightTransparent" />
             </menu_item_check>
             <menu_item_check
-             label="Show HUD Attachments"
-             name="Show HUD Attachments"
-             shortcut="alt|shift|H">
-                <menu_item_check.on_check
-                 function="View.CheckHUDAttachments" />
-                <menu_item_check.on_click
-                 function="View.ShowHUDAttachments" />
-            </menu_item_check>
-            <menu_item_check
              label="Show Mouselook Crosshairs"
              name="ShowCrosshairs">
                 <menu_item_check.on_check
@@ -1869,7 +2036,7 @@
                 <menu_item_check.on_click
                  function="Advanced.ToggleConsole"
                  parameter="texture" />
-            </menu_item_check>
+            </menu_item_check>            
             <menu_item_check
              label="Debug Console"
              name="Debug Console"
@@ -1891,28 +2058,6 @@
                parameter="notifications_console" />
             </menu_item_call>
             <menu_item_check
-               label="Texture Size Console"
-               name="Texture Size"
-               shortcut="control|shift|6">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="texture size" />
-              <menu_item_check.on_click
-               function="Advanced.ToggleConsole"
-               parameter="texture size" />
-            </menu_item_check>
-            <menu_item_check
-               label="Texture Category Console"
-               name="Texture Category"
-               shortcut="control|shift|7">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="texture category" />
-              <menu_item_check.on_click
-               function="Advanced.ToggleConsole"
-               parameter="texture category" />
-            </menu_item_check>
-            <menu_item_check
              label="Fast Timers"
              name="Fast Timers"
              shortcut="control|shift|9"
@@ -1946,7 +2091,20 @@
                function="Advanced.ToggleConsole"
                parameter="scene view" />
             </menu_item_check>
-
+            <menu_item_call
+              enabled="false"
+              visible="false"
+              label="Texture Fetch Debug Console"
+              name="Texture Fetch Debug Console">
+              <menu_item_call.on_click
+                function="Floater.Show"
+                parameter="tex_fetch_debugger" />
+              <on_enable
+                function="Develop.SetTexFetchDebugger" />
+              <on_visible
+                function="Develop.SetTexFetchDebugger" />
+            </menu_item_call>
+          
             <menu_item_separator/>
 
             <menu_item_call
@@ -2050,6 +2208,16 @@
                  function="ToggleControl"
                  parameter="DebugShowRenderInfo" />
             </menu_item_check>
+            <menu_item_check
+             label="Show Avatar Render Info"
+             name="Show Avatar Render Info">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="DebugShowAvatarRenderInfo" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="DebugShowAvatarRenderInfo" />
+            </menu_item_check>
 			  <menu_item_check
              label="Show Texture Info"
              name="Show Texture Info">
@@ -2216,6 +2384,12 @@
                 <menu_item_check.on_click
                  function="Advanced.ToggleFrameTest" />
             </menu_item_check>
+          <menu_item_call
+             label="Frame Profile"
+             name="Frame Profile">
+            <menu_item_call.on_click
+             function="Advanced.ClickRenderProfile" />
+          </menu_item_call>
         </menu>
       <menu
         create_jump_keys="true"
@@ -2432,6 +2606,52 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="sculpt" />
 		</menu_item_check>
+       <menu
+         create_jump_keys="true"
+         label="Texture Density"
+         name="Texture Density"
+         tear_off="true">
+          <menu_item_check
+           label="None"
+           name="None">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="none" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="none" />
+          </menu_item_check>
+          <menu_item_check
+           label="Current"
+           name="Current">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="current" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="current" />
+          </menu_item_check>
+          <menu_item_check
+           label="Desired"
+           name="Desired">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="desired" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="desired" />
+          </menu_item_check>
+          <menu_item_check
+           label="Full"
+           name="Full">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="full" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="full" />
+          </menu_item_check>
+        </menu>
       </menu>
         <menu
          create_jump_keys="true"
@@ -2465,6 +2685,13 @@
                 <menu_item_call.on_click
                  function="Advanced.SelectedTextureInfo" />
             </menu_item_call>
+            <menu_item_call
+             label="Selected Material Info"
+             name="Selected Material Info"
+             shortcut="control|alt|shift|M">
+                <menu_item_call.on_click
+                 function="Advanced.SelectedMaterialInfo" />
+            </menu_item_call>
             <menu_item_check
              label="Wireframe"
              name="Wireframe"
@@ -2491,8 +2718,8 @@
           <menu_item_separator />
 
           <menu_item_check
-                       label="Lighting and Shadows"
-                       name="Lighting and Shadows">
+                       label="Advanced Lighting Model"
+                       name="Advanced Lighting Model">
             <menu_item_check.on_check
              function="CheckControl"
              parameter="RenderDeferred" />
@@ -2599,26 +2826,6 @@
                  parameter="TextureLoadFullRes" />
             </menu_item_check>
             <menu_item_check
-               label="Audit Textures"
-               name="Audit Textures">
-              <menu_item_check.on_check
-               function="CheckControl"
-               parameter="AuditTexture" />
-              <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="AuditTexture" />
-            </menu_item_check>
-            <menu_item_check
-             label="Texture Atlas (experimental)"
-             name="Texture Atlas">
-              <menu_item_check.on_check
-               function="CheckControl"
-               parameter="EnableTextureAtlas" />
-              <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="EnableTextureAtlas" />
-            </menu_item_check>
-              <menu_item_check
              label="Render Attached Lights"
              name="Render Attached Lights">
                 <menu_item_check.on_check
@@ -2733,6 +2940,34 @@
          label="Recorder"
          name="Recorder"
          tear_off="true">
+            <menu_item_call visible="false"
+             label="Start event recording"
+             name="Start event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="start recording" />
+            </menu_item_call>
+            <menu_item_call visible="false"
+             label="Stop event recording"
+             name="Stop event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="stop recording" />
+            </menu_item_call>
+            <menu_item_call visible="false"
+             label="Playback event recording"
+             name="Playback event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="start playback" />
+            </menu_item_call>
+
             <menu_item_call
              label="Start Playback"
              name="Start Playback">
@@ -2835,6 +3070,13 @@
              parameter="http://google.com"/>
           </menu_item_call>
           <menu_item_call
+           label="FB Connect Test"
+           name="FB Connect Test">
+            <menu_item_call.on_click
+             function="Advanced.WebContentTest"
+             parameter="https://cryptic-ridge-1632.herokuapp.com/"/>
+          </menu_item_call>
+          <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
@@ -2872,13 +3114,6 @@
                 <menu_item_call.on_click
                  function="Advanced.PrintAgentInfo" />
             </menu_item_call>
-            <menu_item_call
-             label="Memory Stats"
-             name="Memory Stats"
-             shortcut="control|alt|shift|M">
-                <menu_item_call.on_click
-                 function="Advanced.PrintTextureMemoryStats" />
-            </menu_item_call>
             <menu_item_check
              label="Region Debug Console"
              name="Region Debug Console"
@@ -3091,12 +3326,6 @@
                     <menu_item_call.on_click
                      function="Advanced.TestFemale" />
                 </menu_item_call>
-                <menu_item_call
-                 label="Toggle PG"
-                 name="Toggle PG">
-                    <menu_item_call.on_click
-                     function="Advanced.TogglePG" />
-                </menu_item_call>
                 <menu_item_check
                  label="Allow Select Avatar"
                  name="Allow Select Avatar">
@@ -3108,6 +3337,40 @@
                      parameter="AllowSelectAvatar" />
                 </menu_item_check>
             </menu>
+            <menu
+             create_jump_keys="true"
+             label="Animation Speed"
+             name="Animation Speed"
+             tear_off="true">
+                <menu_item_call
+                 label="All Animations 10% Faster"
+                 name="All Animations 10 Faster">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimTenFaster" />
+                </menu_item_call>
+                <menu_item_call
+                 label="All Animations 10% Slower"
+                 name="All Animations 10 Slower">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimTenSlower" />
+                </menu_item_call>
+                <menu_item_call
+                 label="Reset All Animation Speed"
+                 name="Reset All Animation Speed">
+                    <menu_item_call.on_click
+                     function="Advanced.AnimResetAll" />
+                </menu_item_call>
+				<menu_item_check
+				 label="Slow Motion Animations"
+				 name="Slow Motion Animations">
+					<menu_item_check.on_check
+					 function="CheckControl"
+					 parameter="SlowMotionAnimation" />
+					<menu_item_check.on_click
+					 function="ToggleControl"
+					 parameter="SlowMotionAnimation" />
+				</menu_item_check>
+            </menu>
             <menu_item_call
              label="Force Params to Default"
              name="Force Params to Default">
@@ -3125,16 +3388,6 @@
                  parameter="" />
             </menu_item_check>
             <menu_item_check
-             label="Slow Motion Animations"
-             name="Slow Motion Animations">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="SlowMotionAnimation" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="SlowMotionAnimation" />
-            </menu_item_check>
-            <menu_item_check
              label="Show Look At"
              name="Show Look At">
                 <menu_item_check.on_check
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 aa56b4ba63..aa56b4ba63 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
index 0e858ccf10..0e858ccf10 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
index 2d54e69601..2d54e69601 100644..100755
--- a/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/en/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index a585069faa..a585069faa 100644..100755
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index e95b371d00..e95b371d00 100644..100755
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 7931e55c0a..7931e55c0a 100644..100755
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/en/notification_visibility.xml b/indra/newview/skins/default/xui/en/notification_visibility.xml
index db292100d7..db292100d7 100644..100755
--- a/indra/newview/skins/default/xui/en/notification_visibility.xml
+++ b/indra/newview/skins/default/xui/en/notification_visibility.xml
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a46cce996b..1ab665edd4 100644..100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -77,6 +77,21 @@
     </form>
   </template>
 
+  <template name="okhelpignore">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK_okhelpignore"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="Help_okhelpignore"
+       text="$helptext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
   <template name="yesnocancelbuttons">
     <form>
       <button
@@ -337,7 +352,7 @@ Save all changes to clothing/body parts?
    icon="alertmodal.tga"
    name="FriendsAndGroupsOnly"
    type="alertmodal">
-    Non-friends won't know that you've choosen to ignore their calls and instant messages.
+    Non-friends won't know that you've chosen to ignore their calls and instant messages.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -491,6 +506,33 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
+  
+  <notification
+    icon="alertmodal.tga"
+    name="EjectGroupMemberWarning"
+    type="alertmodal">
+     You are about to eject [AVATAR_NAME] from the group.
+     <tag>group</tag>
+     <tag>confirm</tag>
+     <usetemplate
+      ignoretext="Confirm ejecting a participant from group"
+      name="okcancelignore"
+      notext="Cancel"
+      yestext="Eject"/>
+  </notification>
+  <notification
+    icon="alertmodal.tga"
+    name="EjectGroupMembersWarning"
+    type="alertmodal">
+     You are about to eject [COUNT] members from the group.
+     <tag>group</tag>
+     <tag>confirm</tag>
+     <usetemplate
+      ignoretext="Confirm ejecting multiple members from group"
+      name="okcancelignore"
+      notext="Cancel"
+      yestext="Eject"/>
+  </notification>
 
   <notification
    icon="alertmodal.tga"
@@ -881,8 +923,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 	option="0"
 	name="url"
 	target = "_external">
-
-			http://join.secondlife.com/
+		[create_account_url]
     </url>
     <usetemplate
      name="okcancelbuttons"
@@ -898,7 +939,22 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again.
   </notification>
   
-
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidGrid"
+   type="alertmodal">
+   <tag>fail</tag>
+'[GRID]' is not a valid grid identifier.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidLocationSLURL"
+   type="alertmodal">
+   <tag>fail</tag>
+Your start location did not specify a valid grid.
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="DeleteClassified"
@@ -1190,7 +1246,7 @@ There was a problem saving a compiled script due to the following reason: [REASO
    icon="alertmodal.tga"
    name="StartRegionEmpty"
    type="alertmodal">
-Oops, Your Start Region is not defined.
+Your Start Region is not defined.
 Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location.
 <tag>fail</tag>
     <usetemplate
@@ -1245,6 +1301,64 @@ Visit [_URL] for more information?
 
   <notification
    icon="alertmodal.tga"
+   name="IntelOldDriver"
+   type="alertmodal">
+     There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://www.intel.com/p/en_US/support/detect/graphics
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AMDOldDriver"
+   type="alertmodal">
+    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://support.amd.com/us/Pages/AMDSupportHub.aspx
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="NVIDIAOldDriver"
+ type="alertmodal">
+    There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://www.nvidia.com/Download/index.aspx?lang=en-us
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
+
+  <notification
+   icon="alertmodal.tga"
    name="UnknownGPU"
    type="alertmodal">
 Your system contains a graphics card that [APP_NAME] doesn't recognize.
@@ -1482,6 +1596,14 @@ Please make sure none are locked, and that you own all of them.
 
   <notification
    icon="alertmodal.tga"
+   name="CannotLinkPermanent"
+   type="alertmodal">
+    Objects cannot be linked across region boundaries.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="CannotLinkDifferentOwners"
    type="alertmodal">
 Unable to link because not all of the objects have the same owner.
@@ -2340,6 +2462,93 @@ Would you be my friend?
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   label="Add Auto-Replace List"
+   name="AddAutoReplaceList"
+   type="alertmodal">
+    <tag>addlist</tag>
+    Name for the new list:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="listname" type="text"/>
+      <button
+       default="true"
+       index="0"
+       name="SetName"
+       text="OK"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Rename Auto-Replace List"
+   name="RenameAutoReplaceList"
+   type="alertmodal">
+    The name '[DUPNAME]' is in use
+    Enter a new unique name:
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="listname" type="text"/>
+      <button
+       default="false"
+       index="0"
+       name="ReplaceList"
+       text="Replace Current List"/>
+      <button
+       default="true"
+       index="1"
+       name="SetName"
+       text="Use New Name"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidAutoReplaceEntry"
+   type="alertmodal">
+    The keyword must be a single word, and the replacement may not be empty.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidAutoReplaceList"
+   type="alertmodal">
+    That replacement list is not valid.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpellingDictImportRequired"
+   type="alertmodal">
+    You must specify a file, a name, and a language.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpellingDictIsSecondary"
+   type="alertmodal">
+The dictionary [DIC_NAME] does not appear to have an "aff" file; this means that it is a "secondary" dictionary.
+It can be used as an additional dictionary, but not as your Main dictionary.
+
+See https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+    <tag>confirm</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpellingDictImportFailed"
+   type="alertmodal">
+    Unable to copy
+    [FROM_NAME]
+    to
+    [TO_NAME]
+    <tag>fail</tag>
+  </notification>
+
+  <notification
  icon="alertmodal.tga"
  label="Save Outfit"
  name="SaveOutfitAs"
@@ -2500,7 +2709,7 @@ Please enter a higher price.
    icon="alertmodal.tga"
    name="ConfirmItemDeleteHasLinks"
    type="alertmodal">
-At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
+At least one of the items has links that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2542,7 +2751,7 @@ Are you sure you want to delete these items?
    icon="alertmodal.tga"
    name="ConfirmObjectDeleteNoOwn"
    type="alertmodal">
-You do not own least one of the items you have selected.
+You do not own at least one of the items you have selected.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2572,7 +2781,7 @@ Are you sure you want to delete these items?
    name="ConfirmObjectDeleteLockNoOwn"
    type="alertmodal">
 At least one object is locked.
-You do not own least one object.
+You do not own at least one object.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2587,7 +2796,7 @@ Are you sure you want to delete these items?
    name="ConfirmObjectDeleteNoCopyNoOwn"
    type="alertmodal">
 At least one object is not copyable.
-You do not own least one object.
+You do not own at least one object.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
@@ -2603,13 +2812,13 @@ Are you sure you want to delete these items?
    type="alertmodal">
 At least one object is locked.
 At least one object is not copyable.
-You do not own least one object.
+You do not own at least one object.
 
 Are you sure you want to delete these items?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
-     notext="cancel"
+     notext="Cancel"
      yestext="OK"/>
   </notification>
 
@@ -2750,7 +2959,7 @@ You have been moved into a nearby region.
    name="AvatarMovedLast"
    type="alertmodal">
    <tag>fail</tag>
-Your last location is not currently available.
+Your requested location is not currently available.
 You have been moved into a nearby region.
   </notification>
 
@@ -2785,12 +2994,11 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
 [APP_NAME] installation is complete.
 
 If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [http://join.secondlife.com secondlife.com] to create a new account?
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
      notext="Continue"
-     yestext="New Account..."/>
+     yestext="Create Account..."/>
   </notification>
 
   <notification
@@ -2904,6 +3112,7 @@ Would you like to trust this authority?
    icon="alertmodal.tga"
    name="GrantedModifyRights"
    persist="true"
+   log_to_im="true"   
    type="notify">
 [NAME] has given you permission to edit their objects.
   </notification>
@@ -2912,6 +3121,7 @@ Would you like to trust this authority?
    icon="alertmodal.tga"
    name="RevokedModifyRights"
    persist="true"
+   log_to_im="true"   
    type="notify">
 Your privilege to modify [NAME]&apos;s objects has been revoked
   </notification>
@@ -3271,7 +3481,7 @@ or you can install it now.
    name="DownloadBackgroundTip"
    type="notify">
 We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+Version [VERSION] [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
@@ -3283,8 +3493,8 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
  icon="alertmodal.tga"
  name="DownloadBackgroundDialog"
  type="alertmodal">
-We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+    We have downloaded an update to your [APP_NAME] installation.
+    Version [VERSION] [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
@@ -3297,7 +3507,7 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
  name="RequiredUpdateDownloadedVerboseDialog"
  type="alertmodal">
 We have downloaded a required software update.
-Version [VERSION]
+Version [VERSION] [[INFO_URL] Information about this update]
 
 We must restart [APP_NAME] to install the update.
     <tag>confirm</tag>
@@ -3311,6 +3521,66 @@ We must restart [APP_NAME] to install the update.
  name="RequiredUpdateDownloadedDialog"
  type="alertmodal">
 We must restart [APP_NAME] to install the update.
+[[INFO_URL] Information about this update]
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OtherChannelDownloadBackgroundTip"
+   type="notify">
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION] 
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] for details about this update]
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="OtherChannelDownloadBackgroundDialog"
+ type="alertmodal">
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION]
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] Information about this update]
+    <tag>confirm</tag>
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
+  </notification>
+  
+  <notification
+ icon="alertmodal.tga"
+ name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
+ type="alertmodal">
+We have downloaded a required software update.
+Version [VERSION]
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] Information about this update]
+
+We must restart [APP_NAME] to install the update.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
+  <notification
+ icon="alertmodal.tga"
+ name="OtherChannelRequiredUpdateDownloadedDialog"
+ type="alertmodal">
+We must restart [APP_NAME] to install the update.
+This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
+see [[INFO_URL] Information about this update]
     <tag>confirm</tag>
     <usetemplate
      name="okbutton"
@@ -3466,6 +3736,17 @@ Leave Group?
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="OwnerCannotLeaveGroup"
+   type="alertmodal">
+    Unable to leave group. You cannot leave the group because you are the last owner of the group. Please assign another member to the owner role first.
+    <tag>group</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
    icon="alert.tga"
    name="ConfirmKick"
    type="alert">
@@ -3545,12 +3826,15 @@ Cannot offer friendship at this time. Please try again in a moment.
 
   <notification
    icon="alert.tga"
-   name="BusyModeSet"
+   name="DoNotDisturbModeSet"
    type="alert">
-Busy mode is set.
-Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
+Do Not Disturb is on.  You will not be notified of incoming communications.
+
+- Other residents will receive your Do Not Disturb response (set in Preferences &gt; General).
+- Teleportation offers will be declined.
+- Voice calls will be rejected.
     <usetemplate
-     ignoretext="I change my status to Busy mode"
+     ignoretext="I change my status to Do Not Disturb mode"
      name="okignore"
      yestext="OK"/>
   </notification>
@@ -3787,6 +4071,27 @@ Join me in [REGION]
 
   <notification
    icon="alertmodal.tga"
+   name="TeleportRequestPrompt"
+   type="alertmodal">
+Request a teleport to [NAME] with the following message
+    <tag>confirm</tag>
+    <form name="form">
+      <input name="message" type="text">
+
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+  <notification
+   icon="alertmodal.tga"
    name="TooManyTeleportOffers"
    type="alertmodal">
 You attempted to make [OFFERS] teleport offers
@@ -4070,9 +4375,7 @@ Are you sure you want to change the Estate Covenant?
    name="RegionEntryAccessBlocked"
    type="alertmodal">
    <tag>fail</tag>
-You are not allowed in that Region due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+    The region you're trying to visit contains content exceeding your current preferences.  You can change your preferences using Me &gt; Preferences &gt; General.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -4080,13 +4383,11 @@ Please verify you have the latest Viewer installed, and go to the Knowledge Base
 
   <notification
    icon="alertmodal.tga"
-   name="RegionEntryAccessBlocked_KB"
+   name="RegionEntryAccessBlocked_AdultsOnlyContent"
    type="alertmodal">
    <tag>fail</tag>
     <tag>confirm</tag>
-You are not allowed in that region due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
+    The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
     <url option="0" name="url">
 		http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
     </url>
@@ -4094,55 +4395,172 @@ Go to the Knowledge Base for more information about maturity Ratings?
      name="okcancelignore"
      yestext="Go to Knowledge Base"
 	 notext="Close"
-	 ignoretext="I can&apos;t enter this Region, due to restrictions of the maturity Rating"/>
+	 ignoretext="Region crossing: The region you&apos;re trying to visit contains content which is accessible to adults only."/>
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="RegionEntryAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
    <tag>fail</tag>
-You are not allowed in that region due to your maturity Rating.
+The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="RegionEntryAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
+   type="notifytip">
+    <tag>fail</tag>
+    The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="RegionEntryAccessBlocked_Change"
    type="alertmodal">
-   <tag>fail</tag>
+    <tag>fail</tag>
     <tag>confirm</tag>
-You are not allowed in that Region due to your maturity Rating preference.
-
-To enter the desired region, please change your maturity Rating preference. This will allow you to search for and access [REGIONMATURITY] content. To undo any changes, go to Me &gt; Preferences &gt; General.
-	 <form name="form">
+The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, or you can cancel. After your preferences are changed, you may attempt to enter the region again.
+    <form name="form">
       <button
        index="0"
        name="OK"
-       text="Change Preference"/>
-      <button
+       text="Change preferences"/>
+      <button 
        default="true"
        index="1"
        name="Cancel"
-       text="Close"/>
-       <ignore name="ignore" text="My chosen Rating preference prevents me from entering a Region"/>
+       text="Cancel"/>
+      <ignore name="ignore" text="Region crossing: The region you&apos;re trying to visit contains content excluded by your preferences."/>
     </form>
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="RegionEntryAccessBlocked_PreferencesOutOfSync"
+   type="alertmodal">
+    <tag>fail</tag>
+    We are having technical difficulties with your teleport because your preferences are out of sync with the server.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportEntryAccessBlocked"
+   type="alertmodal">
+    <tag>fail</tag>
+    The region you're trying to visit contains content exceeding your current preferences.  You can change your preferences using Me &gt; Preferences &gt; General.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportEntryAccessBlocked_AdultsOnlyContent"
+   type="alertmodal">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
+    <url option="0" name="url">
+      http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+    </url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="Go to Knowledge Base"
+	 notext="Close"
+	 ignoretext="Teleport: The region you&apos;re trying to visit contains content which is accessible to adults only."/>
+  </notification>
+
+  <notification
    icon="notifytip.tga"
-   name="PreferredMaturityChanged"
+   name="TeleportEntryAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
-Your maturity Rating preference is now [RATING].
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TeleportEntryAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
+   type="notifytip">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    The region you're trying to visit contains [REGIONMATURITY] content, which is accessible to adults only.
   </notification>
 
   <notification
    icon="alertmodal.tga"
-   name="LandClaimAccessBlocked"
+   name="TeleportEntryAccessBlocked_ChangeAndReTeleport"
    type="alertmodal">
-You cannot claim this land due to your maturity Rating. This may be a result of a lack of information validating your age.
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences and continue with the teleport, or you can cancel this teleport.
+    <form name="form">
+      <button
+       index="0"
+       name="OK"
+       text="Change and continue"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+      <ignore name="ignore" text="Teleport (restartable): The region you&apos;re trying to visit contains content excluded by your preferences."/>
+    </form>
+  </notification>
 
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
-  <tag>fail</tag>
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportEntryAccessBlocked_Change"
+   type="alertmodal">
+    <unique>
+      <context>REGIONMATURITY</context>
+    </unique>
+    <tag>fail</tag>
+    <tag>confirm</tag>
+    The region you're trying to visit contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, or you can cancel the teleport. After your preferences are changed, you will need to attempt the teleport again.
+    <form name="form">
+      <button
+       index="0"
+       name="OK"
+       text="Change preferences"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+      <ignore name="ignore" text="Teleport (non-restartable): The region you&apos;re trying to visit contains content excluded by your preferences."/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportEntryAccessBlocked_PreferencesOutOfSync"
+   type="alertmodal">
+    <tag>fail</tag>
+    We are having technical difficulties with your teleport because your preferences are out of sync with the server.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -4150,12 +4568,43 @@ Please verify you have the latest Viewer installed, and go to the Knowledge Base
 
   <notification
    icon="alertmodal.tga"
-   name="LandClaimAccessBlocked_KB"
+   name="PreferredMaturityChanged"
    type="alertmodal">
-You cannot claim this land due to your maturity Rating.
+You won't receive any more notifications that you're about to visit a region with [RATING] content.  You may change your content preferences in the future by using Me &gt; Preferences &gt; General from the menu bar.
+  <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
 
-Go to the Knowledge Base for more information about maturity Ratings?
-  <tag>fail</tag>
+  <notification
+   icon="alertmodal.tga"
+   name="MaturityChangeError"
+   type="alertmodal">
+    We were unable to change your preferences to view [PREFERRED_MATURITY] content at this time.  Your preferences have been reset to view [ACTUAL_MATURITY] content.  You may attempt to change your preferences again by using Me &gt; Preferences &gt; General from the menu bar.
+    <tag>confirm</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandClaimAccessBlocked"
+   type="alertmodal">
+    The land you're trying to claim has a maturity rating exceeding your current preferences.  You can change your preferences using Me &gt; Preferences &gt; General.
+    <tag>fail</tag>
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandClaimAccessBlocked_AdultsOnlyContent"
+   type="alertmodal">
+    Only adults can claim this land.
+    <tag>fail</tag>
     <tag>confirm</tag>
     <url option="0" name="url">
 		http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
@@ -4164,41 +4613,56 @@ Go to the Knowledge Base for more information about maturity Ratings?
      name="okcancelignore"
      yestext="Go to Knowledge Base"
 	 notext="Close"
-	 ignoretext="I can&apos;t claim this Land, due to restrictions of the maturity Rating"/>
+	 ignoretext="Only adults can claim this land."/>
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="LandClaimAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
-You cannot claim this land due to your maturity Rating.
-  <tag>fail</tag>
+    The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="LandClaimAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
+   type="notifytip">
+    <tag>fail</tag>
+    The land you're trying to claim contains [REGIONMATURITY] content, which is accessible to adults only.
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="LandClaimAccessBlocked_Change"
    type="alertmodal">
-You cannot claim this land due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me &gt; Preferences &gt; General.
+    The land you're trying to claim contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, then you can try claiming the land again.
     <tag>fail</tag>
     <tag>confirm</tag>
-    <usetemplate
-     name="okcancelignore"
-     yestext="Change Preference"
-	 notext="Close"
-	 ignoretext="My chosen Rating preference prevents me from claiming Land"/>
+    <form name="form">
+      <button
+       index="0"
+       name="OK"
+       text="Change preferences"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+      <ignore name="ignore" text="The land you&apos;re trying to claim contains content excluded by your preferences."/>
+    </form>
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="LandBuyAccessBlocked"
    type="alertmodal">
-You cannot buy this land due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
-  <tag>fail</tag>
+    The land you're trying to buy has a maturity rating exceeding your current preferences.  You can change your preferences using Me &gt; Preferences &gt; General.
+    <tag>fail</tag>
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -4206,11 +4670,9 @@ Please verify you have the latest Viewer installed, and go to the Knowledge Base
 
   <notification
    icon="alertmodal.tga"
-   name="LandBuyAccessBlocked_KB"
+   name="LandBuyAccessBlocked_AdultsOnlyContent"
    type="alertmodal">
-You cannot buy this land due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
+    Only adults can buy this land.
     <tag>confirm</tag>
   <tag>fail</tag>
     <url option="0" name="url">
@@ -4220,31 +4682,48 @@ Go to the Knowledge Base for more information about maturity Ratings?
      name="okcancelignore"
      yestext="Go to Knowledge Base"
 	 notext="Close"
-	 ignoretext="I can&apos;t buy this Land, due to restrictions of the maturity Rating"/>
+	 ignoretext="Only adults can buy this land."/>
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="LandBuyAccessBlocked_Notify"
+   log_to_im="false"
+   log_to_chat="true"
    type="notifytip">
-You cannot buy this land due to your maturity Rating.
-  <tag>fail</tag>
+    The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="LandBuyAccessBlocked_NotifyAdultsOnly"
+   log_to_im="false"
+   log_to_chat="true"
+   type="notifytip">
+    <tag>fail</tag>
+    The land you're trying to buy contains [REGIONMATURITY] content, which is accessible to adults only.
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="LandBuyAccessBlocked_Change"
    type="alertmodal">
-You cannot buy this land due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me &gt; Preferences &gt; General.
+    The land you're trying to buy contains [REGIONMATURITY] content, but your current preferences are set to exclude [REGIONMATURITY] content. We can change your preferences, then you can try buying the land again.
     <tag>confirm</tag>
     <tag>fail</tag>
-    <usetemplate
-     name="okcancelignore"
-     yestext="Change Preference"
-	 notext="Close"
-	 ignoretext="My chosen Rating preference prevents me from buying Land"/>
+    <form name="form">
+      <button
+       index="0"
+       name="OK"
+       text="Change preferences"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+      <ignore name="ignore" text="The land you&apos;re trying to buy contains content excluded by your preferences."/>
+    </form>
   </notification>
 
 	<notification
@@ -4399,10 +4878,11 @@ Type a short announcement which will be sent to everyone in this region.
    label="Changed Region Maturity"
    name="RegionMaturityChange"
    type="alertmodal">
-The maturity rating for this region has been updated.
-It may take some time for the change to be reflected on the map.
-
-To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification.
+The maturity rating for this region has been changed.
+It may take some time for this change to be reflected on the map.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
   </notification>
 
   <notification
@@ -4665,6 +5145,20 @@ Go to your [http://secondlife.com/account/ Dashboard] to see your account histor
 
   <notification
    icon="alertmodal.tga"
+   name="ConfirmAddingChatParticipants"
+   type="alertmodal">
+    <unique/>
+When you add a person to an existing conversation, a new conversation will be created.  All participants will receive new conversation notifications.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm adding chat paticipants"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Ok"/>
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
    name="ConfirmQuit"
    type="alertmodal">
     <unique/>
@@ -4832,25 +5326,25 @@ Do you want to replace it with the selected object?
 
   <notification
    icon="alert.tga"
-   label="Busy Mode Warning"
-   name="BusyModePay"
+   label="Do Not Disturb Mode Warning"
+   name="DoNotDisturbModePay"
    type="alert">
-You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
+You have turned on Do Not Disturb. You will not receive any items offered in exchange for this payment.
 
-Would you like to leave Busy Mode before completing this transaction?
+Would you like to turn off Do Not Disturb before completing this transaction?
     <tag>confirm</tag>
     <form name="form">
       <ignore name="ignore"
        save_option="true"
-       text="I am about to pay a person or object while I am in Busy mode"/>
+       text="I am about to pay a person or object while I am in Do Not Disturb mode"/>
       <button
        default="true"
-       ignore="Always leave Busy Mode"
+       ignore="Always leave Do Not Disturb Mode"
        index="0"
        name="Yes"
        text="OK"/>
       <button
-       ignore="Never leave Busy Mode"
+       ignore="Never leave Do Not Disturb Mode"
        index="1"
        name="No"
        text="Cancel"/>
@@ -5108,20 +5602,20 @@ Would you like to automatically wear the clothing you are about to create?
    icon="alertmodal.tga"
    name="NotAgeVerified"
    type="alertmodal">
-   <tag>fail</tag>
-To access adult content and areas in Second Life you must be at least 18 years old. Please visit our age verification page to confirm you are over 18. 
-Note this will launch your web browser.
-
-[_URL]
-    <tag>confirm</tag>
-    <url option="0" name="url">
-	    https://secondlife.com/my/account/verification.php
-    </url>
+    The location you're trying to visit is restricted to residents age 18 and over.
+    <tag>fail</tag>
     <usetemplate
-     ignoretext="I have not verified my age"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go to Age Verification"/>
+     ignoretext="I am not old enough to visit age restricted areas."
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="NotAgeVerified_Notify"
+   type="notifytip">
+    Location restricted to age 18 and over.
+    <tag>fail</tag>
   </notification>
 
   <notification
@@ -5161,6 +5655,8 @@ The string [STRING_NAME] is missing from strings.xml
   <notification
    icon="notifytip.tga"
    name="IMSystemMessageTip"
+   log_to_im="true"   
+   log_to_chat="false"   
    type="notifytip">
 [MESSAGE]
   </notification>
@@ -5204,18 +5700,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
 
   <notification
    icon="notifytip.tga"
-   name="FriendOnline"
-   type="notifytip">
-    <tag>friendship</tag>
-&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Online
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="FriendOffline"
+   name="FriendOnlineOffline"
+   log_to_chat="false"
    type="notifytip">
     <tag>friendship</tag>
-&lt;nolink&gt;[NAME]&lt;/nolink&gt; is Offline
+&lt;nolink&gt;[NAME]&lt;/nolink&gt; is [STATUS]
+    <unique combine="cancel_old">
+      <context>NAME</context>
+    </unique>
   </notification>
 
   <notification
@@ -5268,7 +5760,7 @@ Terrain.raw downloaded
    icon="notifytip.tga"
    name="GestureMissing"
    type="notifytip">
-Hmm. Gesture [NAME] is missing from the database.
+Gesture [NAME] is missing from the database.
   <tag>fail</tag>
   </notification>
 
@@ -5459,6 +5951,8 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryAccepted"
+   log_to_im="true"   
+   log_to_chat="false"
    type="notifytip">
 [NAME] received your inventory offer.
   </notification>
@@ -5466,6 +5960,8 @@ You don&apos;t have permission to copy this.
   <notification
    icon="notifytip.tga"
    name="InventoryDeclined"
+   log_to_im="true"   
+   log_to_chat="false"
    type="notifytip">
 [NAME] declined your inventory offer.
   </notification>
@@ -5506,9 +6002,7 @@ Your calling card was declined.
    icon="notifytip.tga"
    name="TeleportToPerson"
    type="notifytip">
-    To contact Residents like &apos;[NAME]&apos;, click on the &quot;People&quot; button , select a Resident from the window that opens, then click &apos;IM&apos; at the
-    bottom of the window.
-    (You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
+    To open a private conversation with someone, right-click on their avatar and choose &apos;IM&apos; from the menu.
   </notification>
 
   <notification
@@ -5544,9 +6038,17 @@ Please select at least one type of content to search (General, Moderate, or Adul
 [MESSAGE]
   </notification>
 
+ <notification
+  icon="notify.tga"
+  name="FacebookConnect"
+  type="notifytip">
+[MESSAGE]
+ </notification>
+    
   <notification
    icon="notify.tga"
    name="PaymentReceived"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>funds</tag>
@@ -5556,6 +6058,7 @@ Please select at least one type of content to search (General, Moderate, or Adul
   <notification
    icon="notify.tga"
    name="PaymentSent"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>funds</tag>
@@ -5700,6 +6203,7 @@ The objects on the selected parcel that are NOT owned by you have been returned
   <notification
    icon="notify.tga"
    name="ServerObjectMessage"
+   log_to_im="true"   
    persist="true"
    type="notify">
 Message from [NAME]:
@@ -5756,6 +6260,36 @@ This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
   <notification
+     icon="notify.tga"
+     name="PathfindingDirty"
+     persist="true"
+     type="notify">
+    <unique/>
+    The region has pending pathfinding changes.  If you have build rights, you may rebake the region by clicking on the “Rebake region” button.
+  </notification>
+
+  <notification
+     icon="notify.tga"
+     name="DynamicPathfindingDisabled"
+     persist="true"
+     type="notify">
+    <unique/>
+    Dynamic pathfinding is not enabled on this region.  Scripted objects using pathfinding LSL calls may not operate as expected on this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingCannotRebakeNavmesh"
+   type="alertmodal">
+    <unique/>
+    An error occurred.  There may be a network or server problem, or you may not have build rights.  Sometimes logging out and back in will solve this problem.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"
+     />
+  </notification>
+
+  <notification
    icon="notify.tga"
    name="SeeAvatars"
    persist="true"
@@ -5803,15 +6337,22 @@ You can only claim public land in the Region you&apos;re in.
   <notification
    icon="notify.tga"
    name="RegionTPAccessBlocked"
-   persist="true"
+   persist="false"
    type="notify">
    <tag>fail</tag>
-You aren&apos;t allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer.
-
-Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+    The region you're trying to visit contains content exceeding your current preferences.  You can change your preferences using Me &gt; Preferences &gt; General.
   </notification>
 
   <notification
+   icon="notify.tga"
+   name="RegionAboutToShutdown"
+   persist="false"
+   type="notify">
+    <tag>fail</tag>
+    The region you're trying to enter is about to shut down.
+  </notification>
+  
+  <notification
 	icon="notify.tga"
 	name="URBannedFromRegion"
    persist="true"
@@ -5840,11 +6381,11 @@ You do not have proper payment status to enter this region.
 
   <notification
 	icon="notify.tga"
-	name="MustGetAgeRgion"
+	name="MustGetAgeRegion"
    persist="true"
 	type="notify">
    <tag>fail</tag>
-You must be age-verified to enter this region.
+You must be age 18 or over to enter this region.
   </notification>
 
   <notification
@@ -5853,7 +6394,7 @@ You must be age-verified to enter this region.
    persist="true"
 	type="notify">
    <tag>fail</tag>
-You must be age-verified to enter this parcel.
+    You must be age 18 or over to enter this parcel.
   </notification>
 
   <notification
@@ -6070,7 +6611,9 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="UserGiveItem"
-   type="offer">
+   log_to_im ="true"
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has given you this [OBJECTTYPE]:
 [ITEM_SLURL]
     <form name="form">
@@ -6103,7 +6646,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
    icon="notify.tga"
    name="JoinGroup"
    persist="true"
-   type="notify">
+   type="offer">
     <tag>group</tag>
 [MESSAGE]
     <form name="form">
@@ -6125,10 +6668,14 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="TeleportOffered"
-   type="offer">
+   log_to_im="true"
+   log_to_chat="false"
+   type="offer"
+   sound="UISndNewIncomingIMSession">
 [NAME_SLURL] has offered to teleport you to their location:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+"[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
     <tag>confirm</tag>
     <form name="form">
       <button
@@ -6144,11 +6691,75 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
 
   <notification
    icon="notify.tga"
-   name="TeleportOfferSent"
+   name="TeleportOffered_MaturityExceeded"
+   log_to_im="true"
+   log_to_chat="false"
    type="offer">
+[NAME_SLURL] has offered to teleport you to their location:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+This region contains [REGION_CONTENT_MATURITY] content, but your current preferences are set to exclude [REGION_CONTENT_MATURITY] content.  We can change your preferences and continue with the teleport, or you can cancel this teleport.
+    <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Teleport"
+       text="Change and Continue"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TeleportOffered_MaturityBlocked"
+   log_to_im="true"
+   log_to_chat="false"
+   type="notifytip">
+[NAME_SLURL] has offered to teleport you to their location:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+However, this region contains content accessible to adults only.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TeleportOfferSent"
+   log_to_im="true"
+   log_to_chat="false"
+   show_toast="false"
+   type="notify">
 	Teleport offer sent to [TO_NAME]
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="TeleportRequest"
+   log_to_im="true"
+   type="offer">
+[NAME_SLURL] is requesting to be teleported to your location.
+[MESSAGE]
+
+Offer a teleport?
+    <tag>confirm</tag>
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+    </form>
+  </notification>
 
   <notification
    icon="notify.tga"
@@ -6172,6 +6783,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="OfferFriendship"
+   log_to_im="true"
    type="offer">
     <tag>friendship</tag>
     <tag>confirm</tag>
@@ -6195,7 +6807,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="FriendshipOffered"
-   type="offer">
+   log_to_im="true"   
+   type="notify">
     <tag>friendship</tag>
 	You have offered friendship to [TO_NAME]
   </notification>
@@ -6224,7 +6837,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="FriendshipAccepted"
-   type="offer">
+   log_to_im="true"   
+   type="notify">
     <tag>friendship</tag>
 &lt;nolink&gt;[NAME]&lt;/nolink&gt; accepted your friendship offer.
   </notification>
@@ -6232,6 +6846,7 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
   <notification
    icon="notify.tga"
    name="FriendshipDeclined"
+   log_to_im="true"   
    persist="true"
    type="notify">
     <tag>friendship</tag>
@@ -6241,7 +6856,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
     <notification
    icon="notify.tga"
    name="FriendshipAcceptedByMe"
-   type="offer">
+   log_to_im="true"   
+   type="notify">
     <tag>friendship</tag>
 Friendship offer accepted.
   </notification>
@@ -6249,7 +6865,8 @@ Friendship offer accepted.
   <notification
    icon="notify.tga"
    name="FriendshipDeclinedByMe"
-   type="offer">
+   log_to_im="true"   
+   type="notify">
     <tag>friendship</tag>
 Friendship offer declined.
   </notification>
@@ -6278,9 +6895,8 @@ This will add a bookmark in your inventory so you can quickly IM this Resident.
    name="RegionRestartMinutes"
    priority="high"
    sound="UISndAlert"
-   persist="true"
    type="notify">
-This region will restart in [MINUTES] minutes.
+The region "[NAME]" will restart in [MINUTES] minutes.
 If you stay in this region you will be logged out.
   </notification>
 
@@ -6289,15 +6905,15 @@ If you stay in this region you will be logged out.
    name="RegionRestartSeconds"
    priority="high"
    sound="UISndAlert"
-   persist="true"
    type="notify">
-This region will restart in [SECONDS] seconds.
+The region "[NAME]" will restart in [SECONDS] seconds.
 If you stay in this region you will be logged out.
   </notification>
 
   <notification
    icon="notify.tga"
    name="LoadWebPage"
+   show_toast="false"
    type="notify">
 Load web page [URL]?
 
@@ -6373,36 +6989,56 @@ Is this OK?
   <notification
    icon="notify.tga"
    name="ScriptQuestionCaution"
-   priority="high"
+   priority="critical"
    persist="true"
    type="notify">
-An object named &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, owned by &apos;[NAME]&apos; would like to:
-
-[QUESTIONS]
-If you do not trust this object and its creator, you should deny the request.
+Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
+  
+Do not allow access if you do not fully understand why it wants access to your account.
 
-Grant this request?
   <tag>confirm</tag>
     <form name="form">
       <button
        index="0"
        name="Grant"
-       text="Grant"/>
+       text="Allow total access"/>
       <button
        default="true"
        index="1"
        name="Deny"
        text="Deny"/>
-      <button
-       index="2"
-       name="Details"
-       text="Details..."/>
     </form>
+    <footer>
+[FOOTERTEXT]
+    </footer>
   </notification>
 
   <notification
    icon="notify.tga"
+	 name="UnknownScriptQuestion"
+	 persist="false"
+	 type="notify">
+The runtime script permission requested by &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, isn&apos;t recognized by the viewer and can&apos;t be granted.
+
+To grant this permission please update your viewer to the latest version from [DOWNLOADURL].
+		<tag>confirm</tag>
+		<form name="form">
+			<button
+			 default="true"
+			 index="1"
+			 name="Deny"
+			 text="Ok"/>
+			<button
+			 index="2"
+			 name="Mute"
+			 text="Block"/>
+		</form>
+	</notification>
+
+	<notification
+   icon="notify.tga"
    name="ScriptDialog"
+   show_toast="false"
    type="notify">
 [NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
@@ -6421,6 +7057,7 @@ Grant this request?
   <notification
    icon="notify.tga"
    name="ScriptDialogGroup"
+   show_toast="false"
    type="notify">
     <tag>group</tag>
 [GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
@@ -7181,6 +7818,18 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME]
 
   <notification
    icon="alertmodal.tga"
+   name="LivePreviewUnavailable"
+   type="alert">
+   
+We cannot display a preview of this texture because it is no-copy and/or no-transfer.
+  <usetemplate
+    ignoretext="Warn me that Live Preview mode is not available for no-copy and/or no-transfer textures"
+    name="okignore"
+    yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ConfirmLeaveCall"
    type="alert">
 Are you sure you want to leave this call?
@@ -7663,7 +8312,135 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
       notext="Cancel"
       ignoretext="Confirm before hiding UI"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_WarnOnPhantom"
+   type="alertmodal">
+Some selected linksets will have the Phantom flag toggled.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets phantom flag will be toggled."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_MismatchOnRestricted"
+   type="alertmodal">
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets cannot be set because of permission restrictions on the linkset."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_MismatchOnVolume"
+   type="alertmodal">
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets cannot be set because the shape is non-convex"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted"
+   type="alertmodal">
+Some selected linksets will have the Phantom flag toggled.
+
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets phantom flag will be toggled and others cannot be set because of permission restrictions on the linkset."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume"
+   type="alertmodal">
+Some selected linksets will have the Phantom flag toggled.
+
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets phantom flag will be toggled and others cannot be set because the shape is non-convex"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume"
+   type="alertmodal">
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex. These linksets&apos; use types will not change.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets cannot be set because of permission restrictions on the linkset and because the shape is non-convex."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume"
+   type="alertmodal">
+Some selected linksets will have the Phantom flag toggled.
+
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+
+Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex. These linksets&apos; use types will not change.
+
+Do you wish to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Some selected linksets phantom flag will be toggled and others cannot be set because of permission restrictions on the linkset and because the shape is non-convex."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_ChangeToFlexiblePath"
+   type="alertmodal">
+    The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
@@ -7725,6 +8502,1716 @@ Attempt cancelled.
 
   <notification
    icon="alertmodal.tga"
+   name="PathfindingReturnMultipleItems"
+   type="alertmodal">
+    You are returning [NUM_ITEMS] items.  Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to return multiple items?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingDeleteMultipleItems"
+   type="alertmodal">
+    You are deleting [NUM_ITEMS] items.  Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to delete multiple items?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozen"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFrozenDuration"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has frozen you for [AV_FREEZE_TIME] seconds. You cannot move or interact with the world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouFrozeAvatar"
+   type="notify">
+   <tag>fail</tag>
+Avatar frozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarHasUnFrozenYou"
+   type="notify">
+   <tag>fail</tag>
+[AV_FREEZER] has unfrozen you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarUnFrozen"
+   type="notify">
+   <tag>fail</tag>
+Avatar unfrozen.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeFailure"
+   type="notify">
+   <tag>fail</tag>
+Freeze failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarFreezeThaw"
+   type="notify">
+   <tag>fail</tag>
+Your freeze expired, go about your business.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarCantFreeze"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't freeze that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NowOwnObject"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezOnLand"
+   type="notify">
+   <tag>fail</tag>
+Can't rez object at [OBJECT_POS] because the owner of this land does not allow it.  Use the land tool to see land ownership.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailTooManyRequests"
+   type="notify">
+   <tag>fail</tag>
+Object can not be rezzed because there are too many requests.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailCantMove"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you cannot move at this time.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotAllowedOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot sit because you are not allowed on that land.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="SitFailNotSameRegion"
+   type="notify">
+   <tag>fail</tag>
+Try moving closer.  Can't sit on object because
+it is not in the same region as you.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="NoNewObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create new object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoOwnNoGardening"
+   type="notify">
+   <tag>fail</tag>
+You Can't create trees and grass on land you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because you lack permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransPermsNoObject"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' cannot be transferred to you.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddToNavMeshNoCopy"
+   type="notify">
+   <tag>fail</tag>
+Copy failed because the object '[OBJ_NAME]' contributes to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DupeWithNoRootsSelected"
+   type="notify">
+   <tag>fail</tag>
+Duplicate with no root objects selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzRegionIsFull"
+   type="notify">
+   <tag>fail</tag>
+Can't duplicate objects because the region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDupeCuzParcelNotFound"
+   type="notify">
+   <tag>fail</tag>
+Can't duplicate objects - Can't find the parcel they are on.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateCuzParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because 
+the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezAttemptFailed"
+   type="notify">
+   <tag>fail</tag>
+Attempt to rez an object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ToxicInvRezAttemptFailed"
+   type="notify">
+   <tag>fail</tag>
+Unable to create item that has caused problems on this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvItemIsBlacklisted"
+   type="notify">
+   <tag>fail</tag>
+That inventory item has been blacklisted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCanRezObjects"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+ 
+  <notification
+   icon="alertmodal.tga"
+   name="LandSearchBlocked"
+   type="notify">
+   <tag>fail</tag>
+Land Search Blocked.
+You have performed too many land searches too quickly.
+Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotEnoughResourcesToAttach"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouDiedAndGotTPHome"
+   type="notify">
+   <tag>fail</tag>
+You died and have been teleported to your home location
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectComingSoon"
+   type="notify">
+   <tag>fail</tag>
+You are no longer allowed here and have [EJECT_TIME] seconds to leave.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoEnterRegionMaybeFull"
+   type="notify">
+   <tag>fail</tag>
+You can't enter region "[NAME]".
+It may be full or restarting soon.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveBackToInvDisabled"
+   type="notify">
+   <tag>fail</tag>
+Save Back To Inventory has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoExistNoSaveToContents"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because the object it was rezzed from no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveToContents"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' to object contents because you do not have permission to modify the object '[DEST_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSaveBackToInvDisabled"
+   type="notify">
+   <tag>fail</tag>
+Cannot save '[OBJ_NAME]' back to inventory -- this operation has been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSelCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because you do not have permission to copy the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoSelCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoTransNoCopy"
+   type="notify">
+   <tag>fail</tag>
+You cannot copy your selection because the object '[OBJ_NAME]' is not transferrable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsNoRemoval"
+   type="notify">
+   <tag>fail</tag>
+Removal of the object '[OBJ_NAME]' from the simulator is disallowed by the permissions system.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoSaveSelection"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoCopyNoSaveSelection"
+   type="notify">
+   <tag>fail</tag>
+Cannot save your selection because the object '[OBJ_NAME]' is not copyable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNoTaking"
+   type="notify">
+   <tag>fail</tag>
+You cannot take your selection because you do not have permission to modify the object '[OBJ_NAME]'.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezDestInternalError"
+   type="notify">
+   <tag>fail</tag>
+Internal Error: Unknown destination type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteFailObjNotFound"
+   type="notify">
+   <tag>fail</tag>
+Delete failed because object not found
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SorryCantEjectUser"
+   type="notify">
+   <tag>fail</tag>
+Sorry, can't eject that user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionSezNotAHome"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomeLocationLimits"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+   </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HomePositionSet"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjected"
+   type="notify">
+   <tag>fail</tag>
+Avatar ejected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarEjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Eject failed because you don't have admin permission for that parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelPerms"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectParcelResources"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectRegionVersion"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectNavMesh"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantMoveObjectWTF"
+   type="notify">
+   <tag>fail</tag>
+Can't move object '[OBJECT_NAME]' to
+[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE])
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermModifyObject"
+   type="notify">
+   <tag>fail</tag>
+You don't have permission to modify that object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysObjContributesToNav"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for an object that contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysKeyframedObj"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for keyframed objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysNotEnoughLandResources"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object -- insufficient land resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantEnablePhysCostTooGreat"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+Can't enable physics for object with physics resource cost greater than [MAX_OBJECTS]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PhantomWithConcavePiece"
+   type="notify">
+   <tag>fail</tag>
+This object cannot have a concave piece because it is phantom and contributes to the navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to add item!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableEditItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to edit this!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to edit this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermToCopyInventory"
+   type="notify">
+   <tag>fail</tag>
+Not permitted to copy that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemDoesntExist"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item no longer exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveItemAlreadyExists"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: Item with that name already exists in inventory
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSaveModifyAttachment"
+   type="notify">
+   <tag>fail</tag>
+Cannot save to object contents: This would modify the attachment permissions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Too many scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableAddScript"
+   type="notify">
+   <tag>fail</tag>
+Unable to add script!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AssetServerTimeoutObjReturn"
+   type="notify">
+   <tag>fail</tag>
+Asset server didn't respond in a timely fashion.  Object returned to sim.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisablePhysicsShapes"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics shapes enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+You cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetPhysicsPropertiesOnObjectType"
+   type="notify">
+   <tag>fail</tag>
+Cannot set physics properties on that object type.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSetRootPrimWithNoShape"
+   type="notify">
+   <tag>fail</tag>
+Cannot set root prim to have no shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoRegionSupportPhysMats"
+   type="notify">
+   <tag>fail</tag>
+This region does not have physics materials enabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OnlyRootPrimPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Only root prims may have their physics materials adjusted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportCharacterPhysMats"
+   type="notify">
+   <tag>fail</tag>
+Setting physics materials on characters is not yet supported.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidPhysMatProperty"
+   type="notify">
+   <tag>fail</tag>
+One or more of the specified physics material properties was invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterStitchingMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the stitching type of a mesh object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPermsAlterShapeMeshObj"
+   type="notify">
+   <tag>fail</tag>
+You may not alter the shape of a mesh object
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FullRegionCantEnter"
+   type="notify">
+   <tag>fail</tag>
+You can't enter this region because \nthe region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedOwnersDiffer"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- owners differ
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoModNavmeshAcrossRegions"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot modify the navmesh across region boundaries.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNoPermToEdit"
+   type="notify">
+   <tag>fail</tag>
+Link failed because you do not have edit permission.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPrims"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many primitives
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedCantLinkNoCopyNoTrans"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- cannot link no-copy with no-transfer
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedNothingLinkable"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- nothing linkable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooManyPathfindingChars"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- too many pathfinding characters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedInsufficientLand"
+   type="notify">
+   <tag>fail</tag>
+Link failed -- insufficient land resources
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LinkFailedTooMuchPhysics"
+   type="notify">
+   <tag>fail</tag>
+Object uses too many physics resources -- its dynamics have been disabled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedHomeByObjectOnParcel"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedHomeByObject"
+   persist="true"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported home by the object '[OBJECT_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByAttachment"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by an attachment on [ITEM_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOnParcel"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]'
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectOwnedBy"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by [OWNER_ID]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportedByObjectUnknownUser"
+   type="notify">
+   <tag>fail</tag>
+You have been teleported by the object '[OBJECT_NAME]' owned by an unknown user.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectRegionFull"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The region is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttackMultipleObjOneSpot"
+   type="notify">
+   <tag>fail</tag>
+You can't attach multiple objects to one spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateMultipleObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+You can't create multiple objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjTimeOut"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Object is missing from database.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjUnknown"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. The request timed out. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateObjMissingFromDB"
+   type="notify">
+   <tag>fail</tag>
+Unable to create requested object. Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezFailureTookTooLong"
+   type="notify">
+   <tag>fail</tag>
+Rez failed, requested object took too long to load.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedToPlaceObjAtLoc"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreatePlantsOnLand"
+   type="notify">
+   <tag>fail</tag>
+You cannot create plants on this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRestoreObjectNoWorldPos"
+   type="notify">
+   <tag>fail</tag>
+Cannot restore object. No world position found.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectInvalidMeshData"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because its mesh data is invalid.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantRezObjectTooManyScripts"
+   type="notify">
+   <tag>fail</tag>
+Unable to rez object because there are already too many scripts in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectNoAccess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to create objects there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObject"
+   type="notify">
+   <tag>fail</tag>
+You are not currently allowed to create objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidObjectParams"
+   type="notify">
+   <tag>fail</tag>
+Invalid object parameters
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDuplicateObjectNoAcess"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to duplicate objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantChangeShape"
+   type="notify">
+   <tag>fail</tag>
+You are not allowed to change this shape.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoAccessToClaimObjects"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to claim objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedFailedNoPermToDeedForGroup"
+   type="notify">
+   <tag>fail</tag>
+Deed failed because you do not have permission to deed objects for your group.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoPrivsToBuyObject"
+   type="notify">
+   <tag>fail</tag>
+Your access privileges don't allow you to buy objects here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectAvatarSittingOnIt"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because an avatar is sitting on it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WhyAreYouTryingToWearShrubbery"
+   type="notify">
+   <tag>fail</tag>
+Trees and grasses cannot be worn as attachments.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachGroupOwnedObjs"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach group-owned objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectsNotOwned"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that you don't own.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNavmeshObjects"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach objects that contribute to navmesh.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectNoMovePermissions"
+   type="notify">
+   <tag>fail</tag>
+Cannot attach object because you do not have permission to move it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachNotEnoughScriptResources"
+   type="notify">
+   <tag>fail</tag>
+Not enough script resources available to attach object!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantAttachObjectBeingRemoved"
+   type="notify">
+    <tag>fail</tag>
+    Cannot attach object because it is already being removed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropItemTrialUser"
+   type="notify">
+   <tag>fail</tag>
+You can't drop objects here; try the Free Trial area.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropMeshAttachment"
+   type="notify">
+   <tag>fail</tag>
+You can't drop mesh attachments. Detach to inventory and then rez in world.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: you don't have permission to drop there.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientLandResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachment: insufficient available land resource.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropAttachmentInsufficientResources"
+   type="notify">
+   <tag>fail</tag>
+Failed to drop attachments: insufficient available resources.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDropObjectFullParcel"
+   type="notify">
+   <tag>fail</tag>
+Cannot drop object here.  Parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTouchObjectBannedFromParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't touch/grab this object because you are banned from the land parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PlzNarrowDeleteParams"
+   type="notify">
+   <tag>fail</tag>
+Please narrow your delete parameters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToUploadAsset"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload asset.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTeleportCouldNotFindUser"
+   type="notify">
+   <tag>fail</tag>
+Could not find user to teleport home
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodlikeRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+godlike request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericRequestFailed"
+   type="notify">
+   <tag>fail</tag>
+generic request failed
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantUploadPostcard"
+   type="notify">
+   <tag>fail</tag>
+Unable to upload postcard.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFetchInventoryForGroupNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to fetch inventory details for the group notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeNotPermitted"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- not permitted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSendGroupNoticeCantConstructInventory"
+   type="notify">
+   <tag>fail</tag>
+Unable to send group notice -- could not construct inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantParceInventoryInNotice"
+   type="notify">
+   <tag>fail</tag>
+Unable to parse inventory in notice.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainUploadFailed"
+   type="notify">
+   <tag>fail</tag>
+Terrain upload failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWritten"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainFileWrittenStartingDownload"
+   type="notify">
+   <tag>fail</tag>
+Terrain file written, starting download...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TerrainBaked"
+   type="notify">
+   <tag>fail</tag>
+Terrain baked.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TenObjectsDisabledPlzRefresh"
+   type="notify">
+   <tag>fail</tag>
+Only the first 10 selected objects have been disabled. Refresh and make additional selections if required.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UpdateViewerBuyParcel"
+   type="notify">
+   <tag>fail</tag>
+You need to update your viewer to buy this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked"
+   type="notify">
+   <tag>fail</tag>
+You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, this parcel is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuySalePriceOrLandAreaChanged"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy, the sale price or land area has changed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelNotAuthorized"
+   type="notify">
+   <tag>fail</tag>
+You are not the authorized buyer for this parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyParcelAwaitingPurchaseAuth"
+   type="notify">
+   <tag>fail</tag>
+You cannot purchase this parcel because it is already awaiting purchase aut
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuildOverflowParcel"
+   type="notify">
+   <tag>fail</tag>
+You cannot build objects here because doing so would overflow the parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SelectedMultipleOwnedLand"
+   type="notify">
+   <tag>fail</tag>
+You selected land with different owners. Please select a smaller area and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantJoinTooFewLeasedParcels"
+   type="notify">
+   <tag>fail</tag>
+Not enough leased parcels in selection to join.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandMultipleParcelsSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandCantFindParcel"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug...
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDivideLandWholeParcelSelected"
+   type="notify">
+   <tag>fail</tag>
+Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandHasBeenDivided"
+   type="notify">
+   <tag>fail</tag>
+Land has been divided.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PassPurchased"
+   type="notify">
+   <tag>fail</tag>
+You purchased a pass.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionDisallowsClassifieds"
+   type="notify">
+   <tag>fail</tag>
+Region does not allow classified advertisements.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandPassExpireSoon"
+   type="notify">
+   <tag>fail</tag>
+Your pass to this land is about to expire.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoSuitableSurface"
+   type="notify">
+   <tag>fail</tag>
+There is no suitable surface to sit on, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSitNoRoom"
+   type="notify">
+   <tag>fail</tag>
+No room to sit here, try another spot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoPermission"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have permission
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClaimObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Claim object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDeedGroupLand"
+   type="notify">
+   <tag>fail</tag>
+Cannot deed group-owned land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyObjectFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy object failed because you don't have enough L$.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyInventoryFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+Buy inventory failed because you do not have enough L$
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyPassFailedNoMoney"
+   type="notify">
+   <tag>fail</tag>
+You don't have enough L$ to buy a pass to this land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyPassTryAgain"
+   type="notify">
+   <tag>fail</tag>
+Unable to buy pass right now.  Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateObjectParcelFull"
+   type="notify">
+   <tag>fail</tag>
+Can't create object because \nthe parcel is full.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedPlacingObject"
+   type="notify">
+   <tag>fail</tag>
+Failed to place object at specified location.  Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmarkForEvent"
+   type="notify">
+   <tag>fail</tag>
+Unable to create landmark for event.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodBeatsFreeze"
+   type="notify">
+   <tag>fail</tag>
+Your godlike powers break the freeze!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SpecialPowersRequestFailedLogged"
+   type="notify">
+   <tag>fail</tag>
+Request for special powers failed. This request has been logged.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExpireExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is currently unable to process your request. The request timed out.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DieExplanation"
+   type="notify">
+   <tag>fail</tag>
+The system is unable to process your request.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddPrimitiveFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create primitve.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RezObjectFailure"
+   type="notify">
+   <tag>fail</tag>
+Insufficient funds to create object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResetHomePositionNotLegal"
+   type="notify">
+   <tag>fail</tag>
+Reset Home position since Home wasn't legal.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantInviteRegionFull"
+   type="notify">
+   <tag>fail</tag>
+You cannot currently invite anyone to your location because the region is full. Try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSetHomeAtRegion"
+   type="notify">
+   <tag>fail</tag>
+This region does not allow you to set your home location here.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ListValidHomeLocations"
+   type="notify">
+   <tag>fail</tag>
+You can only set your 'Home Location' on your land or at a mainland Infohub.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetHomePosition"
+   type="notify">
+   <tag>fail</tag>
+Home position set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDerezInventoryError"
+   type="notify">
+   <tag>fail</tag>
+Cannot derez object due to inventory fault.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInv"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateRequestedInvFolder"
+   type="notify">
+   <tag>fail</tag>
+Cannot create requested inventory folder.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateInventory"
+   type="notify">
+   <tag>fail</tag>
+Cannot create that inventory.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmark"
+   type="notify">
+   <tag>fail</tag>
+Cannot create landmark.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateOutfit"
+   type="notify">
+   <tag>fail</tag>
+Cannot create outfit right now. Try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryNotForSale"
+   type="notify">
+   <tag>fail</tag>
+Inventory is not for sale.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindInvItem"
+   type="notify">
+   <tag>fail</tag>
+Unable to find inventory item.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantFindObject"
+   type="notify">
+   <tag>fail</tag>
+Unable to find object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantTransfterMoneyRegionDisabled"
+   type="notify">
+   <tag>fail</tag>
+Money transfers to objects are currently disabled in this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantPayNoAgent"
+   type="notify">
+   <tag>fail</tag>
+Could not figure out who to pay.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantDonateToPublicObjects"
+   type="notify">
+   <tag>fail</tag>
+You cannot give L$ to public objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InventoryCreationInWorldObjectFailed"
+   type="notify">
+   <tag>fail</tag>
+Inventory creation on in-world object failed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UserBalanceOrLandUsageError"
+   type="notify">
+   <tag>fail</tag>
+An internal error prevented us from properly updating your viewer.  The L$ balance or parcel holdings displayed in your viewer may not reflect your actual balance on the servers.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LargePrimAgentIntersect"
+   type="notify">
+   <tag>fail</tag>
+Cannot create large prims that intersect other players.  Please re-try when other players have moved.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceChatClearLog"
+   type="alertmodal">
+    This will delete the logs of previous conversations, and any backups of that file.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I delete the log of previous conversations."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceChatDeleteTranscripts"
+   type="alertmodal">
+    This will delete the transcripts for all previous conversations. The list of past conversations will not be affected. All files with the suffixes .txt and txt.backup in the folder [FOLDER] will be deleted.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Confirm before I delete transcripts."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="PreferenceChatPathChanged"
+   type="alert">
+   Unable to move files. Restored previous path.
+    <usetemplate
+     ignoretext="Unable to move files. Restored previous path."
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="DefaultObjectPermissions"
    type="alert">
 	There was a problem saving the default permissions due to the following reason: [REASON].  Please try setting the default permissions later.
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 2a24c74feb..2a24c74feb 100644..100755
--- a/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
index 3e3271b181..3e3271b181 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
deleted file mode 100644
index 9369d1b5cf..0000000000
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	name="panel_activeim_row"
-	layout="topleft"
-	follows="left|right"
-	top="0"
-	left="0"
-	height="35"
-	width="318"
-  background_opaque="false"
-  background_visible="true"
-  bg_alpha_color="0.0 0.0 0.0 0.0" >
-  <chiclet_im_p2p
-		name="p2p_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_p2p"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_p2p>
-  <chiclet_im_group
-		name="group_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_grp"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_group>
-  <chiclet_im_adhoc
-		name="adhoc_chiclet"
-		layout="topleft"
-		follows="left"
-		top="3"
-		left="5"
-		height="25"
-		width="25"
-    visible="false"
-    speaker.name="speaker_hoc"
-    speaker.width="20"
-    speaker.height="25"
-    speaker.left="25"
-    speaker.top="25"
-    speaker.auto_update="true"
-    speaker.draw_border="false"
-    speaker.visible="false">
-  </chiclet_im_adhoc>
-	<text
-	    translate="false"
-		type="string"
-		name="contact_name"
-		layout="topleft"
-		top="10"
-		left_pad="10"
-		height="14"
-		width="250"
-		length="1"
-		follows="right|left"
-		parse_urls="false"
-		use_ellipses="true"
-		font="SansSerifBold">
-    TestString PleaseIgnore
-  </text>
-  <button
-    top="10"
-    right="-5"
-    width="17"
-    height="17"
-    layout="topleft"
-    follows="right"
-    name="hide_btn"
-    mouse_opaque="true"
-    label=""
-    tab_stop="false"
-    image_unselected="Toast_CloseBtn"
-    image_selected="Toast_CloseBtn"
-  />
-</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
deleted file mode 100644
index d68fa6ca6c..0000000000
--- a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="215"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="215"
-     layout="topleft"
-     left="3"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="147">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="130"
-         layout="topleft"
-         left="0"
-         min_height="0"
-         mouse_opaque="false"
-         width="147"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="130"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="147" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Call"
-             name="call_btn"
-             width="130"
-             top="0" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Leave Call"
-             name="end_call_btn"
-             top="0"/>
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="20"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             top="0"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index b7c58eb6ab..aa1b929412 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -129,6 +129,7 @@
      left_pad="3"
      right="-53"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="0"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
index b779b08a63..b779b08a63 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
index 7c67fd7f83..53d0252215 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -4,88 +4,99 @@
  follows="left|top|right|bottom"
  height="305"
  layout="topleft"
+ left="0"
  name="block_list_panel"
  help_topic="blocked_list"
  min_height="350"
  min_width="240"
- width="280">
-        <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     name="back"
-     left="4"
-     tab_stop="false"
-     top="1"
-     width="30"/>
-    <text
-     follows="top|left|right"
-     font="SansSerifLargeBold"
-     height="20"
-     layout="topleft"
-     left_pad="10"
-     name="title_text"
-     text_color="White"
-     top="5"
-     width="250">
-        Block List
-     </text>
-    <scroll_list
+ width="323">
+     <panel
+      follows="left|top|right"
+      height="27"
+      label="bottom_panel"
+      layout="topleft"
+      left="0"
+      name="blocked_buttons_panel"
+      right="-1"
+      top="0">
+         <filter_editor
+          follows="left|top|right"
+          height="23"
+          layout="topleft"
+          left="6"
+          label="Filter"
+          max_length_chars="300"
+          name="blocked_filter_input"
+          text_color="Black"
+          text_pad_left="10"
+          top="4"
+          width="177" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="OptionsMenu_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="8"
+          menu_filename="menu_people_blocked_gear.xml"
+          menu_position="bottomleft"
+          name="blocked_gear_btn"
+          tool_tip="Actions on selected person or object"
+          top="3"
+          width="31" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="Conv_toolbar_sort"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          menu_filename="menu_people_blocked_view.xml"
+          menu_position="bottomleft"
+          name="view_btn"
+          tool_tip="Sort options"
+          top_delta="0"
+          width="31" />
+         <menu_button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="AddItem_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          layout="topleft"
+          left_pad="2"
+          menu_filename="menu_people_blocked_plus.xml"
+          menu_position="bottomleft"
+          name="plus_btn"
+          tool_tip="Pick a Resident or an object to block"
+          top_delta="0"
+          width="31"/>
+          <button
+          follows="right"
+          height="25"
+          image_hover_unselected="Toolbar_Middle_Over"
+          image_overlay="TrashItem_Off"
+          image_selected="Toolbar_Middle_Selected"
+          image_unselected="Toolbar_Middle_Off"
+          left_pad="2"
+          layout="topleft"
+          name="unblock_btn"
+          tool_tip="Remove Resident or object from blocked list"
+          top_delta="0"
+          width="31"/>
+     </panel>
+    <block_list
      follows="all"
-     height="190"
+     height="273"
      layout="topleft"
-     left="5"
+     left="3"
      name="blocked"
      tool_tip="List of currently blocked Residents"
-     top="30"
-     width="270">
-        <scroll_list.columns
-         name="item_name" />
-        <scroll_list.columns
-         name="item_type"
-         width="96" />
-    </scroll_list>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Block person"
-     layout="topleft"
-     left_delta="0"
-     name="Block resident..."
-     tool_tip="Pick a Resident to block"
-     top_pad="4"
-     width="210">
-        <button.commit_callback
-         function="Block.ClickPick" />
-    </button>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Block object by name"
-     layout="topleft"
-     left_delta="0"
-     name="Block object by name..."
-     tool_tip="Pick an object to block by name"
-     top_pad="4"
-     width="210" >
-        <button.commit_callback
-         function="Block.ClickBlockByName" />
-    </button>
-    <button
-     enabled="false"
-     follows="left|bottom"
-     height="23"
-     label="Unblock"
-     layout="topleft"
-     left_delta="0"
-     name="Unblock"
-     tool_tip="Remove Resident or object from blocked list"
-     top_pad="4"
-     width="210" >
-        <button.commit_callback
-         function="Block.ClickRemove" />
-    </button>
+     top="31"
+  	 right="-1"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
new file mode 100755
index 0000000000..752321b949
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_blocked_list_item.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="blocked_list_item"
+ top="0"
+ width="380">
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|right|left"
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <avatar_icon
+     default_icon_name="Generic_Person"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="16"
+     image_name="Inv_Object"
+     layout="topleft"
+     left="7"
+     name="object_icon"
+     top="4"
+     visible="false"
+     width="16" />
+    <text
+     follows="left|right"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="item_name"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="180" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
index 216a265164..216a265164 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
index dc123f13f4..dc123f13f4 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
index f4722b05d6..27a27473d8 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml
@@ -46,7 +46,7 @@
             follows="left|right"
             top="4"
             width="310"
-            name="chat_bar"
+            name="nearby_chat"
             mouse_opaque="false"/>
         </layout_panel>
         <layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 5c5c718bdf..5c5c718bdf 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 1ef99649e6..1ef99649e6 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
index 357dbc07cc..357dbc07cc 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_chat_separator.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml
diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
index ff0146490b..fc321fdd23 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml
@@ -87,54 +87,6 @@
          layout="topleft"
          min_height="28"
          min_width="37"
-         name="im_well_panel"
-         top="0"
-         width="37">
-      <chiclet_im_well
-             follows="right"
-             height="28"
-             layout="topleft"
-             left="0"
-             max_displayed_count="99"
-             name="im_well"
-             top="0"
-             width="35">
-        <!--
-Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
-xml attribute           Description
-image_unselected        "Unlit" - there are no new messages
-image_selected          "Unlit" + "Selected" - there are no new messages and the Well is open
-image_pressed           "Lit" - there are new messages
-image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
-             -->
-        <button
-                 auto_resize="false"
-                 follows="right"
-                 halign="center"
-                 height="23"
-                 image_overlay="Unread_IM"
-                 image_overlay_alignment="center"
-                 image_pressed="WellButton_Lit"
-                 image_pressed_selected="WellButton_Lit_Selected"
-                 image_selected="PushButton_Press"
-                 label_color="Black"
-                 left="0"
-                 name="Unread IM messages"
-                 tool_tip="Conversations"
-                 width="34">
-          <init_callback
-                     function="Button.SetDockableFloaterToggle"
-                     parameter="im_well_window" />
-        </button>
-      </chiclet_im_well>
-    </layout_panel>
-    <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         min_width="37"
          name="notification_well_panel"
          top="0"
          width="37">
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 d4a2745d1d..d4a2745d1d 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index 27c653bc35..27c653bc35 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
index 5b3f0b17a9..5b3f0b17a9 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
index cc0541e65c..cc0541e65c 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
index aa8e3d07a6..aa8e3d07a6 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/en/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
new file mode 100755
index 0000000000..4372cf69bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="left|top|right"
+ height="24"
+ layout="topleft"
+ name="conversation_list_item"
+ mouse_opaque="false"
+ width="120">
+    <avatar_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Person"
+     layout="topleft"
+     left="9"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     follows="top|left"
+     height="20"
+     default_icon_name="Generic_Group"
+     layout="topleft"
+     left="9"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     image_name="Nearby_chat_icon"
+     layout="topleft"
+     left="10"
+     name="nearby_chat_icon"
+     top="3"
+     visible="false"
+     width="20"/>
+    <layout_stack
+     animate="false"
+     follows="all"
+     height="24"
+     layout="topleft"
+     left="30"
+     mouse_opaque="false"
+     name="conversation_item_stack"
+     orientation="horizontal"
+     top="0"
+     width="90">
+        <layout_panel
+         auto_resize="false"
+         user_resize="false"        
+         height="24"
+         mouse_opaque="false"
+         name="call_icon_panel"
+         visible="false"
+         width="20">
+            <icon
+             height="18"
+             follows="top|right|left"
+             image_name="Conv_toolbar_open_call"
+             layout="topleft"
+             left="0"
+             name="selected_icon"
+             top="3"
+             width="18" />
+        </layout_panel>
+        <layout_panel
+         auto_resize="true"
+         user_resize="false"    
+         height="24"
+         mouse_opaque="false"
+         name="conversation_title_panel"
+         width="70">
+		    <text
+		     follows="left|top|right"
+		     font="SansSerifSmall"
+		     height="15"
+		     layout="topleft"
+		     left="5"
+		     name="conversation_title"
+		     parse_urls="false"
+		     top="6"
+		     use_ellipses="true"
+		     value="(loading)"
+		     width="35" />
+		    <output_monitor
+		     auto_update="true"
+		     follows="top|right"
+		     draw_border="false"
+		     height="16"
+		     layout="topleft"
+		     left_pad="5"
+ 		     mouse_opaque="true"
+ 		     name="speaking_indicator"
+ 		     visible="false"
+ 		     width="20" />
+        </layout_panel>
+    </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
new file mode 100755
index 0000000000..78d4c174d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="top|right|left"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="conversation_log_list_item"
+ top="0"
+ width="380">
+    <icon
+     height="24"
+     follows="top|right|left"
+     image_name="ListItem_Select"
+     layout="topleft"
+     left="0"
+     name="selected_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|right|left"
+     height="24"
+     image_name="ListItem_Over"
+     layout="topleft"
+     left="0"
+     name="hovered_icon"
+     top="0"
+     visible="false"
+     width="380" />
+    <icon
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     image_name="Conv_toolbar_open_call"
+     mouse_opaque="true"
+     name="voice_session_icon"
+     tool_tip="Included a voice conversation"
+     top="2"
+     visible="false"
+     width="20" />
+    <icon
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left="5"
+     image_name="Conv_log_inbox"
+     mouse_opaque="false"
+     name="unread_ims_icon"
+     tool_tip="Messages arrived while you were logged out"
+     top="2"
+     visible="false"
+     width="20" />
+    <avatar_icon
+     default_icon_name="Generic_Person"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <group_icon
+     default_icon_name="Generic_Group"
+     follows="top|left"
+     height="20"
+     layout="topleft"
+     mouse_opaque="true"
+     top="2"
+     visible="false"
+     width="20" />
+    <text
+     follows="left|right"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="conversation_name"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="180" />
+    <text
+     follows="right"
+     font="SansSerifSmall"
+     height="15"
+     layout="topleft"
+     left_pad="5"
+     name="date_time"
+     parse_urls="false"
+     top="6"
+     use_ellipses="true"
+     width="110"/>
+    <button
+     name="delete_btn"
+     tool_tip="Remove this entry"
+     layout="topleft"
+     follows="top|right"
+     image_unselected="Conv_toolbar_close"
+     image_selected="Conv_toolbar_close"
+     top="5"
+     left_pad="0"
+     height="14"
+     width="14"
+     tab_stop="false"/>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
index de2ff0afc9..de2ff0afc9 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
index 4b05ab27e4..4b05ab27e4 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 813aa5d7a9..813aa5d7a9 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
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 3509eaa285..3509eaa285 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
index f173a2f3cb..f173a2f3cb 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
index 8c0c543d71..8c0c543d71 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_hair.xml b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
index 6bb5d2fa9b..6bb5d2fa9b 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
index 0f8c37c691..0f8c37c691 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pants.xml b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
index dd749a9259..dd749a9259 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_physics.xml b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
index 0092ceb0dd..0092ceb0dd 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 0faa1598b1..553c112e6f 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -134,6 +134,7 @@
          top_pad="2"
          max_length="1023"
          name="pick_desc"
+         spellcheck="true"
          text_color="black"
          word_wrap="true" />
         <text
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 2c7c8133d1..2c7c8133d1 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index d295f5fe4a..d295f5fe4a 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
index 5424b805e1..5424b805e1 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
index 859e7454a4..859e7454a4 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skin.xml b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
index b61f65a3d1..b61f65a3d1 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
index 76d66cc5dc..76d66cc5dc 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_socks.xml b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
index 5f978174b3..5f978174b3 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
index 97f1a1a658..97f1a1a658 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
index 16f28377fb..16f28377fb 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
index 059485cfb4..059485cfb4 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_undershirt.xml
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 f34b913218..f34b913218 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/en/panel_generic_tip.xml b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
index eea92895f5..eea92895f5 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_generic_tip.xml
+++ b/indra/newview/skins/default/xui/en/panel_generic_tip.xml
diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
deleted file mode 100644
index ad10e53a4e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- follows="all"
- height="238"
- name="panel_im_control_panel"
- width="150">
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="238"
-     layout="topleft"
-     left="5"
-     name="vertical_stack"
-     orientation="vertical"
-     top="0"
-     width="145">
-        <layout_panel
-         auto_resize="true"
-         follows="top|left"
-         height="100"
-         layout="topleft"
-         min_height="0"
-         mouse_opaque="false"
-         width="145"
-         top="0"
-         name="speakers_list_panel">
-            <avatar_list
-             color="DkGray2"
-             follows="all"
-             height="100"
-             ignore_online_status="true"
-             layout="topleft"
-             name="speakers_list"
-             opaque="false"
-             show_info_btn="true"
-             show_profile_btn="false"
-             show_speaking_indicator="false"
-             width="145" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="group_info_btn_panel">
-            <button
-             follows="left|right|bottom"
-             height="23"
-             label="Group Profile"
-             name="group_info_btn"
-             use_ellipses="true"
-             top="5"
-             width="130" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="call_btn_panel">
-            <button
-             follows="all"
-             height="23"
-             label="Call Group"
-             name="call_btn"
-             use_ellipses="true" 
-             width="130" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Leave Call"
-             name="end_call_btn"
-             use_ellipses="true" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         width="130"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="all"
-             height="23"
-             label="Open Voice Controls"
-             name="voice_ctrls_btn"
-             use_ellipses="true" />
-        </layout_panel>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 38b680ba86..38b680ba86 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
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 206496cc0e..206496cc0e 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/en/panel_group_invite.xml b/indra/newview/skins/default/xui/en/panel_group_invite.xml
index cd834b61ce..124c0596c3 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_invite.xml
@@ -19,6 +19,10 @@
      name="already_in_group">
         Some Residents you chose are already in the group, and so were not sent an invitation.
     </panel.string>
+	<panel.string
+     name="invite_selection_too_large">
+		Group Invitations not sent: too many Residents selected. Group Invitations are limited to 100 per request.
+	</panel.string>
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
index d4da55e32e..d4da55e32e 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/en/panel_group_list_item.xml b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
index 12735026fa..cfe3aeb7c9 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_list_item.xml
@@ -56,6 +56,7 @@
      left_pad="3"
      right="-31"
      name="info_btn"
+     tool_tip="More info"
      tab_stop="false"
      top_delta="-2"
      width="16" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 607e1bb213..c8ce5cdebf 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -141,6 +141,7 @@ Maximum 200 per group daily
          max_length_bytes="63"
          name="create_subject"
          prevalidate_callback="ascii"
+         spellcheck="true"
          width="218" />
         <text
          follows="left|top"
@@ -161,6 +162,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
+         spellcheck="true"
          top_delta="0"
          width="218"
          word_wrap="true" />
@@ -200,14 +202,14 @@ Maximum 200 per group daily
             Drag and drop item here to attach it:
         </text>
         <icon
-         height="72"
+         height="48"
          image_name="DropTarget"
          layout="topleft"
          left_pad="10"
          mouse_opaque="true"
          name="drop_icon"
          top_delta="-10"
-         width="72" />
+         width="110" />
         <button
          follows="left|top"
          layout="topleft"
@@ -309,6 +311,7 @@ Maximum 200 per group daily
          left_pad="3"
          max_length_bytes="63"
          name="view_subject"
+         spellcheck="true"
          top_delta="-1"
          visible="false"
          width="200" />
@@ -333,6 +336,7 @@ Maximum 200 per group daily
          right="-1"
          max_length="511"
          name="view_message"
+         spellcheck="true"
          top_delta="-40"
          width="313"
          word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index cded4cf31a..cded4cf31a 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index eea2606125..df91ad8b5e 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -254,7 +254,7 @@ things in this group. There&apos;s a broad variety of Abilities.
          column_padding="0"
          draw_stripes="true"
          height="200"
-         follows="left|top"
+         follows="left|top|right"
          layout="topleft"
          left="0"
          right="-1"
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
index f7434f0330..f7434f0330 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_hint.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
index df05d50dc5..df05d50dc5 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_hint_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml
diff --git a/indra/newview/skins/default/xui/en/panel_hud.xml b/indra/newview/skins/default/xui/en/panel_hud.xml
index 3e9614a9b7..3e9614a9b7 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_hud.xml
+++ b/indra/newview/skins/default/xui/en/panel_hud.xml
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
deleted file mode 100644
index 8fcd6ccbaf..0000000000
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- height="300"
- name="panel_im_control_panel"
- width="150">
-    <avatar_icon
-     follows="left|top"
-     height="105"
-     left_delta="20"
-     name="avatar_icon"
-     top="-5"
-     width="114"/>
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="183"
-     layout="topleft"
-     left="5"
-     name="button_stack"
-     orientation="vertical"
-     top_pad="5"
-     width="145">
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="20"
-         layout="topleft"
-         left="2" 
-         min_height="20"
-         width="140"
-         name="view_profile_btn_panel"
-         top="0" >
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Profile"
-             name="view_profile_btn"
-             top="0"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="add_friend_btn_panel">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Add Friend"
-             name="add_friend_btn"
-             top="5"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="teleport_btn_panel">
-        <button
-             auto_resize="false"
-             follows="left|top|right"
-             height="23"
-             label="Teleport"
-             name="teleport_btn"
-             tool_tip = "Offer to teleport this person"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="share_btn_panel">
-           <button
-             auto_resize="true"
-             follows="left|top|right"
-             height="23"
-             label="Share"
-             name="share_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="pay_btn_panel">
-           <button
-             auto_resize="true"
-             follows="left|top|right"
-             height="23"
-             label="Pay"
-             name="pay_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="call_btn_panel">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Call"
-             name="call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="end_call_btn_panel"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="End Call"
-             name="end_call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="voice_ctrls_btn_panel"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Voice Controls"
-             name="voice_ctrls_btn"
-             width="140" />
-        </layout_panel>
-      <layout_panel
-       mouse_opaque="false"
-       auto_resize="true"
-       follows="top|left"
-       height="0"
-       layout="topleft"
-       min_height="0"
-       width="140"
-       name="spacer"/>
-    </layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
index 413e22e444..433a3181cd 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml
@@ -2,7 +2,7 @@
 <inbox_inventory_panel
     accepts_drag_and_drop="false"
     name="inventory_inbox"
-    start_folder="Received Items"
+    start_folder.type="inbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 2e5d650902..2e5d650902 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/en/panel_inventory_item.xml b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
index 2e38835810..2e38835810 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_inventory_item.xml
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 fd6e96b9a7..fd6e96b9a7 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index 2a5933e3e9..67a09949ce 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -35,7 +35,9 @@
              left="0"
              mouse_opaque="true"
              name="favorites_list"
-             start_folder="Favorites"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="Favorites"
              width="307"/>
         </accordion_tab>
         <accordion_tab
@@ -51,7 +53,9 @@
              left="0"
              mouse_opaque="true"
              name="landmarks_list"
-             start_folder="Landmarks"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="Landmarks"
              width="307"/>
         </accordion_tab>
         <accordion_tab
@@ -67,7 +71,9 @@
              left="0"
              mouse_opaque="true"
              name="my_inventory_list"
-             start_folder="My Inventory"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="My Inventory"
              width="307"/>
           </accordion_tab>
           <accordion_tab
@@ -83,7 +89,9 @@
              left="0"
              mouse_opaque="true"
              name="library_list"
-             start_folder="LIBRARY"
+             scroll.hide_scrollbar="true"
+             folder_view.use_ellipses="true"
+             start_folder.name="LIBRARY"
              width="313"/>
         </accordion_tab>
     </accordion>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 223326dd06..134ca75018 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -1,216 +1,265 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-follows="all"
-height="600"
-layout="topleft"
-left="0"
-name="panel_login"
-focus_root="true" 
-top="600"
- width="996">
-<panel.string
-     name="create_account_url">
-       http://join.secondlife.com/
-</panel.string>
-<string name="reg_in_client_url" translate="false">
-     http://secondlife.eniac15.lindenlab.com/reg-in-client/
-</string>
-<panel.string
-     name="forgot_password_url">
-       http://secondlife.com/account/request.php
-</panel.string>
-<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
-<web_browser
-  tab_stop="false" 
-  trusted_content="true" 
-  bg_opaque_color="Black"
-  border_visible="false"
-  bottom="600"
-  follows="all"
-  left="0"
-  name="login_html"
-  start_url=""
-  top="0"
-  height="600"
-  width="980"/>
-<layout_stack
-follows="left|bottom|right"
-name="login_widgets"
-layout="topleft"
-orientation="horizontal"
-top="519"
-width="996"
-height="80">
-<layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="login"
-layout="topleft"
-width="705"
-min_width="705"
-height="80">
-<text
-follows="left|bottom"
-font="SansSerifSmall"
-height="16"
-name="username_text"
-top="20"
-left="20"
-width="150">
-Username:
-</text>
-<combo_box
-allow_text_entry="true"
-follows="left|bottom"
-height="22"
-left_delta="0"
-max_chars="128"
-combo_editor.prevalidate_callback="ascii"
-tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
-top_pad="0"
-name="username_combo"
-width="178">
-  <combo_box.combo_button
-   visible ="false"/>
-  <combo_box.drop_down_button
-   visible ="false"/>
-</combo_box>
-<text
-follows="left|bottom"
-font="SansSerifSmall"
-height="15"
-left_pad="-19"
-name="password_text"
-top="20"
-    width="150">
-       Password:
-</text>
-<line_editor
-follows="left|bottom"
-  height="22"
-  max_length_bytes="16"
-name="password_edit"
-is_password="true" 
-select_on_focus="true"
-  top_pad="0"
-  width="135" />
- <check_box
-control_name="RememberPassword"
-follows="left|bottom"
-font="SansSerifSmall"
-height="16"
-label="Remember password"
-  top_pad="3"
-  name="remember_check"
- width="135" />
-<button
-  follows="left|bottom"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="connect_btn"
-  top="35"
-  width="90" />
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="8"
-  name="start_location_text"
-  top="20"
-  width="130">
-       Start at:
- </text>
-<combo_box
-allow_text_entry="true"
-control_name="NextLoginLocation"
-  follows="left|bottom"
-  height="23"
-max_chars="128"
-top_pad="0"
-name="start_location_combo"
-     width="165">
-<combo_box.item
-label="My last location"
-name="MyLastLocation"
-         value="last" />
-<combo_box.item
-label="My home"
-name="MyHome"
-         value="home" />
-<combo_box.item
-label="&lt;Type region name&gt;"
-name="Typeregionname"   value="" />
-</combo_box>
-<combo_box
-allow_text_entry="true"
-font="SansSerifSmall"
-   follows="left|right|bottom"
-   height="23"
-   max_chars="256"
-layout="topleft"
-top_pad="2"
-name="server_combo"
-width="135"
-  visible="false" />
-</layout_panel>
-<layout_panel
-tab_stop="false"
-follows="right|bottom"
-name="links"
-width="205"
-min_width="205"
-height="80">
-   <text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-top="12"
-right="-10"
-name="create_new_account_text"
-  width="200">
-       Sign up
- </text>
-<text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-name="forgot_password_text"
-top_pad="12"
-right="-10"
-  width="200">
-       Forgot your username or password?
-</text>
-<text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-name="login_help"
-top_pad="2"
-right="-10"
-    width="200">
-       Need help logging in?   </text>
-<!--  <text
-    follows="right|bottom"
-    font="SansSerifSmall"
-    halign="right"
-    height="28"
-    top_pad="2"
-    name="channel_text"
-    width="180"
-    word_wrap="true">
-       [VERSION]
-   </text>-->
-   </layout_panel>
-</layout_stack>
+    follows="all"
+    height="600"
+    layout="topleft"
+    left="0"
+    name="panel_login"
+    focus_root="true" 
+    top="600"
+    width="1130">
+  <string name="reg_in_client_url" translate="false">
+    http://secondlife.eniac15.lindenlab.com/reg-in-client/
+  </string>
+  <panel.string
+      name="forgot_password_url">
+    http://secondlife.com/account/request.php
+  </panel.string>
+  <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
+  <web_browser
+      tab_stop="false" 
+      trusted_content="true" 
+      bg_opaque_color="Black"
+      border_visible="false"
+      bottom="600"
+      follows="all"
+      left="0"
+      name="login_html"
+      start_url=""
+      top="0"
+      height="600"
+      width="996"/>
+  <layout_stack
+      animate="false"
+      clip="false"
+      follows="left|bottom|right"
+      name="login_widgets"
+      layout="topleft"
+      orientation="horizontal"
+      top="519"
+      width="1130"
+      height="80">
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="login"
+        layout="topleft"
+        width="310"
+        min_width="310"
+        height="80">
+      <text
+          follows="left|bottom"
+          font="SansSerif"
+          font.style="BOLD"
+          font.size="Large"
+          height="16"
+          name="log_in_text"
+          top="8"
+          left="15"
+          width="150">
+        LOG IN
+      </text>
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          name="username_text"
+          top="35"
+          left="15"
+          width="150">
+        Username:
+      </text>
+      <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+           with focus in this combo_box, we can use commit action to initiate
+           login -->
+      <combo_box
+          allow_text_entry="true"
+          follows="left|bottom"
+          height="22"
+          left_delta="0"
+          max_chars="128"
+          commit_on_focus_lost="false"
+          combo_editor.prevalidate_callback="ascii"
+          tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+          top_pad="0"
+          name="username_combo"
+          width="178">
+<!-- empirically, displayed width is 150 anyway?!? -->
+        <combo_box.combo_button
+            visible ="false"/>
+        <combo_box.drop_down_button
+            visible ="false"/>
+      </combo_box>
+<!-- left="175" based on actual "username_combo" width of 150 vs. 178 -->
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          name="password_text"
+          top="35"
+          left="175"
+          width="150">
+        Password:
+      </text>
+      <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter
+           with focus in this line_editor, we can use commit action to
+           initiate login -->
+      <line_editor
+          follows="left|bottom"
+          height="22"
+          max_length_bytes="16"
+          name="password_edit"
+          is_password="true" 
+          select_on_focus="true"
+          commit_on_focus_lost="false"
+          top_pad="0"
+          width="135" />
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="start_location_panel"
+        layout="topleft"
+        width="175"
+        min_width="175"
+        height="80">
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          left="10"
+          name="start_location_text"
+          top="35"
+          width="130">
+        Start at:
+      </text>
+      <combo_box
+          allow_text_entry="true"
+          control_name="NextLoginLocation"
+          follows="left|bottom"
+          height="22"
+          max_chars="128"
+          top_pad="0"
+          name="start_location_combo"
+          width="165">
+        <combo_box.item
+            label="My last location"
+            name="MyLastLocation"
+            value="last" />
+        <combo_box.item
+            label="My home"
+            name="MyHome"
+            value="home" />
+        <combo_box.item
+            label="&lt;Type region name&gt;"
+            name="Typeregionname"   value="" />
+      </combo_box>
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="grid_panel"
+        layout="topleft"
+        width="145"
+        height="80"
+        visible="false">
+      <combo_box
+          allow_text_entry="false"
+          font="SansSerifSmall"
+          follows="left|right|bottom"
+          height="23"
+          max_chars="256"
+          left="10"
+          top="51"
+          layout="topleft"
+          top_pad="2"
+          name="server_combo"
+          width="135" />
+    </layout_panel>
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="links_login_panel"
+        layout="topleft"
+        width="290"
+        height="80">
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          text_color="EmphasisColor"
+          left="10"
+          height="16"
+          name="login_help"
+          top="19"
+          width="280">
+        Need help logging in?
+      </text>
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          text_color="EmphasisColor"
+          height="16"
+          name="forgot_password_text"
+          top="35"
+          width="280">
+        Forgot your username or password?
+      </text>
+      <button
+          follows="left|bottom"
+          top_pad="0"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Log In"
+          label_color="White"
+          layout="topleft"
+          name="connect_btn"
+          width="90" />
+      <check_box
+          control_name="RememberPassword"
+          follows="left|bottom"
+          font="SansSerifSmall"
+          left="110"
+          top="56"
+          height="16"
+          label="Remember password"
+          top_pad="3"
+          name="remember_check"
+          width="145" />
+    </layout_panel>
+    <layout_panel
+        tab_stop="false"
+        follows="right|bottom"
+        name="links" 
+        width="210"
+        min_width="100"
+        height="80">
+      <text
+          follows="right|bottom"
+          font="SansSerif"
+          font.style="BOLD"
+          font.size="Large"
+          halign="right"
+          height="16"
+          name="create_account_text"
+          top="8"
+          right="-15"
+          width="200">
+        CREATE YOUR ACCOUNT
+      </text>
+      <button
+          follows="right|bottom"
+          top="35"
+          right="-15"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Start now"
+          label_color="White"
+          layout="topleft"
+          left_pad="10"
+          name="create_new_account_btn"
+          width="90" />
+    </layout_panel>
+  </layout_stack>
 </panel>
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 1c882bb099..1c882bb099 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/en/panel_me.xml b/indra/newview/skins/default/xui/en/panel_me.xml
index 23e7814cad..23e7814cad 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_me.xml
+++ b/indra/newview/skins/default/xui/en/panel_me.xml
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index cdf14572fe..e844a15118 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -30,7 +30,7 @@
     (This page does not pass the specified whitelist)
   </text>
   <line_editor 
-   max_length="1024"
+   max_length_bytes="1024"
    bottom_delta="-24" 
    enabled="true" 
    follows="left|top" 
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
index d3a58fed58..d3a58fed58 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 1f580831f9..1f580831f9 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
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 3edeb9aa36..c7edba21f8 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -87,6 +87,7 @@
 	         direction="down"
 	         height="23"
 	         image_overlay="Arrow_Left_Off"
+	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
 	         left="10"
@@ -99,6 +100,7 @@
 	         direction="down"
 	         height="23"
 	         image_overlay="Arrow_Right_Off"
+	         image_hover_unselected="PushButton_Over"
 	         image_bottom_pad="1"
 	         layout="topleft"
 	         left_pad="0"
@@ -111,6 +113,7 @@
 	         height="23"
 	         image_bottom_pad="1"
 	         image_overlay="Home_Off"
+	         image_hover_unselected="PushButton_Over"
 	         layout="topleft"
 	         left_pad="7"
 	         name="home_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
index d683116eb8..4de56b424e 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
  follows="all"
- height="300"
+ top="0"
+ bottom_delta="10"
  help_topic="nearby_chat"
  layout="topleft"
  name="nearby_chat"
- width="320">
+ width="242"
+ height="169">
   <layout_stack
    follows="all"
-   height="295"
+   height="164"
    layout="topleft"
    left="0"
    name="stack"
    top="5"
    orientation="vertical"
-   width="320">
+   width="242">
     <layout_panel
      auto_resize="false"
      height="26"
@@ -23,7 +25,7 @@
      name="translate_chat_checkbox_lp"
      top_delta="0"
      visible="true"
-     width="313">
+     width="230">
       <check_box
        top="10"
        control_name="TranslateChat"
@@ -33,15 +35,15 @@
        layout="topleft"
        left="5"
        name="translate_chat_checkbox"
-       width="300" />
+       width="230" />
     </layout_panel>
     <layout_panel
      auto_resize="true"
-     height="277"
+     height="138"
      left_delta="0"
      layout="topleft"
      name="chat_history_lp"
-     width="318">
+     width="242">
       <chat_history
        bg_readonly_color="ChatHistoryBgColor"
        bg_writeable_color="ChatHistoryBgColor"
@@ -49,7 +51,7 @@
        layout="topleft"
        left="5"
        left_widget_pad="0"
-       height="272"
+       height="138"
        name="chat_history"
        parse_highlights="true"
        parse_urls="true"
@@ -57,7 +59,7 @@
        text_color="ChatHistoryTextColor"
        text_readonly_color="ChatHistoryTextColor"
        top="0"
-       width="313" />
+       width="237" />
     </layout_panel>
   </layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index 21c627cdfb..19143cef89 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -5,7 +5,7 @@
  height="25"
  layout="topleft"
  left="0"
- name="chat_bar"
+ name="nearby_chat"
  top="21"
  width="308">
     <line_editor
@@ -19,6 +19,7 @@
      left="0"
      max_length_bytes="1023"
      name="chat_box"
+     spellcheck="true"
      text_pad_left="5"
      text_pad_right="25"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
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 d1cb64f7ad..d1cb64f7ad 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 94c468e1bb..94c468e1bb 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
diff --git a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
index c3dc588ba2..c3dc588ba2 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/en/panel_notifications_channel.xml
diff --git a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
index d5b6057233..d5b6057233 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/en/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
index dadbd9c9ab..dadbd9c9ab 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
index a3d39e55af..c80e5b168a 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outbox_inventory.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_inventory_panel
+<inventory_panel
     name="inventory_outbox"
-    start_folder="Outbox"
+    start_folder.name="Outbox"
+    show_empty_message="false"
+    show_load_status="false"
+    start_folder.type="outbox"
     follows="all" layout="topleft"
     top="0" left="0" height="165" width="308"
     top_pad="0"
@@ -12,6 +15,18 @@
     bevel_style="none"
     show_item_link_overlays="true"
     tool_tip="Drag and drop items here to prepare them for sale on your storefront"
-    >
-    <scroll reserve_scroll_corner="false" />
-</outbox_inventory_panel>
+    scroll.reserve_scroll_corner="false">
+      <folder folder_arrow_image="Folder_Arrow"
+              folder_indentation="8"
+              item_height="20"
+              item_top_pad="4"
+              selection_image="Rounded_Square"
+              left_pad="5"
+              icon_pad="2"
+              icon_width="16"
+              text_pad="1"
+              text_pad_right="4"
+              arrow_size="12"
+              max_folder_item_overlap="2"/>
+      <item allow_open="false"/>
+</inventory_panel>
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 b61f110e32..b61f110e32 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
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 405d9513db..405d9513db 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
index 2c7a51f0e7..2c7a51f0e7 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory_gear_default.xml
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 a0096adc01..a0096adc01 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
index d85b778db2..d85b778db2 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 98c7c49ff4..3caf2b3d7e 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -38,12 +38,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      name="no_filtered_friends_msg">
          Didn't find what you're looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
     </string>
-    <string
-     name="people_filter_label"
-     value="Filter People" />
-    <string
-     name="groups_filter_label"
-     value="Filter Groups" />
      <!--
      *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes.
      They are not defined as translatable in VLT. See EXT-5931
@@ -60,21 +54,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
 	<string
 	 name="AltMiniMapToolTipMsg"
 	 value="[REGION](Double-click to teleport, shift-drag to pan)"/>
-	<filter_editor
-     follows="left|top|right"
-     height="23"
-     layout="topleft"
-     left="10"
-     label="Filter"
-     max_length_chars="300"
-     name="filter_input"
-     text_color="Black"
-     text_pad_left="10"
-     top="3"
-     width="303" />
     <tab_container
+     bottom="-10"
      follows="all"
-     height="383"
      layout="topleft"
      left="3"
      name="tabs"
@@ -82,31 +64,121 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      tab_min_width="70"
      tab_height="30"
      tab_position="top"
-     top_pad="10"
+     top="0"
      halign="center"
-     width="319">
-     	<panel
+     right="-5"
+     use_highlighting_on_hover="true">
+
+<!-- ================================= NEARBY tab =========================== -->
+
+        <panel
          background_opaque="true"
          background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
          label="NEARBY"
          layout="topleft"
          left="0"
          help_topic="people_nearby_tab"
          name="nearby_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
+            <panel
+             follows="left|top|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="nearby_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter People"
+                 max_length_chars="300"
+                 name="nearby_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="178" />
+                <button
+                 commit_callback.function="People.Gear"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="7"
+                 name="gear_btn"
+                 tool_tip="Actions on selected person"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_nearby_view.xml"
+                 menu_position="bottomleft"
+                 name="nearby_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="add_friend_btn"
+                 tool_tip="Offer friendship to a resident"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriend" />
+                </button>
+                <dnd_button
+                 enabled="false"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="nearby_del_btn"
+                 tool_tip="Remove selected person as a friend"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                 </dnd_button>
+            </panel>
          <layout_stack
            clip="false"
            follows="all"
-           height="355"
+           height="410"
            layout="topleft"
+           left="0"
            mouse_opaque="false"
            orientation="vertical"
-           width="313">
+           right="-1"
+           top_pad="0">
            <layout_panel
              height="142"
              layout="topleft"
@@ -123,16 +195,16 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                left="3"
                mouse_opaque="false"
                name="Net Map"
-               top="4"
-               width="305"/>
+               right="-1"
+               top="4" />
            </layout_panel>
            <layout_panel
              height="213"
              layout="topleft"
              min_dim="100"
              mouse_opaque="false"
-             user_resize="true"
-             width="313">
+             right="-1"
+             user_resize="true">
              <avatar_list
                allow_select="true"
                follows="all"
@@ -143,84 +215,122 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                keep_one_selected="false"
                multi_select="true"
                name="avatar_list"
-               top="2"
-               width="306" />
+               right="-1"
+               top="2" />
            </layout_panel>
          </layout_stack>
-         <panel
-             background_visible="true"
-             follows="left|right|bottom"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-             <menu_button
-             follows="bottom|left"
-             height="25"
-             image_hover_unselected="Toolbar_Left_Over"
-             image_overlay="OptionsMenu_Off"
-             image_selected="Toolbar_Left_Selected"
-             image_unselected="Toolbar_Left_Off"
-             layout="topleft"
-             left="0"
-             name="nearby_view_sort_btn"
-             tool_tip="Options"
-             top="1"
-             width="31" />
-             <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
-                 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_friend_btn"
-                 tool_tip="Add selected Resident to your friends List"
-                 width="31">
-               <commit_callback
-                  function="People.addFriend" />
-             </button>
-             <icon
-             follows="bottom|left|right"
-             height="25"
-             image_name="Toolbar_Right_Off"
-             layout="topleft"
-             left_pad="1"
-             name="dummy_icon"
-             width="243"
-             />
-            </panel>
         </panel>
+
+<!-- ================================= FRIENDS tab ========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
-         label="MY FRIENDS"
+         label="FRIENDS"
          layout="topleft"
          left="0"
          help_topic="people_friends_tab"
          name="friends_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
+            <panel
+             follows="left|top|right"
+             height="27"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="friends_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter People"
+                 max_length_chars="300"
+                 name="friends_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="177" />
+                <button
+                 commit_callback.function="People.Gear"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="8"
+                 name="gear_btn"
+                 tool_tip="Actions on selected person"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_friends_view.xml"
+                 menu_position="bottomleft"
+                 name="friends_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="AddItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 name="friends_add_btn"
+                 tool_tip="Offer friendship to a resident"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.AddFriendWizard" />
+                </button>
+                <dnd_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="friends_del_btn"
+                 tool_tip="Remove selected person as a friend"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                </dnd_button>
+            </panel>
             <accordion
        		 background_visible="true"
        		 bg_alpha_color="DkGray2"
        		 bg_opaque_color="DkGray2"
              follows="all"
-             height="356"
+             height="408"
              layout="topleft"
              left="3"
              name="friends_accordion"
-             top="0"
-             width="307">
+             right="-2"
+             top_pad="2">
                 <accordion_tab
                  layout="topleft"
                  height="172"
@@ -256,248 +366,163 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                          top="0"
                          width="307" />
                 </accordion_tab>
-            </accordion>
-            <panel
-             background_visible="true"
-             follows="left|right|bottom"
-             height="27"
-             label="bottom_panel"
-             layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-             
-             	  <layout_stack
-				   animate="false"
-				   border_size="0"
-				   follows="left|right|bottom"
-				   height="25"
-				   layout="topleft"
-				   orientation="horizontal"
-				   top_pad="1"
-				   left="0"
-				   name="bottom_panel"
-				   width="308">
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="options_gear_btn_panel"
-				       width="32">
-				          <menu_button
-				           follows="bottom|left"
-				           tool_tip="Show additional options"
-				           height="25"
-				           image_hover_unselected="Toolbar_Left_Over"
-				           image_overlay="OptionsMenu_Off"
-				           image_selected="Toolbar_Left_Selected"
-				           image_unselected="Toolbar_Left_Off"
-				           layout="topleft"
-				           left="0"
-				           name="friends_viewsort_btn"
-				           top="0"
-				           width="31" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="add_btn_panel"
-				       width="32">
-				          <button
-				           follows="bottom|left"
-				           height="25"
-				           image_hover_unselected="Toolbar_Middle_Over"
-				           image_overlay="AddItem_Off"
-				           image_selected="Toolbar_Middle_Selected"
-				           image_unselected="Toolbar_Middle_Off"
-				           layout="topleft"
-				           left="0"
-				           name="add_btn"
-				           tool_tip="Offer friendship to a Resident"
-				           top="0"
-				           width="31" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="true"
-				       height="25"
-				       layout="topleft"
-				       name="dummy_panel"
-				       width="210">
-				          <icon
-				           follows="bottom|left|right"
-				           height="25"
-				           image_name="Toolbar_Middle_Off"
-				           layout="topleft"
-				           left="0"
-				           top="0"
-				           name="dummy_icon"
-				           width="210" />
-				      </layout_panel>
-				      <layout_panel
-				       auto_resize="false"
-				       height="25"
-				       layout="topleft"
-				       name="trash_btn_panel"
-				       width="31">
-				          <dnd_button
-				           follows="bottom|left"
-				           height="25"
-				           image_hover_unselected="Toolbar_Right_Over"
-				           image_overlay="TrashItem_Off"
-				           image_selected="Toolbar_Right_Selected"
-				           image_unselected="Toolbar_Right_Off"
-				           left="0"
-				           layout="topleft"
-				           name="del_btn"
-				           tool_tip="Remove selected person from your Friends list"
-				           top="0"
-				           width="31"/>
-				      </layout_panel>
-				  </layout_stack><!--
-             
-               <button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
+              <accordion_tab
                layout="topleft"
-               left="0"
-               name="friends_viewsort_btn"
-               top="1"
-               width="31" />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Middle_Over"
-             	 image_overlay="AddItem_Off"
-             	 image_selected="Toolbar_Middle_Selected"
-             	 image_unselected="Toolbar_Middle_Off"
-                 layout="topleft"
-                 left_pad="1"
-                 name="add_btn"
-                 tool_tip="Offer friendship to a Resident"
-                 width="31" />
-                <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Middle_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="209"
-             />
-                <button
-                 follows="bottom|left"
-                 height="25"
-                 image_hover_unselected="Toolbar_Right_Over"
-                 image_overlay="TrashItem_Off"
-                 image_selected="Toolbar_Right_Selected"
-                 image_unselected="Toolbar_Right_Off"
+               height="173"
+               name="tab_suggested_friends"
+               title="People you may want to friend">
+                <avatar_list
+                 ignore_online_status="true"
+                 allow_select="true"
+                 follows="all"
+                 height="173"
                  layout="topleft"
-                 left_pad="1"
-                 name="del_btn"
-                 tool_tip="Remove selected person from your Friends list"
-                 width="31" />
-            --></panel>
+                 left="0"
+                 name="suggested_friends"
+                 show_permissions_granted="true"
+                 top="0"
+                 width="307" />
+              </accordion_tab>              
+            </accordion>
             <text
              follows="all"
              height="450"
              left="13"
              name="no_friends_help_text"
-             top="10"
-             width="293"
+             right="-13"
+             top="37"
              wrap="true" />
         </panel>
+
+<!-- ================================= GROUPS tab =========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
          bg_alpha_color="DkGray"
          bg_opaque_color="DkGray"
+         bottom="-1"
          follows="all"
-         height="383"
-         label="MY GROUPS"
+         label="GROUPS"
          layout="topleft"
          left="0"
          help_topic="people_groups_tab"
          name="groups_panel"
-         top="0"
-         width="313">
+         right="-1"
+         top="0">
     <!--
      *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931
      Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()
     -->
-            <group_list
-             allow_select="true" 
-             follows="all"
-             height="356"
-             layout="topleft"
-             left="3"
-             name="group_list"
-             top="0"
-             width="307" />
             <panel
-             background_visible="true"
-             follows="left|right|bottom"
+             follows="left|top|right"
              height="27"
              label="bottom_panel"
              layout="topleft"
              left="0"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-               <menu_button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               left="3"
-               name="groups_viewsort_btn"
-               top="1"
-               width="31" />
-                <button
-                 follows="bottom|left"
+             name="groups_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter Groups"
+                 max_length_chars="300"
+                 name="groups_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="177" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="8"
+                 name="groups_gear_btn"
+                 tool_tip="Actions on selected group"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_groups_view.xml"
+                 menu_position="bottomleft"
+                 name="groups_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <menu_button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
+                 left_pad="2"
+                 menu_filename="menu_group_plus.xml"
+                 menu_position="bottomleft"
                  name="plus_btn"
                  tool_tip="Join group/Create new group"
-                 width="31" />
-                <button
-                 follows="bottom|left"
+                 top_delta="0"
+                 width="31">
+                    <validate_callback
+                     function="People.Group.Plus.Validate" />
+                </menu_button>
+                <dnd_button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
-                 image_overlay="Activate_Checkmark"
+                 image_overlay="TrashItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
                  layout="topleft"
-                 left_pad="1"
-                 name="activate_btn"
-                 tool_tip="Activate selected group"
-                 width="31" />
-                 <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Right_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="212"
-             />
+                 name="minus_btn"
+                 tool_tip="Leave selected group"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.Group.Minus" />
+                </dnd_button>
             </panel>
+            <text
+                type="string"
+                length="1"
+                follows="left|top|right"
+                height="14"
+                layout="topleft"
+                right="-10"
+                top_pad="4"
+                left="3"
+                name="groupcount">
+              You belong to [COUNT] groups, and can join [REMAINING] more.
+            </text>
+            <group_list
+             allow_select="true" 
+             follows="all"
+             height="388"
+             layout="topleft"
+             left="3"
+             name="group_list"
+             right="-2"
+             top_pad="4" />
         </panel>
+
+<!-- ================================= RECENT tab =========================== -->
+
         <panel
          background_opaque="true"
        background_visible="true"
@@ -510,265 +535,133 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
          left="0"
          help_topic="people_recent_tab"
          name="recent_panel"
-         top="0"
-         width="313">
-            <avatar_list
-             allow_select="true"
-             follows="all"
-             height="356"
-             layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             show_last_interaction_time="true"
-             top="0"
-             width="307" />
+         right="-1"
+         top="0">
             <panel
-             background_visible="true"
-             follows="left|right|bottom"
+             follows="left|top|right"
              height="27"
              label="bottom_panel"
              layout="topleft"
-             left="3"
-             name="bottom_panel"
-             top_pad="0"
-             width="313">
-               <menu_button
-               follows="bottom|left"
-               tool_tip="Options"
-               height="25"
-               image_hover_unselected="Toolbar_Left_Over"
-               image_overlay="OptionsMenu_Off"
-               image_selected="Toolbar_Left_Selected"
-               image_unselected="Toolbar_Left_Off"
-               layout="topleft"
-               name="recent_viewsort_btn"
-               top="1"
-               width="31" />
-              <button
-                 follows="bottom|left"
+             left="0"
+             name="recent_buttons_panel"
+             right="-1"
+             top="0">
+                <filter_editor
+                 follows="left|top|right"
+                 height="23"
+                 layout="topleft"
+                 left="6"
+                 label="Filter People"
+                 max_length_chars="300"
+                 name="recent_filter_input"
+                 text_color="Black"
+                 text_pad_left="10"
+                 top="4"
+                 width="177" />
+                <button
+                 commit_callback.function="People.Gear"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="OptionsMenu_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="8"
+                 name="gear_btn"
+                 tool_tip="Actions on selected person"
+                 top="3"
+                 width="31" />
+                <menu_button
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="Conv_toolbar_sort"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 layout="topleft"
+                 left_pad="2"
+                 menu_filename="menu_people_recent_view.xml"
+                 menu_position="bottomleft"
+                 name="recent_view_btn"
+                 tool_tip="View/sort options"
+                 top_delta="0"
+                 width="31" />
+                <button
+                 follows="right"
                  height="25"
                  image_hover_unselected="Toolbar_Middle_Over"
                  image_overlay="AddItem_Off"
                  image_selected="Toolbar_Middle_Selected"
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
-                 left_pad="1"
+                 left_pad="2"
                  name="add_friend_btn"
-                 tool_tip="Add selected Resident to your friends List"
+                 tool_tip="Offer friendship to a resident"
+                 top_delta="0"
                  width="31">
-                <commit_callback
-                   function="People.addFriend" />
-              </button>
-              <icon
-             	 follows="bottom|left|right"
-             	 height="25"
-             	 image_name="Toolbar_Right_Off"
-             	 layout="topleft"
-             	 left_pad="1"
-             	 name="dummy_icon"
-             	 width="244"
-             />
+                    <commit_callback
+                     function="People.AddFriend" />
+                </button>
+                <dnd_button
+                 enabled="false"
+                 follows="right"
+                 height="25"
+                 image_hover_unselected="Toolbar_Middle_Over"
+                 image_overlay="TrashItem_Off"
+                 image_selected="Toolbar_Middle_Selected"
+                 image_unselected="Toolbar_Middle_Off"
+                 left_pad="2"
+                 layout="topleft"
+                 name="recent_del_btn"
+                 tool_tip="Remove selected person as a friend"
+                 top_delta="0"
+                 width="31">
+                    <commit_callback
+                     function="People.DelFriend" />
+                 </dnd_button>
             </panel>
+            <avatar_list
+             allow_select="true"
+             follows="all"
+             height="351"
+             layout="topleft"
+             left="3"
+             multi_select="true"
+             name="avatar_list"
+             show_last_interaction_time="true"
+             right="-2"
+             top_pad="4" />
         </panel>
-    </tab_container>
-    <panel
-     follows="bottom|left|right"
-     height="23"
-     layout="topleft"
-     left="8"
-     top_pad="4"
-     name="button_bar"
-     width="313">
 
-<!--********************************Profile; IM; Call, Share, Teleport********************************--> 	
-     	<layout_stack
-     	follows="bottom|left|right"
-		height="23"
-		layout="topleft"
-		name="bottom_bar_ls"
-		left="0"
-		orientation="horizontal"
-		top_pad="0"
-		width="313">
+<!-- ================================= BLOCKED tab ========================== -->
 
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left="0"
-			name="view_profile_btn_lp"
-		    auto_resize="true"
-			width="68">
-				<button
-		         follows="bottom|left|right"
-		         height="23"
-		         label="Profile"
-		         layout="topleft"
-		         left="1"
-		         name="view_profile_btn"
-		         tool_tip="Show picture, groups, and other Residents information"
-		         top="0"
-		         width="67" />	
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="im_btn_lp"
-		    auto_resize="true"
-			width="41">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="IM"
-		         layout="topleft"
-		         name="im_btn"
-		         tool_tip="Open instant message session"
-		         top="0"
-		         width="40" />			
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="call_btn_lp"
-		    auto_resize="true"
-			width="52">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Call"
-		         layout="topleft"
-		         name="call_btn"
-		         tool_tip="Call this Resident"
-		         top="0"
-		         width="51" />		
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="share_btn_lp"
-		    auto_resize="true"
-			width="66">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Share"
-		         layout="topleft"
-		         name="share_btn"
-		         tool_tip="Share an inventory item"
-		         top="0"
-		         width="65" />	
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			name="teleport_btn_lp"
-		    auto_resize="true"
-			width="77">
-				<button
-		         follows="bottom|left|right"
-		         left="1"
-		         height="23"
-		         label="Teleport"
-		         layout="topleft"
-		         name="teleport_btn"
-		         tool_tip="Offer teleport"
-		         top="0"
-		         width="76" />		
-			</layout_panel>
-		</layout_stack>
-		
-<!--********************************Group Profile; Group Chat; Group Call buttons************************-->			
-		<layout_stack
-     	follows="bottom|left|right"
-		height="23"
-		layout="topleft"
-		mouse_opaque="false"
-		name="bottom_bar_ls1"
-		left="0"
-		orientation="horizontal"
-		top="0"
-		width="313">	
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left="0"			
-			mouse_opaque="false"
-			name="group_info_btn_lp"
-		    auto_resize="true"
-			width="108">
-				<button
-		        follows="bottom|left|right"
-		        left="1"
-		        height="23"
-		        label="Group Profile"
-		        layout="topleft"
-				mouse_opaque="false"
-		        name="group_info_btn"
-		        tool_tip="Show group information"
-		        top="0"
-		        width="107" />		
-			</layout_panel>
-			
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			mouse_opaque="false"
-			name="chat_btn_lp"
-		    auto_resize="true"
-			width="101">
-				<button
-		        follows="bottom|left|right"
-		        left="1"
-		        height="23"
-		        label="Group Chat"
-		        layout="topleft"
-				mouse_opaque="false"
-		        name="chat_btn"
-		        tool_tip="Open chat session"
-		        top="0"
-		        width="100" />			
-			</layout_panel>
-		
-			<layout_panel
-			follows="bottom|left|right"
-			height="23"
-			layout="bottomleft"
-			left_pad="3"
-			mouse_opaque="false"
-			name="group_call_btn_lp"
-		    auto_resize="true"
-			width="96">
-				<button
-				follows="bottom|left|right"
-				left="1"
-				height="23"
-         		label="Group Call"
-         		layout="topleft"
-				mouse_opaque="false"
-         		name="group_call_btn"
-         		tool_tip="Call this group"
-		        top="0"
-         		width="95" />			
-			</layout_panel>		
-		</layout_stack>
-    </panel>
+        <panel
+         background_opaque="true"
+         background_visible="true"
+         bg_alpha_color="DkGray"
+         bg_opaque_color="DkGray"
+         follows="all"
+         height="383"
+         label="BLOCKED"
+         layout="topleft"
+         left="0"
+         help_topic="people_blocked_tab"
+         name="blocked_panel"
+         right="-1"
+         top="0">
+          <panel
+           class="panel_block_list_sidetray"
+           height="383"
+           name="panel_block_list_sidetray"
+           filename="panel_block_list_sidetray.xml"
+           follows="all"
+           label="Blocked Residents &amp; Objects"
+           layout="topleft"
+           left="0"
+           font="SansSerifBold"
+           top="0"
+           right="-1" />
+        </panel>
+    </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 79d190e1e0..79d190e1e0 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 43d580844f..43d580844f 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 8def96cada..8def96cada 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
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 308acf0c0c..308acf0c0c 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index f169dbb702..f169dbb702 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_message.xml b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
index ab2a42ea01..ab2a42ea01 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 3f67a48b14..3f67a48b14 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index b6985f911e..335f1614d8 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -138,7 +138,7 @@
    initial_value="1"
    layout="topleft"
    left_pad="0"
-   max_val="1.4"
+   max_val="1.5"
    min_val="0.75"
    name="ui_scale_slider"
    top_pad="-14"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 714dca7fac..714dca7fac 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index caf7fc85f5..8e867259c5 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,219 +1,583 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Text Chat"
- layout="topleft"
- left="102"
- name="chat"
- top="1"
- width="517">
-  <text
-   follows="left|top"
-   layout="topleft"
-   left="30"
-   height="12"
-   name="font_size"
-   width="120"
-   top="10">
-    Font size:
-  </text>
-  <radio_group
-     height="30"
-     layout="topleft"
-     left="40"
-	 control_name="ChatFontSize"
-     name="chat_font_size"
-     top_pad="0"
-     width="440">
-        <radio_item
-         height="16"
-         label="Small"
-         layout="topleft"
-         left="0"
-         name="radio"
-         value="0"
-         top="10"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Medium"
-         layout="topleft"
-         left_delta="145"
-         name="radio2"
-         value="1"
-         top_delta="0"
-         width="125" />
-        <radio_item
-         height="16"
-         label="Large"
-         layout="topleft"
-         left_delta="170"
-         name="radio3"
-         value="2"
-         top_delta="0"
-         width="125" />
-    </radio_group>
-    
+    border="true"
+    has_border="true"
+    height="408"
+    label="Text Chat"
+    layout="topleft"
+    left="102"
+    name="chat"
+    top="1"
+    width="517">
+
+  <panel
+      border="false"
+      height="60"
+      layout="topleft"
+      name="general_chat_settings" 
+      top="10"
+      left="13"
+      width="517">
+
     <check_box
-     control_name="PlayTypingAnim"
-     height="16"
-     initial_value="true"
-     label="Play typing animation when chatting"
-     layout="topleft"
-     left="30"
-     name="play_typing_animation"
-     top_pad="10"
-     width="400" />
+        control_name="PlayTypingAnim"
+        height="16"
+        initial_value="true"
+        label="Play typing animation when chatting"
+        layout="topleft"
+        top="0"
+        name="play_typing_animation"
+        width="330">
+    </check_box>
+
     <check_box
-     enabled="false"
-     height="16"
-     label="Email me IMs when I'm offline"
-     layout="topleft"
-     left_delta="0"
-     name="send_im_to_email"
-     top_pad="5"
-     width="400" />
+        enabled="false"
+        height="16"
+        label="Email me IMs when I'm offline"
+        layout="topleft"
+        name="send_im_to_email"
+        top_pad="6"
+        width="330">
+    </check_box>
+
     <check_box
-     enabled="false"
-     height="16"
-     label="Enable plain text IM and chat history"
-     layout="topleft"
-     left_delta="0"
-     name="plain_text_chat_history"
-     top_pad="5"
-     width="400" />
+        control_name="VoiceCallsFriendsOnly"
+        height="16"
+        label="Only friends and groups can call or IM me"
+        layout="topleft"
+        name="voice_call_friends_only_check"
+        top_pad="6"
+        width="350">     
+    </check_box>
+
+    <text
+        layout="topleft"
+        left="345"
+        height="12"
+        name="font_size"
+        width="120"
+        top="0">
+      Font size:
+    </text>
+
+    <combo_box
+        control_name="ChatFontSize"
+        height="23"
+        layout="topleft"
+        left="341"
+        name="chat_font_size"
+        top_pad="5"
+        width="100">
+      <item
+          label="Small"
+          name="Small"
+          value="0"/>
+      <item
+          label="Medium"
+          name="Medium"
+          value="1"/>
+      <item
+          label="Large"
+          name="Large"
+          value="2"/>  
+    </combo_box>
+
+    <check_box
+        control_name="UseChatBubbles"
+        height="16"
+        label="Bubble Chat"
+        layout="topleft"
+        top_pad="4"
+        name="bubble_text_chat"
+        width="330">
+    </check_box>
+      
+  </panel>
+
+  <panel
+      border="false"
+      height="165"
+      layout="topleft"
+      name="im_notification_settings" 	
+      left="13"
+      width="517">
+
+    <text
+        layout="topleft"
+        height="12"
+        name="friend_ims"
+        width="145"
+        left="0"
+        top_pad="13">
+      Friend IMs:
+    </text>
+    <combo_box
+        control_name="NotificationFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="FriendIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>      
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
     <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble Chat"
-     layout="topleft"
-     left_delta="0"
-     top_pad="5"
-     name="bubble_text_chat"
-     width="150" />     
+        control_name="PlaySoundFriendIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_friend_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
-     name="show_ims_in_label"
-     follows="left|top"
-     layout="topleft"
-     left="30"
-     height="20"
-     width="170"
-     top_pad="15">
-     Show IMs in:
+        layout="topleft"
+        height="12"
+        name="non_friend_ims"
+        width="145"
+        left="0"
+        top_pad="11">
+      Non-friend IMs:
     </text>
+    <combo_box
+        control_name="NotificationNonFriendIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NonFriendIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
+    <check_box
+        control_name="PlaySoundNonFriendIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_non_friend_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
     <text
-     name="requires_restart_label"
-     follows="left|top"
-     layout="topleft"
-     top_delta="0" 
-     left="170" 
-  	 height="20"
-	 width="130"
-     text_color="White_25">
-      (requires restart)
-      </text>
-    <radio_group
-     follows="left|top"
-     height="30"
-     left="40"
-     control_name="ChatWindow"
-     name="chat_window"
-     top_pad="0"
-     tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
-     width="150">
-     <radio_item
-      height="16"
-      label="Separate Windows"
-      layout="topleft"
-      left="0"
-      name="radio"
-      value="0"
-      top="0"
-      width="150" />
-     <radio_item
-      height="16"
-      label="Tabs"
+        layout="topleft"
+        left="0"
+        height="13"
+        name="conference_ims"
+        width="145"
+        top_pad="11">
+      Conference IMs:
+    </text>
+    <combo_box
+        control_name="NotificationConferenceIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="ConferenceIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
+    <check_box
+        control_name="PlaySoundConferenceIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_conference_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="13"
+        name="group_chat"
+        width="145"
+        top_pad="11">
+      Group chat:
+    </text>
+    <combo_box
+        control_name="NotificationGroupChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="GroupChatOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolbarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
+    <check_box
+        control_name="PlaySoundGroupChatIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_group_chat_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="12"
+        name="nearby_chat"
+        width="145"
+        top_pad="11">
+      Nearby chat:
+    </text>
+    <combo_box
+        control_name="NotificationNearbyChatOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="NearbyChatOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolBarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
+    <check_box
+        control_name="PlaySoundNearbyChatIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_nearby_chat_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="12"
+        name="object_ims"
+        width="145"
+        top_pad="11">
+      Object IMs:
+    </text>
+    <combo_box
+        control_name="NotificationObjectIMOptions"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        top_delta="-6"
+        name="ObjectIMOptions"
+        width="223">
+      <item
+          label="Open Conversations window"
+          name="OpenConversationsWindow"
+          value="openconversations"/>
+      <item
+          label="Pop up the message"
+          name="PopUpMessage"
+          value="toast"/>
+      <item
+          label="Flash toolbar button"
+          name="FlashToolBarButton"
+          value="flash"/>
+      <item
+          label="No action"
+          name="NoAction"
+          value="noaction"/>
+    </combo_box>
+    <check_box
+        control_name="PlaySoundObjectIM"
+        height="23"
+        label="Play sound"
+        layout="topleft"
+        name="play_sound_object_im"
+        left_pad="7"
+        top_delta="-3"
+        width="28">
+    </check_box>
+    <text
+        layout="topleft"
+        left="0"
+        height="13"
+        name="notifications_alert"
+        width="500"
+        top_pad="9"
+        visible="true"
+        text_color="DrYellow">
+      To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
+    </text>
+
+  </panel>
+
+  <panel
+      border="false"
+      height="50"
       layout="topleft"
-      left_delta="0"
-      name="radio2"
-      value="1"
-      top_pad="5"
-      width="150" />
-    </radio_group>
+      name="play_sound_settings"  	
+      left="13"
+      top_pad="10"
+      width="517">
+
     <text
-     name="disable_toast_label"
-     follows="left|top"
-     layout="topleft"
-     top_pad="20" 
-     left="30" 
-     height="10"
-     width="400">
-      Enable incoming chat popups:
-      </text>
+        layout="topleft"
+        left="0"
+        name="play_sound"
+        width="100"
+        top_pad="8"
+        visible="true">
+      Play sound:
+    </text>
+    <check_box
+        control_name="PlaySoundNewConversation"
+        height="16"
+        label="New conversation"
+        layout="topleft"
+        left_pad="15"
+        top_pad="-10"
+        name="new_conversation"
+        width="150" />
     <check_box
-     control_name="EnableGroupChatPopups"
-     name="EnableGroupChatPopups"
-     label="Group Chats" 
-     layout="topleft"
-     top_pad="5" 
-     left_delta="10" 
-     height="20"
-     tool_tip="Check to see popups when a Group Chat message arrives"
-     width="400" />
+        control_name="PlaySoundIncomingVoiceCall"
+        height="16"
+        label="Incoming voice call"
+        layout="topleft"
+        top_pad="6"
+        name="incoming_voice_call"
+        width="150" />
     <check_box
-     control_name="EnableIMChatPopups"
-     name="EnableIMChatPopups"
-     label="IM Chats" 
-     layout="topleft"
-     top_pad="5"
-     height="16"
-     tool_tip="Check to see popups when an instant message arrives"
-     width="400" />
-    <spinner
-     control_name="NearbyToastLifeTime"
-     decimal_digits="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="23"
-     label="Nearby chat toasts life time:"
-     label_width="285"
-     layout="topleft"
-     left="45"
-     max_val="60"
-     min_val="1"
-     name="nearby_toasts_lifetime"
-     top_pad="10"
-     width="325" />
-    <spinner
-     control_name="NearbyToastFadingTime"
-     decimal_digits="0"
-     follows="left|top"
-     height="23"
-     increment="1"
-     initial_value="3"
-     label="Nearby chat toasts fading time:"
-     label_width="285"
-     layout="topleft"
-     left_delta="0"
-     max_val="60"
-     min_val="0"
-     name="nearby_toasts_fadingtime"
-     top_pad="3"
-     width="325" />
+        control_name="PlaySoundTeleportOffer"
+        height="16"
+        label="Teleport offer"
+        layout="topleft"
+        left_pad="35"
+        top_pad="-38"
+        name="teleport_offer"
+        width="150" />
+    <check_box
+        control_name="PlaySoundInventoryOffer"
+        height="16"
+        label="Inventory offer"
+        layout="topleft"
+        top_pad="6"
+        name="inventory_offer"
+        width="150" />
+
+  </panel>
+
+  <view_border
+      bevel_style="none"
+      height="0"
+      layout="topleft"
+      left="13"
+      name="cost_text_border"
+      top_pad="5"
+      width="495"/>
+
+  <panel
+      height="50"
+      layout="topleft"
+      name="log_settings" 	
+      left="13"
+      top_pad="10"
+      width="505">
+
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top="5"
+        width="55">
+        Save:
+    </text>
+
+    <combo_box
+        enabled="false"
+        control_name="KeepConversationLogTranscripts"
+        height="23"
+        layout="topleft"
+        left_pad="5"
+        name="chat_font_size"
+        top="0"
+        width="165">
+        <item
+            label="Log and transcripts"
+            value="2"/>
+        <item
+            label="Log only"
+            value="1"/>
+        <item
+            label="No log or transcripts"
+            value="0"/>
+    </combo_box>
+
+    <button
+        enabled="false"
+        height="23"
+        label="Clear log..."
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="clear_log"
+        width="110">
+        <commit_callback
+            function="Pref.ClearLog" />
+    </button>
+  
+    <button
+        enabled="false"
+        height="23"
+        label="Delete transcripts..."
+        layout="topleft"
+        left_pad="5"
+        top="0"
+        name="delete_transcripts"
+        width="147">
+        <button.commit_callback
+            function="Pref.DeleteTranscripts" />
+    </button>
+  
+    <text
+        layout="topleft"
+        left="0"
+        text_color="White"
+        height="12"
+        top_pad="15"
+        width="55">
+        Location:
+    </text>
+  
+    <line_editor
+        control_name="InstantMessageLogPath"
+        border_style="line"
+        border_thickness="1"
+        font="SansSerif"
+        height="23"
+        layout="topleft"
+        left_pad="55"
+        max_length="4096"
+        name="log_path_string"
+        top_delta="-5"
+        width="185">
+    </line_editor>
+  
+    <button
+        enabled="false"
+        follows="left|top"
+        height="23"
+        label="Browse..."
+        label_selected="Browse"
+        layout="topleft"
+        left_pad="5"
+        name="log_path_button"
+        top_delta="0"
+        width="112">
+      <commit_callback function="Pref.LogPath" />
+    </button>
+
+  </panel>
+  
+  <button
+      height="23"
+      label="Translation..."
+      layout="topleft"
+      left="9"
+      name="ok_btn"
+      top="-29"
+      width="170">
+    <commit_callback
+        function="Pref.TranslationSettings" />
+  </button>
   <button
-   follows="left|top"
-   height="23"
-   label="Chat Translation Settings"
-   layout="topleft"
-   left="30"
-   name="ok_btn"
-   top="-40"
-   width="170">
-   <button.commit_callback
-    function="Pref.TranslationSettings" />
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="autoreplace_showgui"
+      commit_callback.function="Pref.AutoReplace"
+      label="Auto-Replace..."
+      width="150">
+  </button>
+  <button
+      height="23"
+      layout="topleft"
+      top_pad="-23"
+      left_pad="5"
+      name="spellcheck_showgui"
+      commit_callback.function="Pref.SpellChecker"
+      label="Spell Checking..."
+      width="150">
   </button>
-</panel>
\ No newline at end of file
+
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 2b22f0d6e3..9e825fe516 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -362,7 +362,7 @@
    follows="left|top"
    height="16"
    increment="0.01"
-   initial_value="0.8"
+   initial_value="1.0"
    layout="topleft"
    label_width="115"
    label="Active:"
@@ -380,7 +380,7 @@
    follows="left|top"
    height="16"
    increment="0.01"
-   initial_value="0.5"
+   initial_value="0.95"
    layout="topleft"
    label_width="115"
    label="Inactive:"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 24882988b0..ea0f7d8593 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -409,10 +409,10 @@
      name="text_box3"
      top_pad="3"
      width="240">
-       Busy mode response:
+       Do Not Disturb response:
     </text>
     <text_editor
-     control_name="BusyModeResponse"
+     control_name="DoNotDisturbModeResponse"
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
@@ -421,7 +421,7 @@
      height="29"
      layout="topleft"
      left="30"
-     name="busy_response"
+     name="do_not_disturb_response"
      width="470"
      word_wrap="true">
        log_in_to_change
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f7666bdc4c..6c485c0595 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -47,7 +47,7 @@
         Better
     </text>
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
@@ -55,30 +55,56 @@
      name="LowGraphicsDivet"
      top_delta="-2"
      width="2" />
+  <icon
+     color="DkGray"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="LowMidGraphicsDivet"
+     width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="83"
+     left_pad="41"
      name="MidGraphicsDivet"
      top_delta="0"
      width="2" />
+  <icon
+     color="DkGray"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="MidHighGraphicsDivet"
+     top_delta="0"
+     width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="85"
+     left_pad="41"
      name="HighGraphicsDivet"
      top_delta="0"
      width="2" />
+  <icon
+     color="DkGray"
+     height="14"
+     image_name="Rounded_Square"
+     layout="topleft"
+     left_pad="41"
+     name="HighUltraGraphicsDivet"
+     top_delta="0"
+     width="2" />
     <icon
-     color="0.12 0.12 0.12 1"
+     color="DkGray"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="83"
+     left_pad="41"
      name="UltraGraphicsDivet"
      top_delta="0"
      width="2" />
@@ -91,7 +117,7 @@
      initial_value="0"
      layout="topleft"
      left="120"
-     max_val="3"
+     max_val="6"
      name="QualityPerformanceSelection"
      show_text="false"
      top_delta="-2"
@@ -151,10 +177,86 @@
      width="80">
         Ultra
     </text>
+  <slider
+   control_name="RenderAvatarLODFactor"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   follows="left|top"
+   height="16"
+   increment="0.125"
+   initial_value="160"
+   label="Avatar detail:"
+   label_width="90"
+   layout="topleft"
+   left="30"
+   name="AvatarMeshDetail2"
+   show_text="false"
+   top="72"
+   width="300">
+    <slider.commit_callback
+     function="Pref.UpdateSliderText"
+     parameter="AvatarMeshDetailText2" />
+  </slider>
+  <text
+   type="string"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   name="AvatarMeshDetailText2"
+   top_delta="0"
+   left_delta="304"
+   width="128">
+    Low
+  </text>
+  <slider
+   control_name="RenderFarClip"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   decimal_digits="0"
+   follows="left|top"
+   height="16"
+   increment="8"
+   initial_value="160"
+   label="Draw distance:"
+   label_width="90"
+   layout="topleft"
+   left="30"
+   max_val="512"
+   min_val="64"
+   name="DrawDistance"
+   top="110"
+   width="330" />
+  <text
+   type="string"
+   invisiblity_control="ShowAdvancedGraphicsSettings"
+   length="1"
+   follows="left|top"
+   height="12"
+   layout="topleft"
+   left_delta="330"
+   name="DrawDistanceMeterText2"
+   top_delta="0"
+   width="128">
+    m
+  </text>
+  <check_box
+		 control_name="RenderDeferred"
+     invisiblity_control="ShowAdvancedGraphicsSettings"
+		 height="16"
+		 initial_value="true"
+		 label="Advanced Lighting Model"
+		 layout="topleft"
+		 left="30"
+		 name="UseLightShaders2"
+		 top="148"
+		 width="256">
+    <check_box.commit_callback
+      function="Pref.VertexShaderEnable" />
+  </check_box>
     <panel
-	 visiblity_control="ShowAdvancedGraphicsSettings"
+	   visiblity_control="ShowAdvancedGraphicsSettings"
      border="false"
-	 follows="top|left"
+	   follows="top|left"
      height="300"
      label="CustomGraphics"
      layout="topleft"
@@ -184,24 +286,27 @@
 		 name="TransparentWater"
 		 top_pad="7"
 		 width="256" />
-		<check_box
-		 control_name="RenderObjectBump"
+      <check_box
+       control_name="RenderObjectBump"
+       height="16"
+       initial_value="true"
+       label="Bump mapping and shiny"
+       layout="topleft"
+       left_delta="0"
+       name="BumpShiny"
+       top_pad="1"
+      width="256">
+        <check_box.commit_callback
+        function="Pref.VertexShaderEnable" />
+      </check_box>
+    <check_box
+		 control_name="RenderLocalLights"
 		 height="16"
 		 initial_value="true"
-		 label="Bump mapping and shiny"
+		 label="Local Lights"
 		 layout="topleft"
 		 left_delta="0"
-		 name="BumpShiny"
-		 top_pad="1"
-		width="256" />
-    <check_box
-		control_name="RenderLocalLights"
-		height="16"
-		initial_value="true"
-		label="Local Lights"
-		layout="topleft"
-		left_delta="0"
-		name="LocalLights"
+		 name="LocalLights"
 		 top_pad="1"
 		 width="256" />
 		  <check_box
@@ -235,7 +340,7 @@
 		 control_name="RenderDeferred"
 		 height="16"
 		 initial_value="true"
-		 label="Lighting and Shadows"
+		 label="Advanced Lighting Model"
 		 layout="topleft"
 		 left_delta="0"
 		 name="UseLightShaders"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index d9067b41c7..8794e3bf95 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -129,6 +129,16 @@
    name="tap_tap_hold_to_run"
    width="237"
    top_pad="0"/>
+  <check_box
+   control_name="AutomaticFly"
+   follows="left|top"
+   height="20"
+   label="Hold jump or crouch key to start or stop flying"
+   layout="topleft"
+   left_delta="0"
+   name="automatic_fly"
+   width="237"
+   top_pad="0"/>
   <text
    follows="left|top"
    type="string"
@@ -260,4 +270,4 @@
      function="Floater.Show"
      parameter="pref_joystick" />
   </button>
-</panel>
\ No newline at end of file
+</panel>
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 587c461bee..78743d26bb 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -1,72 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Communication"
- layout="topleft"
- left="102"
- name="im"
- top="1"
- width="517">
-    <panel.string
-     name="log_in_to_change">
-        log in to change
-    </panel.string>
-    <button
-     follows="left|bottom"
-     height="23"
-     label="Clear History"
-     tool_tip="Clear login image, last location, teleport history, web, and texture cache"
-     layout="topleft"
-     left="30"
-     name="clear_cache"
-     top="10"
-     width="145">
-        <button.commit_callback
-         function="Pref.WebClearCache" />
-    </button>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_pad="10"
-     mouse_opaque="false"
-     name="cache_size_label_l"
-     top_delta="3"
-     text_color="LtGray_50"
-     width="300">
-       (Locations, images, web, search history)
-    </text>
-    <check_box
-	 height="16"
-     enabled="false"
-     label="Show me in Search results"
-     layout="topleft"
-     left="30"
-     name="online_searchresults"
-     top_pad="20"
-     width="350" />
-    <check_box
-	 height="16"
-	 enabled="false"
-     label="Only friends and groups know I'm online"
-     layout="topleft"
-     left="30"
-     name="online_visibility"
-     top_pad="30"
-     width="350" />
-    <check_box
-     control_name="VoiceCallsFriendsOnly"
-     height="16"
-     label="Only friends and groups can call or IM me"
-     layout="topleft"
-     left="30"
-     name="voice_call_friends_only_check"
-     top_pad="10"
-     width="350" />
+    border="true"
+    follows="left|top|right|bottom"
+    height="408"
+    label="Communication"
+    layout="topleft"
+    left="102"
+    name="im"
+    top="1"
+    width="517">
+
+  <panel.string
+      name="log_in_to_change">
+    log in to change
+  </panel.string>
+
+  <button
+      follows="left|bottom"
+      height="23"
+      label="Clear History"
+      tool_tip="Clear login image, last location, teleport history, web, and texture cache"
+      layout="topleft"
+      left="30"
+      name="clear_cache"
+      top="10"
+      width="145">
+    <button.commit_callback
+        function="Pref.WebClearCache" />
+  </button>
+
+  <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="10"
+      layout="topleft"
+      left_pad="10"
+      mouse_opaque="false"
+      name="cache_size_label_l"
+      top_delta="3"
+      text_color="LtGray_50"
+      width="300">
+    (Locations, images, web, search history)
+  </text>
+
+  <check_box
+      height="16"
+      enabled="false"
+      label="Show me in Search results"
+      layout="topleft"
+      left="30"
+      name="online_searchresults"
+      top_pad="20"
+      width="350" />
+
+  <check_box
+      height="16"
+      enabled="false"
+      label="Only friends and groups know I'm online"
+      layout="topleft"
+      left="30"
+      name="online_visibility"
+      top_pad="30"
+      width="350" />
+    
     <check_box
      enabled_control="EnableVoiceChat"
      control_name="AutoDisengageMic"
@@ -87,100 +84,7 @@
      name="favorites_on_login_check"
      top_pad="10"
      width="350" />
-	<text
-      type="string"
-    length="1"
-    follows="left|top"
-     height="10"
-     layout="topleft"
-     left="30"
-     mouse_opaque="false"
-     name="Logs:"
-     top_pad="20"
-     width="350">
-        Chat Logs:
-    </text>
-    <check_box
-	 enabled="false"
-     control_name="LogNearbyChat"
-     height="16"
-     label="Save nearby chat logs on my computer"
-     layout="topleft"
-     left="30"
-     name="log_nearby_chat"
-     top_pad="10"
-     width="350">
-    </check_box>
-    <check_box
-	 enabled="false"
-     control_name="LogInstantMessages"
-     height="16"
-     label="Save IM logs on my computer"
-     layout="topleft"
-     left="30"
-     name="log_instant_messages"
-     top_pad="10"
-     width="350">
-    </check_box>
-    <check_box
-     control_name="LogTimestamp"
-	 enabled="false"
-     height="16"
-     label="Add timestamp to each line in chat log"
-     layout="topleft"
-     left_delta="0"
-     name="show_timestamps_check_im"
-     top_pad="10"
-     width="237" />
-	<check_box
-     control_name="LogFileNamewithDate"
-     enabled="false"
-     height="16"
-     label="Add datestamp to log file name."
-     layout="topleft"
-     left_delta="5"
-     name="logfile_name_datestamp"
-     top_pad="10"
-     width="350"/>
-	<text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="10"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_desc"
-     top_pad="30"
-     width="128">
-        Location of logs:
-    </text>    
-    <line_editor
-     bottom="366"
-     control_name="InstantMessageLogPath"
-     follows="top|left|right"
-     halign="right"
-     height="23"
-     layout="topleft"
-     left_delta="0"
-     mouse_opaque="false"
-     name="log_path_string"
-     top_pad="5"
-     width="250"/>
-    <button
-	 enabled="false"
-     follows="right|bottom"
-     height="23"
-     label="Browse"
-     label_selected="Browse"
-     layout="topleft"
-     left_pad="5"
-     name="log_path_button"
-     top_delta="0"
-     width="145">
-        <button.commit_callback
-         function="Pref.LogPath" />
-    </button>
+
     <button
      follows="left|bottom"
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 4aeea8823e..dd4533ae74 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -232,6 +232,18 @@
          name="Install_manual"
          value="0" />
   </combo_box>
+  <check_box
+    top_delta="4"
+    enabled="true"
+    follows="left|top"
+    height="14"
+    control_name="UpdaterWillingToTest"
+    label="Willing to update to release candidates"
+    left_delta="0"
+    mouse_opaque="true"
+    name="update_willing_to_test"
+    width="400"           
+    top_pad="5"/>
   <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index b71586aab1..b71586aab1 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index 198ccd6e2f..8f90521bb2 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -315,7 +315,18 @@
 		<line_editor.commit_callback
 			function="MediaCtrl.CommitURL"/>
 	  </line_editor>
-	  <layout_stack
+        <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|left"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="2"
+        top_delta="2"
+        visible="false"
+        tool_tip="Secured Browsing"
+        width="16" />
+        <layout_stack
 		  name="media_address_url_icons"
 		  animate="false"
 		  follows="top|right"
@@ -340,19 +351,6 @@
 			  tool_tip="White List enabled"
 			  width="16" />
 		</layout_panel>
-		<layout_panel
-			layout="topleft"
-			width="16"
-			mouse_opaque="false"
-			auto_resize="false">
-		  <icon
-			  name="media_secure_lock_flag"
-			  height="16"
-			  image_name="Lock2"
-			  layout="topleft"
-			  tool_tip="Secured Browsing"
-			  width="16" />
-		</layout_panel>
 	  </layout_stack>
 	</layout_panel>
 	<layout_panel
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 860caf2d21..860caf2d21 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
index 112f12500d..112f12500d 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 4550603134..81b2281adb 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -194,11 +194,11 @@
     <button
      follows="left|top"
      height="20"
-     label="Delay Restart"
+     label="Cancel Restart"
      layout="topleft"
      left_pad="155"
      name="cancel_restart_btn"
-     tool_tip="Delay region restart by one hour"
+     tool_tip="Cancel region restart"
      top_delta="0"
      width="150" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index aa38c49fae..aa38c49fae 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index bfd796a62b..76a82212ae 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -149,11 +149,11 @@
     <check_box
      follows="top|left"
      height="16"
-     label="Have been age-verified"
+     label="Are age 18 or older"
      layout="topleft"
      left_delta="0"
      name="limit_age_verified"
-     tool_tip="Residents must be age verified to access this estate. See the [SUPPORT_SITE] for more information."
+     tool_tip="Residents must be age 18 or older to access this estate. See the [SUPPORT_SITE] for more information."
      top_pad="2"
      width="278" />
 
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 44c84e69a1..44c84e69a1 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index 5d060c0a0d..5d060c0a0d 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index f6a8af0973..bcdef96138 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -125,6 +125,10 @@
              label="Search / Replace..."
              layout="topleft"
              name="Search / Replace..." />
+            <menu_item_call
+             label="Go to line..."
+             layout="topleft"
+             name="Go to line..." />
         </menu>
         <menu
          top="0"
@@ -158,6 +162,7 @@
      text_readonly_color="DkGray"
      width="487"
      show_line_numbers="true" 
+     enable_tooltip_paste="true"
      word_wrap="true">
         Loading...
     </text_editor>
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
index 629d8567d1..629d8567d1 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
index c5e8bf5803..c5e8bf5803 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
new file mode 100755
index 0000000000..b0436bb6dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_alpha_color="PanelNotificationBackground"
+  bg_opaque_color="PanelNotificationBackground"
+  chrome="true"
+  height="270"
+  label="script_question_panel"
+  layout="topleft"
+  left="0"
+  name="panel_script_question_toast"
+  top="0"
+  width="305">
+    <text
+      follows="left|right|top"
+      font="SansSerifBold"
+      height="160"
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="top_info_message"
+      parse_highlights="true"
+      parse_urls="true"
+      text_color="NotifyCautionBoxColor"
+      top="10"
+      value=""
+      width="285"
+      wrap="true"/>
+    <panel
+      background_visible="false"
+      follows="left|right|top"
+      height="30"
+      label="buttons_panel"
+      layout="topleft"
+      name="buttons_panel"
+      top_pad="10"
+      width="285">
+    </panel>
+    <text
+      follows="all"
+      font="SansSerifBold"
+      height="55"
+      layout="topleft"
+      mouse_opaque="false"
+      name="bottom_info_message"
+      parse_highlights="true"
+      parse_urls="true"
+      text_color="NotifyCautionBoxColor"
+      top_pad="5"
+      value=""
+      width="285"
+      wrap="true"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
index a8cd380f20..a8cd380f20 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
index 1351f75623..1351f75623 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/en/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
index 557b04d281..557b04d281 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
index 912f81f915..912f81f915 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index 71d808fa4b..71d808fa4b 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
index 781ab17403..781ab17403 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index d2f29ade44..61c8c971c2 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -16,11 +16,11 @@
    imgoverlay_label_space="10"
    label="Post to My Profile Feed"
    layout="topleft"
-   left="10"
+   left_delta="0"
    name="save_to_profile_btn"
    pad_left="10"
    right="-10"
-   top="5">
+   top_pad="10">
     <button.commit_callback
      function="Snapshot.SaveToProfile" />
   </button>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index ebba292a93..ebba292a93 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
index 0dd357aa1a..0dd357aa1a 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/en/panel_social_account.xml b/indra/newview/skins/default/xui/en/panel_social_account.xml
new file mode 100644
index 0000000000..d7235396fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_social_account.xml
@@ -0,0 +1,75 @@
+<panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+   name="panel_social_account">
+  <string
+      name="facebook_connected"
+      value="You are connected to Facebook as:" />
+  <string
+      name="facebook_disconnected"
+      value="Not connected to Facebook" />
+  <text
+   layout="topleft"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_caption_label"
+   top="21"
+   type="string">
+    Not connected to Facebook.
+  </text>
+  <text
+   layout="topleft"
+   top_pad="2"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_name_label"
+   parse_urls="true"
+   type="string"/>
+  <panel
+    layout="topleft"
+    name="panel_buttons"
+    height="345"
+    left="9">
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_pad="9"
+     visible="true"
+     height="23"
+     label="Connect..."
+     name="connect_btn"
+     width="210">
+      <commit_callback function="SocialSharing.Connect"/>
+    </button>
+
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_delta="0"
+     height="23"
+     label="Disconnect"
+     name="disconnect_btn"
+     width="210"
+     visible="false">
+      <commit_callback function="SocialSharing.Disconnect"/>
+    </button>
+    <text
+      layout="topleft"
+      length="1"
+      follows="top|left"
+      height="16"
+      left="0"
+      name="account_learn_more_label"
+      top_pad="20"
+      type="string">
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Facebook]
+    </text>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_photo.xml b/indra/newview/skins/default/xui/en/panel_social_photo.xml
new file mode 100644
index 0000000000..a55613b52a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_social_photo.xml
@@ -0,0 +1,152 @@
+    <panel
+      height="400"
+      width="304"
+      layout="topleft"
+      name="panel_social_photo">
+      <layout_stack
+	   layout="topleft"
+       border_size="0"
+       height="392"
+       follows="all"
+       orientation="vertical"
+       name="stack_photo"
+       top="8">
+        <layout_panel	
+         name="snapshot_panel"
+         height="367">
+            <combo_box
+             control_name="SocialPhotoResolution"
+             follows="left|top"
+             top="6"
+             left="9"
+             name="resolution_combobox"
+             tool_tip="Image resolution"
+             height="21"
+             width="135">
+              <combo_box.item
+               label="Current Window"
+               name="CurrentWindow"
+               value="[i0,i0]" />
+              <combo_box.item
+               label="640x480"
+               name="640x480"
+               value="[i640,i480]" />
+              <combo_box.item
+               label="800x600"
+               name="800x600"
+               value="[i800,i600]" />
+              <combo_box.item
+               label="1024x768"
+               name="1024x768"
+               value="[i1024,i768]" />
+            </combo_box>
+            <text
+             follows="left|top"
+             font="SansSerifSmall"
+             height="14"
+             left="208"
+             length="1"
+             halign="right"
+             name="file_size_label"
+             top="9"
+             type="string"
+             width="50">
+              [SIZE] KB
+            </text>
+            <panel
+                height="150"
+                width="250"
+                visible="true"
+                name="thumbnail_placeholder"
+                top="33"
+                follows="left|top"
+                left="9">
+            </panel>
+            <button
+             follows="left|top"
+             height="23"
+             label="Refresh"
+             left="9"
+             top_pad="5"
+             name="new_snapshot_btn"
+             tool_tip="Click to refresh"
+             visible="true"
+             width="100" >
+             <button.commit_callback
+               function="SocialSharing.RefreshPhoto" />
+            </button>
+            <text
+                follows="left|top"
+                font="SansSerif"
+                text_color="EmphasisColor"
+                height="14"
+                top_pad="-19"
+                left_pad="-20"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                width="150">
+                Refreshing...
+            </text>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="caption_label"
+             top_pad="20"
+             type="string">
+              Comment (optional):
+            </text>
+            <text_editor
+             follows="left|top"
+             height="87"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_caption"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             label="Include location in posting"
+             name="add_location_cb"
+              left="9"
+              height="16"
+             top_pad="8"/>
+        </layout_panel>
+        <layout_panel
+          name="photo_button_panel"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Post"
+           name="post_photo_btn"
+           width="100">
+            <button.commit_callback
+             function="SocialSharing.SendPhoto" />
+          </button>
+          <button
+               follows="left|top"
+               height="23"
+               label="Cancel"
+               name="cancel_photo_btn"
+               left_pad="15"
+               top_delta="0"
+               width="100">
+            <button.commit_callback
+             function="SocialSharing.Cancel" />
+          </button>          
+        </layout_panel>        
+      </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_place.xml b/indra/newview/skins/default/xui/en/panel_social_place.xml
new file mode 100644
index 0000000000..13e94f6998
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_social_place.xml
@@ -0,0 +1,132 @@
+    <panel
+      height="400"
+      width="304"
+	  layout="topleft"
+      name="panel_social_place">
+      <layout_stack
+	    layout="topleft"
+        border_size="0"
+        height="392"
+        follows="all"
+        orientation="vertical"
+        name="stack_place"
+        top="8">
+        <layout_panel
+          name="place_detail_panel"
+          height="181">
+          <text
+            length="1"
+            follows="top|left|right"
+            font="SansSerif"
+            height="16"
+            left="9"
+            name="place_caption_label"
+            top="13"
+            type="string">
+            Say something about where you are:
+          </text>
+          <text_editor
+            follows="top|left"
+            height="150"
+            width="250"
+            left="9"
+            length="1"
+            max_length="700"
+            name="place_caption"
+            type="string"
+            word_wrap="true">
+           </text_editor>
+          </layout_panel>
+          <layout_panel
+            name="place_map_panel"
+            height="186">
+              <panel
+                  follows="left|top"
+                  height="128"
+                  width="128"
+                  background_visible="true"
+                  bg_opaque_color="Black"
+                  bg_alpha_color="Black"
+                  top="20"
+                  left="9"
+                  visible="true"
+                  name="map_border">
+              </panel>
+              <loading_indicator
+              follows="left|top"
+              height="24"
+              width="24"
+              name="map_loading_indicator"
+              top="77"
+              left="61"
+              visible="true"/>
+              <icon
+                follows="left|top"
+                height="128"
+                width="128"
+                image_name="Map_Placeholder_Icon"
+                layout="topleft"
+                top="20"
+                left="9"
+                visible="true"
+                name="map_placeholder">
+              </icon>
+              <icon
+                  follows="left|top"
+                  height="128"
+                  width="128"
+                  image_name="Map_Placeholder_Icon"
+                  layout="topleft"
+                  top="20"
+                  left="9"
+                  visible="true"
+                  name="map_default">
+              </icon>
+            <check_box
+              follows="left|top"
+              initial_value="false"
+              top_delta="8"
+              width="8"
+              label=""
+              name="add_place_view_cb"
+              left_pad="5"/>
+            <text
+              follows="left|top"
+              font="SansSerif"
+              height="32"
+              width="130"
+              word_wrap="true"
+              left_pad="12"
+              top_delta="-8"
+              type="string">
+              Include overhead view of location
+            </text>
+          </layout_panel>
+          <layout_panel
+            name="place_button_panel"
+            height="25">
+            <button
+              follows="left|top"
+              top="0"
+              left="9"
+              height="23"
+              label="Post"
+              name="post_place_btn"
+              width="100">
+              <button.commit_callback
+                 function="SocialSharing.SendCheckin" />
+            </button>
+            <button
+              follows="left|top"
+              height="23"
+              label="Cancel"
+              name="cancel_place_btn"
+              left_pad="15"
+              top_delta="0"
+              width="100">
+              <button.commit_callback
+                  function="SocialSharing.Cancel" />
+            </button>
+        </layout_panel>
+     </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
new file mode 100644
index 0000000000..54cfa3f524
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_social_status.xml
@@ -0,0 +1,67 @@
+    <panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+     name="panel_social_status">
+     <layout_stack
+      layout="topleft"
+      border_size="0"
+      height="392"
+      follows="all"
+      orientation="vertical"
+      name="stack_status"
+      top="8">
+      <layout_panel
+       name="status_detail_panel"
+       height="367">
+       <text
+        length="1"
+        follows="top|left|right"
+        font="SansSerif"
+        height="16"
+        left="9"
+        name="status_caption_label"
+        top="13"
+        type="string">
+        What's on your mind?
+       </text>
+       <text_editor
+        follows="left|top"
+        height="150"
+        width="250"
+        left="9"
+        length="1"
+        max_length="700"
+        name="status_message"
+        type="string"
+        word_wrap="true">
+       </text_editor>
+      </layout_panel>
+      <layout_panel
+       name="status_button_panel"
+       height="25">
+       <button
+        follows="left|top"
+        top="0"
+        left="9"
+        height="23"
+        label="Post"
+        name="post_status_btn"
+        width="100">
+        <button.commit_callback
+          function="SocialSharing.SendStatus" />
+       </button>
+       <button
+        follows="left|top"
+        height="23"
+        label="Cancel"
+        name="cancel_status_btn"
+        left_pad="15"
+        top_delta="0"
+        width="100">
+        <button.commit_callback
+          function="SocialSharing.Cancel" />
+       </button>
+      </layout_panel>
+     </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index 46cbc1e87f..46cbc1e87f 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
index 07642946f8..07642946f8 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 3aa34439f1..064ece6e4b 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -113,7 +113,7 @@
      image_pressed="Pause_Press"
      image_pressed_selected="Play_Press"
      is_toggle="true"
-     left_pad="15"
+     left_pad="5"
      top="1"
      name="media_toggle_btn"
      tool_tip="Start/Stop All Media (Music, Video, Web pages)"
@@ -129,6 +129,5 @@
      left_pad="5"
      top="2"
      name="volume_btn"
-     tool_tip="Global Volume Control"
      width="16" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
index 007b73a4bc..007b73a4bc 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_sys_well_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 768efc2f3f..768efc2f3f 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index c5b0be0616..c5b0be0616 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 37a904bca8..37a904bca8 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 58911bed56..f5c559fe1d 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -93,11 +93,11 @@
                left="0"
                mouse_opaque="false"
                tab_stop="false"
-               name="stand_stop_flying_container"
+               name="state_management_buttons_container"
                visible="false"
                width="200"/>
       </layout_panel>
-      <layout_panel name="right_toolbar_panel"
+       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
                     height="500"
                     width="30"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
new file mode 100644
index 0000000000..426c0c4915
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -0,0 +1,766 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         border="false"
+         follows="all"
+         height="420"
+         label="Texture"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         help_topic="toolbox_texture_tab"
+         name="Texture"
+         top="0"
+         width="295">
+            <panel.string
+             name="string repeats per meter">
+                Repeats Per Meter
+            </panel.string>
+            <panel.string
+             name="string repeats per face">
+                Repeats Per Face
+            </panel.string>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             name="color label"
+             text_readonly_color="LabelDisabledColor"
+             top="6"
+             width="64">
+                Color
+            </text>
+            <!-- label is blank because control places it below the box -->
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="45"
+             label=""
+             layout="topleft"
+             left="10"
+             name="colorswatch"
+             tool_tip="Click to open color picker"
+             top="20"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="15"
+             name="color trans"
+             text_readonly_color="LabelDisabledColor"
+             top="6"
+             width="110">
+                Transparency %
+            </text>
+            <spinner
+             decimal_digits="0"
+             follows="left|top"
+             height="19"
+             increment="2"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             max_val="100"
+             name="ColorTrans"
+             top_pad="4"
+             width="80" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="15"
+             name="glow label"
+             text_readonly_color="LabelDisabledColor"
+             top="6"
+             width="80">
+                Glow
+            </text>
+            <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             left_delta="0"
+             name="glow"
+             top_pad="4"
+             width="80" />
+            <check_box
+             height="19"
+             label="Full Bright"
+             layout="topleft"
+             left="7"
+             name="checkbox fullbright"
+             top_pad="4"
+             width="81" />
+            <combo_box
+             height="23"
+             layout="topleft"
+             left="10"
+             name="combobox matmedia"
+             top_pad="5"
+             width="100">
+                <combo_box.item
+                 label="Materials"
+                 name="Materials"
+                 value="Materials" />
+                <combo_box.item
+                 label="Media"
+                 name="Media"
+                 value="Media" />
+            </combo_box>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             name="combobox mattype"
+             top_delta="0"
+             width="155">
+                <combo_box.item
+                 label="Texture (diffuse)"
+                 name="Texture (diffuse)"
+                 value="Texture (diffuse)" />
+                <combo_box.item
+                 label="Bumpiness (normal)"
+                 name="Bumpiness (normal)"
+                 value="Bumpiness (normal)" />
+                <combo_box.item
+                 label="Shininess (specular)"
+                 name="Shininess (specular)"
+                 value="Shininess (specular)" />
+            </combo_box>
+            <texture_picker
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="texture control"
+             tool_tip="Click to choose a picture"
+             top_pad="8"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="10"
+             name="label alphamode"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="0"
+             width="90">
+                Alpha mode
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_delta="0"
+             name="combobox alphamode"
+             top_pad="4"
+             width="120">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Alpha blending"
+                 name="Alpha blending"
+                 value="Alpha blending" />
+                <combo_box.item
+                 label="Alpha masking"
+                 name="Alpha masking"
+                 value="Alpha masking" />
+                <combo_box.item
+                 label="Emissive mask"
+                 name="Emissive mask"
+                 value="Emissive mask" />
+            </combo_box>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="0"
+             name="label maskcutoff"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="4"
+             width="90">
+                Mask cutoff
+            </text>
+            <spinner
+             decimal_digits="0"
+             min_val="0"
+             max_val="255"
+             follows="left|top"
+             height="19"
+             initial_value="55"
+             layout="topleft"
+             top_pad="4"
+             left_delta="0"
+             increment="1"
+             name="maskcutoff"
+             width="80" />
+            <texture_picker
+             allow_no_texture="true"
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="bumpytexture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-55"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_pad="10"
+             name="label bumpiness"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="0"
+             width="90">
+                Bumpiness
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_delta="0"
+             name="combobox bumpiness"
+             top_pad="4"
+             width="90">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Brightness"
+                 name="Brightness"
+                 value="Brightness" />
+                <combo_box.item
+                 label="Darkness"
+                 name="Darkness"
+                 value="Darkness" />
+                <combo_box.item
+                 label="woodgrain"
+                 name="woodgrain"
+                 value="woodgrain" />
+                <combo_box.item
+                 label="bark"
+                 name="bark"
+                 value="bark" />
+                <combo_box.item
+                 label="bricks"
+                 name="bricks"
+                 value="bricks" />
+                <combo_box.item
+                 label="checker"
+                 name="checker"
+                 value="checker" />
+                <combo_box.item
+                 label="concrete"
+                 name="concrete"
+                 value="concrete" />
+                <combo_box.item
+                 label="crustytile"
+                 name="crustytile"
+                 value="crustytile" />
+                <combo_box.item
+                 label="cutstone"
+                 name="cutstone"
+                 value="cutstone" />
+                <combo_box.item
+                 label="discs"
+                 name="discs"
+                 value="discs" />
+                <combo_box.item
+                 label="gravel"
+                 name="gravel"
+                 value="gravel" />
+                <combo_box.item
+                 label="petridish"
+                 name="petridish"
+                 value="petridish" />
+                <combo_box.item
+                 label="siding"
+                 name="siding"
+                 value="siding" />
+                <combo_box.item
+                 label="stonetile"
+                 name="stonetile"
+                 value="stonetile" />
+                <combo_box.item
+                 label="stucco"
+                 name="stucco"
+                 value="stucco" />
+                <combo_box.item
+                 label="suction"
+                 name="suction"
+                 value="suction" />
+                <combo_box.item
+                 label="weave"
+                 name="weave"
+                 value="weave" />
+              <!--
+                 NORSPEC-182, ensure item doesn't show up in menu until it should
+                <combo_box.item
+                 label="Use texture"
+                 name="Use texture"
+                 value="Use texture" />
+                 -->
+            </combo_box>
+            <texture_picker
+             allow_no_texture="true"
+             can_apply_immediately="true"
+             default_image_name="Default"
+             fallback_image="materials_ui_x_24.png"
+             follows="left|top"
+             height="80"
+             label="Texture       "
+             layout="topleft"
+             left="10"
+             name="shinytexture control"
+             tool_tip="Click to choose a picture"
+             top_delta="-14"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label shininess"
+             left_pad="10"
+             text_readonly_color="LabelDisabledColor"
+             top_delta="6"
+             width="90">
+                Shininess
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="10"
+             name="combobox shininess"
+             top_delta="-6"
+             width="90">
+                <combo_box.item
+                 label="None"
+                 name="None"
+                 value="None" />
+                <combo_box.item
+                 label="Low"
+                 name="Low"
+                 value="Low" />
+                <combo_box.item
+                 label="Medium"
+                 name="Medium"
+                 value="Medium" />
+                <combo_box.item
+                 label="High"
+                 name="High"
+                 value="High" />
+              <!--
+                 NORSPEC-182, ensure item doesn't show up in menu until it should
+                <combo_box.item
+                 label="Use texture"
+                 name="Use texture"
+                 value="Use texture" />
+                 -->
+            </combo_box>
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-100"
+             name="label glossiness"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Glossiness
+            </text>
+            <spinner
+             decimal_digits="0"
+             min_val="0"
+             max_val="255"
+             follows="left|top"
+             height="19"
+             initial_value="51"
+             increment="1"
+             layout="topleft"
+             top_delta="-4"
+             left_pad="10"
+             name="glossiness"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-126"
+             name="label environment"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Environment
+            </text>
+            <spinner
+             decimal_digits="0"
+             min_val="0"
+             max_val="255"
+             increment="1"
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             layout="topleft"
+             top_delta="-4"
+             left_pad="10"
+             name="environment"
+             width="64" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left_delta="-126"
+             name="label shinycolor"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="8"
+             width="116">
+                Color
+            </text>
+            <!-- label is blank because control places it below the box -->
+            <color_swatch
+             can_apply_immediately="true"
+             follows="left|top"
+             height="45"
+             label=""
+             layout="topleft"
+             left_pad="10"
+             name="shinycolorswatch"
+             tool_tip="Click to open color picker"
+             top_delta="-4"
+             width="64" />
+            <text
+			 follows="left|top|right"
+			 height="9"
+			 layout="topleft"
+			 left="10"
+			 top_delta="-50"
+             use_ellipses="true"
+			 read_only="true"
+			 name="media_info"
+			 width="280">
+			 URL of chosen media, if any, goes here
+			 </text>
+			<button
+			 follows="top|left"
+			 height="18"
+			 layout="topleft"
+			 left="10"
+			 name="add_media"
+			 top_pad="4"
+			 tool_tip="Add Media"
+			 label="Choose..."
+			 width="85">
+				<button.commit_callback
+				function="BuildTool.AddMedia"/>
+			</button>
+			<button
+			 follows="top|left"
+			 height="18"
+			 layout="topleft"
+			 left_pad="5"
+			 name="delete_media"
+			 tool_tip="Delete this media texture"
+			 top_delta="0"
+			 label="Remove"
+			 width="85">
+				<button.commit_callback
+				function="BuildTool.DeleteMedia"/>
+			</button>
+            <button
+			 follows="left|top"
+			 height="18"
+			 label="Align"
+			 label_selected="Align Media"
+			 layout="topleft"
+			 left_pad="5"
+			 name="button align"
+			 top_delta="0"
+			 tool_tip="Align media texture (must load first)"
+			 width="85" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             left="10"
+             name="tex gen"
+             text_readonly_color="LabelDisabledColor"
+             top_pad="60"
+             width="140">
+                Mapping
+            </text>
+            <combo_box
+             height="23"
+             layout="topleft"
+             left_pad="0"
+             name="combobox texgen"
+             top_pad="-13"
+             width="125">
+                <combo_box.item
+                 label="Default"
+                 name="Default"
+                 value="Default" />
+                <combo_box.item
+                 label="Planar"
+                 name="Planar"
+                 value="Planar" />
+            </combo_box>
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="TexScaleU"
+             top_pad="5"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="TexScaleV"
+             width="265" />
+            <spinner
+             decimal_digits="1"
+             follows="left|top"
+             height="19"
+             initial_value=""
+			 label="Repeats per meter"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="100"
+             min_val="0.1"
+             name="rptctrl"
+             width="265" />
+           <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             increment="1"
+             initial_value="0"
+			 label="Rotation degrees"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="9999"
+             min_val="-9999"
+             name="TexRot"
+             width="265" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="TexOffsetU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-1"
+             name="TexOffsetV"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="bumpyScaleU"
+             top_delta="-115"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="bumpyScaleV"
+             width="265" />
+           <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             top_pad="27"
+             increment="1"
+             initial_value="0"
+			 label="Rotation degrees"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="360"
+             min_val="0"
+             name="bumpyRot"
+             width="265" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="0"
+             name="bumpyOffsetU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="0"
+             name="bumpyOffsetV"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="shinyScaleU"
+             top_delta="-115"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical scale"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="-100"
+             max_val="100"
+             name="shinyScaleV"
+             width="265" />
+           <spinner
+             decimal_digits="2"
+             follows="left|top"
+             height="19"
+             top_pad="27"
+             increment="1"
+             initial_value="0"
+			 label="Rotation degrees"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="360"
+             min_val="0"
+             name="shinyRot"
+             width="265" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Horizontal offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="0"
+             name="shinyOffsetU"
+             width="265" />
+            <spinner
+             follows="left|top"
+             height="19"
+             initial_value="0"
+             label="Vertical offset"
+             label_width="205"
+             layout="topleft"
+             left="10"
+             min_val="0"
+             name="shinyOffsetV"
+             width="265" />
+            <check_box
+             follows="top|left"
+             height="16"
+             initial_value="false"
+             label="Align planar faces"
+             layout="topleft"
+             left="7"
+             name="checkbox planar align"
+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
+             top_delta="16"
+             width="260" />
+            <web_browser
+             visible="false"
+             enabled="false"
+             border_visible="true"
+             bottom_delta="0"
+             follows="top|left"
+             left="0"
+             name="title_media"
+             width="4"
+             height="4"
+             start_url="about:blank"
+             decouple_texture_size="true" />
+	   </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 fc527f5f9d..fc527f5f9d 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 93e79b7328..93e79b7328 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 7b22b2cce1..6adede0362 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -8,41 +8,289 @@
  border="false"
  chrome="true"
  follows="bottom"
- height="150"
+ height="155"
  layout="topleft"
  name="volumepulldown_floater"
- width="32">
- <slider
-  control_name="AudioLevelMaster"
-  follows="left|top"
-  left="0"
-  top="1"
-  orientation="vertical"
-  height="120"
-  increment="0.05"
-  initial_value="0.5"
-  layout="topleft"
-  name="mastervolume"
-  show_text="false"
-  slider_label.halign="right"
-  top_pad="2"
-  volume="true">
-  <slider.commit_callback
-   function="Vol.setControlFalse"
-   parameter="MuteAudio" />
-  </slider>
-  <button
-    left="10"
-    top_pad="9"
-    width="12"
-    height="12"
-    follows="top|left"
-    name="prefs_btn"
-    image_unselected="Icon_Gear_Foreground"
-    image_disabled="Icon_Gear_Background"
-    image_pressed="Icon_Gear_Press"
-    scale_image="false">
-    <button.commit_callback
-       function="Vol.GoAudioPrefs" />
-  </button>
+ width="225">
+      <slider
+     control_name="AudioLevelMaster"
+     follows="top|left"
+     font.style="BOLD"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Master"
+     label_width="60"
+     left="10"
+     width="160"
+     layout="topleft"
+     name="System Volume"
+     show_text="false"
+     top="10"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAudio" />
+    </slider>
+    <button
+     control_name="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <slider
+        control_name="AudioLevelUI"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="15"
+        increment="0.025"
+        initial_value="0.5"
+        label="Buttons"
+        label_width="60"
+        left="10"
+        width="160"
+        layout="topleft"
+        name="UI Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteUI" />
+    </slider>
+    <button
+        control_name="MuteUI"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <slider
+     control_name="AudioLevelAmbient"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Ambient"
+     label_width="60"
+     left="10"
+     width="160"
+     layout="topleft"
+     name="Wind Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteAmbient" />
+    </slider>
+    <button
+     control_name="MuteAmbient"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <slider
+     control_name="AudioLevelSFX"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Sounds"
+     label_width="60"
+     left="10"
+     width="160"
+     layout="topleft"
+     name="SFX Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteSounds" />
+    </slider>
+    <button
+     control_name="MuteSounds"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16">
+      <button.commit_callback
+      function="Pref.SetSounds"/>
+    </button>
+  <check_box
+    name="gesture_audio_play_btn"
+		control_name="EnableGestureSounds"
+    disabled_control="MuteAudio"
+    height="16"
+    layout="topleft"
+    left_pad="5"
+    tool_tip="Enable sounds from gestures"
+    top_delta="2"
+    width="350"/>
+    <slider
+     control_name="AudioLevelMusic"
+     disabled_control="MuteAudio"
+     follows="left|top"
+     height="15"
+     increment="0.025"
+     initial_value="0.5"
+     label="Music"
+     label_width="60"
+     left="10"
+     width="160"
+     layout="topleft"
+     name="Music Volume"
+     show_text="false"
+     top_pad="4"
+     volume="true">
+        <slider.commit_callback
+         function="Pref.setControlFalse"
+         parameter="MuteMusic" />
+    </slider>
+    <button
+     control_name="MuteMusic"
+     disabled_control="MuteAudio"
+     follows="top|left"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
+     is_toggle="true"
+     layout="topleft"
+     left_pad="5"
+     name="mute_audio"
+     tab_stop="false"
+     width="16" />
+    <check_box
+        control_name="AudioStreamingMusic"
+        height="16"
+        tool_tip="Enable Streaming Music"
+        layout="topleft"
+        left_pad="5"
+        name="enable_music"
+        top_delta="2"
+        width="350">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelMedia"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Media"
+        label_width="60"
+        left="10"
+        width="160"
+        layout="topleft"
+        name="Media Volume"
+        show_text="false"
+        top_pad="4"
+        volume="true">
+      <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteMedia" />
+    </slider>
+    <button
+        control_name="MuteMedia"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <check_box
+        label_text.halign="left"
+        follows="left|top"
+        height="16"
+        control_name ="AudioStreamingMedia"
+        tool_tip="Enable Streaming Media"
+        layout="topleft"
+        top_delta="2"
+        left_pad="5"
+        name="enable_media"
+        width="110">
+        <check_box.commit_callback
+            function="Pref.updateMediaAutoPlayCheckbox"/>
+    </check_box>
+    <slider
+        control_name="AudioLevelVoice"
+        disabled_control="MuteAudio"
+        follows="left|top"
+        height="16"
+        increment="0.025"
+        initial_value="0.5"
+        label="Voice"
+        label_width="60"
+        left="10"
+        width="160"
+        layout="topleft"
+        top_pad="4"
+        name="Voice Volume"
+        show_text="false"
+        volume="true">
+    <slider.commit_callback
+        function="Pref.setControlFalse"
+        parameter="MuteVoice" />
+    </slider>
+    <button
+        control_name="MuteVoice"
+        disabled_control="MuteAudio"
+        follows="top|left"
+        height="16"
+        image_selected="AudioMute_Off"
+        image_unselected="Audio_Off"
+        is_toggle="true"
+        layout="topleft"
+        left_pad="5"
+        name="mute_audio"
+        tab_stop="false"
+        width="16" />
+    <check_box
+        label_text.halign="left"
+        follows="left|top"
+        height="16"
+        control_name ="EnableVoiceChat"
+        disabled_control="CmdLineDisableVoice"
+        tool_tip="Enable Voice Chat"
+        layout="topleft"
+        top_delta="2"
+        left_pad="5"
+        name="enable_voice_check"
+        width="110"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml
index 16860a6117..16860a6117 100644..100755
--- a/indra/newview/skins/default/xui/en/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/en/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/en/role_actions.xml b/indra/newview/skins/default/xui/en/role_actions.xml
index 89aef57cca..0eeccbeac5 100644..100755
--- a/indra/newview/skins/default/xui/en/role_actions.xml
+++ b/indra/newview/skins/default/xui/en/role_actions.xml
@@ -70,8 +70,8 @@
 		     longdescription="Toggle &apos;Show Place in Search&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
 		     name="land find places" value="17" />
 		<action
-		     description="Change parcel name, description, and &apos;Show Place in Search&apos; settings"
-		     longdescription="Change parcel name, description, and &apos;Show Place in Search&apos; settings. This is done in About Land &gt; Options tab."
+		     description="Change parcel name, description, and &apos;Moderate Content&apos; settings"
+		     longdescription="Change parcel name, description, and &apos;Moderate Content&apos; settings. This is done in About Land &gt; Options tab."
 		     name="land change identity" value="18" />
 		<action description="Set landing point and set teleport routing"
 		     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 1d98a84e25..1d98a84e25 100644..100755
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 6ecb57b41d..14bd349480 100644..100755
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -48,7 +48,7 @@
                       height="300"
                       width="330" />
              </layout_panel>
-			 <layout_panel
+			    <layout_panel
                  width="330"
                  layout="topleft"
                  auto_resize="false"
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 54a312bd59..c5dfb703e5 100644..100755
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -11,6 +11,10 @@
 		 name="unknown">
         (unknown)
 	</panel.string>
+    <panel.string
+         name="unknown_multiple">
+        (unknown / multiple)
+    </panel.string>
 	<panel.string
 		 name="public">
         (public)
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 6600339ad7..6ee8fc3a4c 100644..100755
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -31,6 +31,14 @@
                 You can't modify these objects
             </panel.string>
             <panel.string
+      name="text modify info 5">
+    You can't modify this object across a region boundary
+  </panel.string>
+  <panel.string
+      name="text modify info 6">
+    You can't modify these objects across a region boundary
+  </panel.string>
+  <panel.string
              name="text modify warning">
                 This object has linked parts
             </panel.string>
@@ -267,23 +275,27 @@
                 <combo_box.item
                  label="Touch  (default)"
                  name="Touch/grab(default)"
-                 value="Touch/grab (default)" />
+          value="Touch" />
                 <combo_box.item
                  label="Sit on object"
                  name="Sitonobject"
-                 value="Sit on object" />
+          value="Sit" />
                 <combo_box.item
                  label="Buy object"
                  name="Buyobject"
-                 value="Buy object" />
+          value="Buy" />
                 <combo_box.item
                  label="Pay object"
                  name="Payobject"
-                 value="Pay object" />
+          value="Pay" />
                 <combo_box.item
                  label="Open"
                  name="Open"
                  value="Open" />
+       <combo_box.item
+          label="Zoom"
+          name="Zoom"
+          value="Zoom" />
             </combo_box>
 	 <panel
          border="false"
@@ -300,7 +312,7 @@
 	  <text
              type="string"
              length="1"
-             left="10"
+          left="5"
              top_pad="15"
              text_color="EmphasisColor"
 	     height="15"
@@ -448,9 +460,27 @@
        tool_tip="Let people see this object in search results" />
             <text
              type="string"
+        follows="left|top"
+        name="pathfinding_attributes_label"
+        top_pad="6"
+        width="150"
+        left="5">
+      Pathfinding attributes:
+    </text>
+    <text
+        type="string"
+        follows="left|top"
              text_color="EmphasisColor"
+        name="pathfinding_attributes_value"
+        width="130"
+        word_wrap="false"
+        left_pad="0">
+    </text>
+    <text
+        type="string"
+        text_color="EmphasisColor"
              length="1"
-             top_pad="15"
+        top_pad="10"
              follows="left|top"
              layout="topleft"
              left="10"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4ccec4838a..7e79d297ef 100644..100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -59,8 +59,9 @@
 	<string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string>
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
-	<string name="create_account_url">http://join.secondlife.com/</string>
+	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
 
+	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
 http://secondlife.com/download
@@ -147,6 +148,14 @@ Please try logging in again in a minute.</string>
 	<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
 	<string name="TestingDisconnect">Testing viewer disconnect</string>
 
+	<!-- Facebook Connect and, eventually, other Social Network -->
+	<string name="SocialFacebookConnecting">Connecting to Facebook...</string>
+	<string name="SocialFacebookPosting">Posting...</string>
+	<string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
+	<string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string>
+	<string name="SocialFacebookErrorPosting">Problem posting to Facebook</string>
+	<string name="SocialFacebookErrorDisconnecting">Problem disconnecting from Facebook</string>
+    
 	<!-- Tooltip -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
@@ -208,7 +217,8 @@ Please try logging in again in a minute.</string>
 	<string name="SLappAgentIM">IM</string>
 	<string name="SLappAgentPay">Pay</string>
 	<string name="SLappAgentOfferTeleport">Offer Teleport to </string>
-	<string name="SLappAgentRequestFriend">Friend Request </string>
+	<string name="SLappAgentRequestFriend">Friend Request</string>
+  <string name="SLappAgentRemoveFriend">Friend Removal</string>
 
 	<!-- ButtonToolTips, llfloater.cpp -->
 	<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;W)</string>
@@ -295,7 +305,7 @@ Please try logging in again in a minute.</string>
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
-	<string name="AvatarBusy">Busy</string>
+	<string name="AvatarDoNotDisturb">Do Not Disturb</string>
 	<string name="AvatarMuted">Blocked</string>
 
 	<!-- animations -->
@@ -372,10 +382,12 @@ Please try logging in again in a minute.</string>
 	<!-- build floater -->
 	<string name="multiple_textures">Multiple</string>
 
+<string name="use_texture">Use texture</string>
+
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>
-	<string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string>
+	<string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE] ([SQMPRICE] L$/m²)</string>
 	<string name="worldmap_results_none_found">None found.</string>
 
 	<!-- animations uploading status codes -->
@@ -384,6 +396,8 @@ Please try logging in again in a minute.</string>
 	<string name="ST_NO_JOINT">Can't find ROOT or JOINT.</string>
 
 	<!-- Chat -->
+	<string name="NearbyChatTitle">Nearby chat</string>
+  <string name="NearbyChatLabel">(Nearby chat)</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>
@@ -393,6 +407,7 @@ Please try logging in again in a minute.</string>
   <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
 	<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
 	<string name="ActOnControlInputs">Act on your control inputs</string>
 	<string name="RemapControlInputs">Remap your control inputs</string>
@@ -403,9 +418,18 @@ Please try logging in again in a minute.</string>
 	<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
 	<string name="ChangePermissions">Change its permissions</string>
 	<string name="TrackYourCamera">Track your camera</string>
-  <string name="ControlYourCamera">Control your camera</string>
-  <string name="TeleportYourAgent">Teleport you</string>
-  <string name="NotConnected">Not Connected</string>
+	<string name="ControlYourCamera">Control your camera</string>
+	<string name="TeleportYourAgent">Teleport you</string>
+	<string name="ManageEstateSilently">Manage your estates silently</string>
+	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
+	
+	<string name="NotConnected">Not Connected</string>
+	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->
+	<string name="JoinAnExperience">Join an experience</string> <!-- not used -->
+	<string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string>
+	<string name="OverrideYourAnimations">Replace your default animations</string>
+	<string name="ScriptReturnObjects">Return objects on your behalf</string>
+	<string name="UnknownScriptPermission">(unknown)!</string>
 
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">General</string>
@@ -432,6 +456,8 @@ Please try logging in again in a minute.</string>
 	<string name="load_file_verb">Load</string>
 	<string name="targa_image_files">Targa Images</string>
 	<string name="bitmap_image_files">Bitmap Images</string>
+	<string name="png_image_files">PNG Images</string>
+	<string name="save_texture_image_files">Targa or PNG Images</string>
 	<string name="avi_movie_file">AVI Movie File</string>
 	<string name="xaf_animation_file">XAF Anim File</string>
 	<string name="xml_file">XML File</string>
@@ -440,6 +466,7 @@ Please try logging in again in a minute.</string>
 	<string name="load_files">Load Files</string>
 	<string name="choose_the_directory">Choose Directory</string>
 	<string name="script_files">Scripts</string>
+	<string name="dictionary_files">Dictionaries</string>
 
   <!-- LSL Usage Hover Tips -->
   <!-- NOTE: For now these are set as translate="false", until DEV-40761 is implemented (to internationalize the rest of tooltips in the same window).
@@ -630,11 +657,11 @@ Returns the wind velocity at the object position + offset
 	</string>
 	<string name="LSLTipText_llSetStatus" translate="false">
 llSetStatus(integer status, integer value)
-Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
 	</string>
 	<string name="LSLTipText_llGetStatus" translate="false">
 integer llGetStatus(integer status)
-Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
+Returns the boolean value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_BLOCK_GRAB_OBJECT, STATUS_ROTATE_X, STATUS_ROTATE_Y, or STATUS_ROTATE_Z)
 	</string>
 	<string name="LSLTipText_llSetScale" translate="false">
 llSetScale(vector scale)
@@ -670,7 +697,7 @@ Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
 	</string>
 	<string name="LSLTipText_llOffsetTexture" translate="false">
 llOffsetTexture(float u, float v, integer face)
-Sets the texture u &amp; v offsets for the chosen face or ALL_SIDES
+Sets the texture u  &amp; v offsets for the chosen face or ALL_SIDES
 	</string>
 	<string name="LSLTipText_llRotateTexture" translate="false">
 llRotateTexture(float rotation, integer face)
@@ -788,9 +815,9 @@ Sets the script timer to zero
 float llGetAndResetTime()
 Returns the script time in seconds and then resets the script timer to zero
 	</string>
-	<string name="LSLTipText_llSoplayund" translate="false">
+	<string name="LSLTipText_llSound" translate="false">
 llSound(string sound, float volume, integer queue, integer loop)
-Plays sound at volume and whether it should loop or not
+Plays sound at volume and whether it should loop or not.
 	</string>
 	<string name="LSLTipText_llPlaySound" translate="false">
 llPlaySound(string sound, float volume)
@@ -1445,7 +1472,7 @@ integer llScriptDanger(vector pos)
 Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
 	</string>
 	<string name="LSLTipText_llDialog" translate="false">
-llDialog(key avatar, string message, list buttons, integer chat_channel
+llDialog(key avatar, string message, list buttons, integer chat_channel)
 Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
 If a button is pressed, the avatar says the text of the button label on chat_channel.
 	</string>
@@ -1666,7 +1693,7 @@ Returns a list containing results of the sent query
 	</string>
 	<string name="LSLTipText_llModPow" translate="false">
 integer llModPow(integer a, integer b, integer c)
-Returns a raised to the b power, mod c. ( (a**b)%c )
+Returns a raised to the b power, mod c. ( (a**b)%c )
 b is capped at 0xFFFF (16 bits).
 	</string>
 	<string name="LSLTipText_llGetInventoryType" translate="false">
@@ -1779,10 +1806,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
 	</string>
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
-    list llGetParcelDetails(vector pos, list params)
-    Returns the parcel details specified in params for the parcel at pos.
-    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
-  </string>
+list llGetParcelDetails(vector pos, list params)
+Returns the parcel details specified in params for the parcel at pos.
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
+	</string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
@@ -1871,78 +1898,203 @@ Releases the specified URL, it will no longer be usable
 	<string name="LSLTipText_llHTTPResponse" translate="false">
 llHTTPResponse(key request_id, integer status, string body)
 Responds to request_id with status and body
-  </string>
+	</string>
 	<string name="LSLTipText_llGetHTTPHeader" translate="false">
 string llGetHTTPHeader(key request_id, string header)
 Returns the value for header for request_id
 	</string>
-  <string name="LSLTipText_llSetPrimMediaParams" translate="false">
+	<string name="LSLTipText_llSetPrimMediaParams" translate="false">
 llSetPrimMediaParams(integer face, list params)
 Sets the media params for a particular face on an object. If media is not already on this object, add it.
 List is a set of name/value pairs in no particular order.  Params not specified are unchanged, or if new media is added then set to the default specified.
 The possible names are below, along with the types of values and what they mean.
-  </string>
-  <string name="LSLTipText_llGetPrimMediaParams" translate="false">
+	</string>
+	<string name="LSLTipText_llGetPrimMediaParams" translate="false">
 list llGetPrimMediaParams(integer face, list params)
 Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
 (Returns an empty list if no media exists on the face.)
-  </string>
-  <string name="LSLTipText_llClearPrimMedia" translate="false">
+	</string>
+	<string name="LSLTipText_llClearPrimMedia" translate="false">
 llClearPrimMedia(integer face)
 Clears (deletes) the media and all params from the given face.
-  </string>
-<string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
+	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
 llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
 Set primitive parameters for linknumber based on rules.
-</string>
-<string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
+	</string>
+	<string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
 llGetLinkPrimitiveParams(integer linknumber,list rules)
 Get primitive parameters for linknumber based on rules.
-</string>
-<string name="LSLTipText_llLinkParticleSystem" translate="false">
+	</string>
+	<string name="LSLTipText_llLinkParticleSystem" translate="false">
 llLinkParticleSystem(integer linknumber,list rules)
 Creates a particle system based on rules.  Empty list removes particle system from object.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
-</string>
-<string name="LSLTipText_llSetLinkTextureAnim" translate="false">
+	</string>
+	<string name="LSLTipText_llSetLinkTextureAnim" translate="false">
 llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
-Animate the texture on the specified prim's face/faces.
-</string>
-<string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
+Animate the texture on the specified prim&apos;s face/faces.
+	</string>
+	<string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
 integer llGetLinkNumberOfSides(integer link)
 Returns the number of sides of the specified linked prim.
-</string>
-<string name="LSLTipText_llGetUsername" translate="false">
+	</string>
+	<string name="LSLTipText_llGetUsername" translate="false">
 string llGetUsername(key id)
 Returns the single-word username of an avatar, iff the avatar is in the current region, otherwise the empty string.
-</string>
-<string name="LSLTipText_llRequestUsername" translate="false">
+	</string>
+	<string name="LSLTipText_llRequestUsername" translate="false">
 key llRequestUsername(key id)
 Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
-</string>
-<string name="LSLTipText_llGetDisplayName" translate="false">
-  string llGetDisplayName(key id)
-  Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
-</string>
-<string name="LSLTipText_llRequestDisplayName" translate="false">
+	</string>
+	<string name="LSLTipText_llGetDisplayName" translate="false">
+string llGetDisplayName(key id)
+Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
+	</string>
+	<string name="LSLTipText_llRequestDisplayName" translate="false">
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
-</string>
-<string name="LSLTipText_llRegionSayTo" translate="false">
-llRegionSayTo(key target, integer channel, string msg)
-Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
-</string>
-<string name="LSLTipText_llGetEnv" translate="false">
+	</string>
+	<string name="LSLTipText_llGetEnv" translate="false">
 llGetEnv(string name)
 Returns a string with the requested data about the region
-</string>
-
+	</string>
+	<string name="LSLTipText_llCastRay" translate="false">
+llCastRay(vector start, vector end, list params)
+Casts a ray into the physics world from &apos;start&apos; to &apos;end&apos; and returns data according to details in params.
+	</string>
+	<string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
+	</string>
+	<string name="LSLTipText_llGetSPMaxMemory" translate="false">
+integer llGetSPMaxMemory()
+Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
+	</string>
+	<string name="LSLTipText_llGetUsedMemory" translate="false">
+integer llGetUsedMemory()
+Returns the current used memory for the current script. Non-mono scripts always use 16k.
+	</string>
+	<string name="LSLTipText_llScriptProfiler" translate="false">
+llScriptProfiler(integer flags)
+Enabled or disables script profiling options. Currently only supports PROFILE_SCRIPT_MEMORY (mono only) and PROFILE_NONE.
+MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
+	</string>
+	<string name="LSLTipText_llSetMemoryLimit" translate="false">
+integer llSetMemoryLimit(integer mem)
+	</string>
+	<string name="LSLTipText_llGetMemoryLimit" translate="false">
+integer llGetMemoryLimit()
+	</string>
+	<string name="LSLTipText_llSetLinkMedia" translate="false">
+llSetLinkMedia(integer link, integer face, list params)
+Set the media params for a particular face on linked prim.  List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean.  If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified.
+	</string>
+	<string name="LSLTipText_llGetLinkMedia" translate="false">
+list llGetLinkMedia(integer link, integer face, list params)
+Get the media params for a particular face on linked prim, given the desired list of names. Returns a list of values in the order requested.  Returns an empty list if no media exists on the face.
+	</string>
+	<string name="LSLTipText_llClearLinkMedia" translate="false">
+llClearLinkMedia(integer link, integer face)
+Clears (deletes) the media and all params from the given face on linked prim.
+	</string>
+	<string name="LSLTipText_llSetContentType" translate="false">
+llSetContentType(key id, integer content_type)
+	</string>
+	<string name="LSLTipText_llLinkSitTarget" translate="false">
+llLinkSitTarget(integer link, vector offset, rotation rot)
+Set the sit location for this object (if offset == &lt;0,0,0&gt; clear it)
+	</string>
+	<string name="LSLTipText_llAvatarOnLinkSitTarget" translate="false">
+key llAvatarOnLinkSitTarget(integer link)
+If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KEY otherwise
+	</string>
+	<string name="LSLTipText_llSetLinkCamera" translate="false">
+llSetLinkCamera(integer link, vector eye, vector at)
+	</string>
+	<string name="LSLTipText_llSetVelocity" translate="false">
+llSetVelocity(vector velocity, integer local)
+Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetAngularVelocity" translate="false">
+llSetAngularVelocity(vector angular_velocity, integer local)
+Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetPhysicsMaterial" translate="false">
+llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object&apos;s physics material.
+	</string>
+	<string name="LSLTipText_llGetPhysicsMaterial" translate="false">
+llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+	</string>
+	<string name="LSLTipText_llGetMassMKS" translate="false">
+llGetMassMKS() returns the mass of the linkset in kilograms.
+	</string>
+	<string name="LSLTipText_llGenerateKey" translate="false">
+llGenerateKey()
+Retun a unique generated key
+	</string>
+	<string name="LSLTipText_llSetKeyframedMotion" translate="false">
+llSetKeyframedMotion(list keyframes, list options)
+Requests that a nonphysical object be keyframed according to keyframe list.
+	</string>
+	<string name="LSLTipText_llTransferLindenDollars" translate="false">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
+	</string>
+	<string name="LSLTipText_llGetParcelMusicURL" translate="false">
+string llGetParcelMusicURL()
+Gets the streaming audio URL for the parcel of land on which the object is located.
+	</string>
+	<string name="LSLTipText_llSetRegionPos" translate="false">
+integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llNavigateTo" translate="false">
+llNavigateTo(vector point, list options)
+For AI Character: Navigate to destination.
+	</string>
+	<string name="LSLTipText_llCreateCharacter" translate="false">
+llCreateCharacter(list options)
+Convert linkset to AI Character which can navigate the world.
+	</string>
+	<string name="LSLTipText_llPursue" translate="false">
+llPursue(key target, list options)
+For AI Character: Chase after a target.
+	</string>
+	<string name="LSLTipText_llWanderWithin" translate="false">
+llWanderWithin(vector center, float radius, list options)
+For AI Character: Wander within a specified volume.
+	</string>
+	<string name="LSLTipText_llFleeFrom" translate="false">
+llFleeFrom(vector source, float radius, list options)
+For AI Character: Flee from a point.
+	</string>
+	<string name="LSLTipText_llPatrolPoints" translate="false">
+llPatrolPoints(list points, list options)
+For AI Character: Patrol a list of points.
+	</string>
+	<string name="LSLTipText_llExecCharacterCmd" translate="false">
+llExecCharacterCmd(integer cmd, list options)
+For AI Character: Execute a character command.
+	</string>
+	<string name="LSLTipText_llDeleteCharacter" translate="false">
+llDeleteCharacter()
+Convert linkset from AI Character to Physics object.
+	</string>
+	<string name="LSLTipText_llUpdateCharacter" translate="false">
+llUpdateCharacter(list options)
+Change the AI Character&apos;s settings.
+	</string>
+	<string name="LSLTipText_llEvade" translate="false">
+llEvade(key target, list options)
+For AI Character: Evade a specified target.
+	</string>
+	<string name="LSLTipText_llGetClosestNavPoint" translate="false">
+list llGetClosestNavPoint(vector point, list options)
+For AI Character: Get the closest navigable point to the point provided.
+	</string>
 
-  <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Not Away</string>
-	<string name="AvatarSetAway">Away</string>
-	<string name="AvatarSetNotBusy">Not Busy</string>
-	<string name="AvatarSetBusy">Busy</string>
 
 	<!-- Wearable Types -->
 	<string name="shape">Shape</string>
@@ -2043,7 +2195,7 @@ Returns a string with the requested data about the region
 	<string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string>
 	<string name="InventoryInboxNoItems">Your Marketplace purchases will appear here. You may then drag them into your inventory to use them.</string>
 	<string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string>
-	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string>
+	<string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3</string>
 	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
 	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
 	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
@@ -2137,16 +2289,22 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="InvFolder Gestures">Gestures</string>
 	<string name="InvFolder Favorite">My Favorites</string>
   <!-- historically default name of the Favorites folder can start from either "f" or "F" letter.
-  We should localize both of them with the same value -->
+      Also, it can be written as "Favorite" or "Favorites".
+  We should localize all variants of them with the same value -->
 	<string name="InvFolder favorite">My Favorites</string>
+	<string name="InvFolder Favorites">My Favorites</string>
+	<string name="InvFolder favorites">My Favorites</string>
 	<string name="InvFolder Current Outfit">Current Outfit</string>
 	<string name="InvFolder Initial Outfits">Initial Outfits</string>
 	<string name="InvFolder My Outfits">My Outfits</string>
 	<string name="InvFolder Accessories">Accessories</string>
 	<string name="InvFolder Meshes">Meshes</string>
+	<string name="InvFolder Received Items">Received Items</string>
+	<string name="InvFolder Merchant Outbox">Merchant Outbox</string>
 
   <!-- are used for Friends and Friends/All folders in Inventory "Calling cards" folder. See EXT-694-->
 	<string name="InvFolder Friends">Friends</string>
+	<string name="InvFolder Received Items">Received Items</string>
 	<string name="InvFolder All">All</string>
 
 	<string name="no_attachments">No attachments worn</string>
@@ -2316,7 +2474,11 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 		all estates that you manage for [OWNER]
 	</string>
 	<string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string>
-	<string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
+	<string name="RegionInfoAllowedGroups">Allowed Groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string>
+	<string name="RegionInfoEstateManagers">Estate Managers: ([ESTATEMANAGERS], max [MAXMANAGERS])</string>
+	<string name="RegionInfoBannedResidents">Banned Residents: ([BANNEDAGENTS], max [MAXBANNED])</string>
+	<string name="RegionInfoListTypeAllowedAgents">Allowed Residents</string>
+	<string name="RegionInfoListTypeBannedAgents">Banned Residents</string>
 
 	<!-- script limits floater -->
 	<string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string>
@@ -2371,6 +2533,8 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="ATTACH_HUD_BOTTOM_LEFT">HUD Bottom Left</string>
 	<string name="ATTACH_HUD_BOTTOM">HUD Bottom</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">HUD Bottom Right</string>
+	<string name="ATTACH_NECK">Neck</string>
+	<string name="ATTACH_AVATAR_CENTER">Avatar Center</string>
 
 	<!-- script editor -->
 	<string name="CursorPos">Line [LINE], Column [COLUMN]</string>
@@ -2387,7 +2551,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="PanelContentsNewScript">New Script</string>
 
   <!-- panel preferences general -->
-  <string name="BusyModeResponseDefault">The Resident you messaged is in &apos;busy mode&apos; which means they have requested not to be disturbed.  Your message will still be shown in their IM panel for later viewing.</string>
+  <string name="DoNotDisturbModeResponseDefault">This resident has turned on &apos;Do Not Disturb&apos; and will see your message later.</string>
 
 	<!-- Mute -->
 	<string name="MuteByName">(By name)</string>
@@ -2446,9 +2610,6 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="GroupMoneyDebits">Debits</string>
 	<string name="GroupMoneyDate">[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]</string>
 
-	<!-- viewer object -->
-	<string name="ViewerObjectContents">Contents</string>
-
 	<!-- Viewer menu -->
 	<string name="AcquiredItems">Acquired Items</string>
 	<string name="Cancel">Cancel</string>
@@ -2854,6 +3015,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
@@ -3193,8 +3355,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
-  <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-
+  <string name="LocationCtrlSeeAVsTooltip">Avatars inside this parcel cannot be seen or heard by avatars outside this parcel</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
@@ -3243,12 +3406,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_moderator_label">(Moderator)</string>
 	<string name="Saved_message">(Saved [LONG_TIMESTAMP])</string>
 	<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
+  <string name="OnlineStatus">Online</string>
+  <string name="OfflineStatus">Offline</string>
 
 	<!-- voice calls -->
 	<string name="answered_call">Your call has been answered</string>
 	<string name="you_started_call">You started a voice call</string>
 	<string name="you_joined_call">You joined the voice call</string>
-	<string name="name_started_call">[NAME] started a voice call</string>
+  <string name="you_auto_rejected_call-im">You automatically rejected the voice call while &apos;Do Not Disturb&apos; was on.</string>
+  <string name="name_started_call">[NAME] started a voice call</string>
 
   <string name="ringing-im">
     Joining voice call...
@@ -3263,7 +3429,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Connecting...
   </string>
   <string name="conference-title">
-    Ad-hoc Conference
+    Multi-person chat
   </string>
   <string name="conference-title-incoming">
     Conference with [AGENT_NAME]
@@ -3275,6 +3441,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Drag items from inventory here
   </string>
 
+  <string name="facebook_post_success">
+    You posted to Facebook.
+  </string>
 
   <string name="no_session_message">
     (IM Session Doesn't Exist)
@@ -3689,6 +3858,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Avatar_Label">Avatar</string>
   <string name="Command_Build_Label">Build</string>
   <string name="Command_Chat_Label">Chat</string>
+  <string name="Command_Conversations_Label">Conversations</string>
   <string name="Command_Compass_Label">Compass</string>
   <string name="Command_Destinations_Label">Destinations</string>
   <string name="Command_Gestures_Label">Gestures</string>
@@ -3706,6 +3876,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Profile_Label">Profile</string>
   <string name="Command_Search_Label">Search</string>
   <string name="Command_Snapshot_Label">Snapshot</string>
+  <string name="Command_Social_Label">Facebook</string>
   <string name="Command_Speak_Label">Speak</string>
   <string name="Command_View_Label">Camera controls</string>
   <string name="Command_Voice_Label">Voice settings</string>
@@ -3715,6 +3886,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
   <string name="Command_Build_Tooltip">Building objects and reshaping terrain</string>
   <string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
+  <string name="Command_Conversations_Tooltip">Converse with everyone</string>
   <string name="Command_Compass_Tooltip">Compass</string>
   <string name="Command_Destinations_Tooltip">Destinations of interest</string>
   <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
@@ -3732,6 +3904,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Profile_Tooltip">Edit or view your profile</string>
   <string name="Command_Search_Tooltip">Find places, events, people</string>
   <string name="Command_Snapshot_Tooltip">Take a picture</string>
+  <string name="Command_Social_Tooltip">Post to Facebook</string>
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
@@ -3750,6 +3923,13 @@ Try enclosing path to the editor with double quotes.
   <string name="Preview">Preview</string>
   <string name="Normal">Normal</string>
 
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  <string name="Pathfinding_Object_Attr_None">None</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
+  <string name="Pathfinding_Object_Attr_Character">Character</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
+
   <!-- Snapshot image quality levels -->
   <string name="snapshot_quality_very_low">Very Low</string>
   <string name="snapshot_quality_low">Low</string>
@@ -3757,4 +3937,23 @@ Try enclosing path to the editor with double quotes.
   <string name="snapshot_quality_high">High</string>
   <string name="snapshot_quality_very_high">Very High</string>
 
+  <string name="TeleportMaturityExceeded">The Resident cannot visit this region.</string>
+
+  <!-- Spell check settings floater -->
+  <string name="UserDictionary">[User]</string>
+  
+  <!-- Conversation log messages -->
+  <string name="logging_calls_disabled_log_empty">
+    Conversations are not being logged. To begin keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
+  </string>
+  <string name="logging_calls_disabled_log_not_empty">
+    No more conversations will be logged. To resume keeping a log, choose "Save: Log only" or "Save: Log and transcripts" under Preferences > Chat.
+  </string>
+  <string name="logging_calls_enabled_log_empty">
+    There are no logged conversations. After you contact someone, or someone contacts you, a log entry will be shown here.
+  </string>
+  <string name="loading_chat_logs">
+    Loading...
+  </string>
+  
   </strings>
diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml
index dce6b8dd6d..fdf41991cd 100644..100755
--- a/indra/newview/skins/default/xui/en/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/en/teleport_strings.xml
@@ -45,6 +45,9 @@ Go to &apos;Welcome Island Public&apos; to repeat the tutorial.
 		<message name="no_inventory_host">
 			The inventory system is currently unavailable.
 		</message>
+    <message name="MustGetAgeRegion">
+      You must be age 18 or over to enter this region.
+    </message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@ Go to &apos;Welcome Island Public&apos; to repeat the tutorial.
 		<message name="requesting">
 			Requesting Teleport...
 		</message>
-	</message_set>
+    <message name="pending">
+      Pending Teleport...
+    </message>
+  </message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion.xml b/indra/newview/skins/default/xui/en/widgets/accordion.xml
index 55dde492ca..55dde492ca 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/accordion.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 6f68c99021..6f68c99021 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
index 4d69dda7eb..4d69dda7eb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
index 8a4ccb19f9..8a4ccb19f9 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml
index 738d150f64..738d150f64 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/badge.xml
+++ b/indra/newview/skins/default/xui/en/widgets/badge.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
index 0016a8cf53..0016a8cf53 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/bodyparts_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 2b2c3faf91..2b2c3faf91 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
new file mode 100755
index 0000000000..f9facb593a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<chat_editor
+  name="chat_editor"
+  show_context_menu="true"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index c0a948931c..c0a948931c 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index 8947024e45..8947024e45 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
deleted file mode 100644
index 0e29ed0d0b..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_adhoc
- height="23"
- name="im_adhoc_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_adhoc.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25" />
-    <chiclet_im_adhoc.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"      
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_adhoc.avatar_icon
-     bottom="3"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="adhoc_icon"
-     width="21" />
-    <chiclet_im_adhoc.unread_notifications
-     halign="center"
-     height="23"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20" />
-    <chiclet_im_adhoc.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_adhoc>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
deleted file mode 100644
index 77011139bf..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_group
- height="23"
- name="im_group_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_group.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25" />
-    <chiclet_im_group.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"      
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_group.group_icon
-     bottom="3"
-     default_icon="Generic_Group"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="group_icon"
-     width="21" />
-    <chiclet_im_group.unread_notifications
-     height="23"
-     halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20"/>
-    <chiclet_im_group.new_message_icon
-bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_group>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
deleted file mode 100644
index 8b56a8f0f6..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<chiclet_im_p2p
- height="23"
- name="im_p2p_chiclet"
- show_speaker="false"
- width="25">
-    <chiclet_im_p2p.chiclet_button
-     height="25"
-     image_selected="PushButton_On"
-     image_unselected="PushButton_Off"
-     name="chiclet_button"
-     tab_stop="false"
-     width="25"/>
-    <chiclet_im_p2p.speaker
-      image_mute="Parcel_VoiceNo_Light"
-      image_off="VoicePTT_Off_Dark"
-      image_on="VoicePTT_On_Dark"
-      image_level_1="VoicePTT_Lvl1_Dark"
-      image_level_2="VoicePTT_Lvl2_Dark"
-      image_level_3="VoicePTT_Lvl3_Dark"
-      auto_update="true"
-      draw_border="false"
-      height="24"
-      left="25"
-      bottom="1"
-      name="speaker"
-      visible="false"
-      width="20" />
-    <chiclet_im_p2p.avatar_icon
-     bottom="3"
-     color="white"
-     follows="left|top|bottom"
-     height="20"
-     left="2"
-     mouse_opaque="false"
-     name="avatar_icon"
-     width="21" />
-    <chiclet_im_p2p.unread_notifications
-     height="23"
-     halign="center"
-     left="25"
-     mouse_opaque="false"
-     name="unread"
-     text_color="white"
-     v_pad="3"
-     visible="false"
-     width="20"/>
-    <chiclet_im_p2p.new_message_icon
-  bottom="11"
-  height="14"
-  image_name="Unread_Chiclet"
-  left="12"
-  name="new_message_icon"
-  visible="false"
-  width="14" />
-</chiclet_im_p2p>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 4bc295f747..4bc295f747 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
index 5f51f4afd9..5f51f4afd9 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index db6a9434df..db6a9434df 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
index d83f44737e..d83f44737e 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index ab3de1eaab..ab3de1eaab 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index 82d620d1e6..82d620d1e6 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
index 459706c689..459706c689 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/context_menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
new file mode 100644
index 0000000000..b83d9122f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_participant
+  folder_arrow_image="Folder_Arrow"
+  item_height="24" 
+  item_top_pad="0"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"
+  left_pad="0"
+  icon_pad="10"
+  icon_width="20"
+  text_pad="7"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"
+>
+<avatar_icon
+	 follows="left"
+     height="20"
+     default_icon_name="Generic_Person"
+	 layout="topleft"
+	 top="2"
+     width="20" />
+<info_button
+	 follows="right"
+     height="16"
+     image_pressed="Info_Press"
+     image_unselected="Info_Over"
+     right="-28"
+     name="info_btn"
+     width="16" />
+<output_monitor
+	follows="right"
+	auto_update="true"
+	draw_border="false"
+	height="16"
+	right="-3"
+	mouse_opaque="true"
+	name="speaking_indicator"
+	visible="true"
+	width="20" />	 
+</conversation_view_participant>
diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
new file mode 100755
index 0000000000..b8c39eec1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<conversation_view_session
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="8"
+  item_height="24" 
+  item_top_pad="4"
+  selection_image="Rounded_Square"
+  mouse_opaque="true"
+  follows="left|top|right"
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
index 0534485ddd..0534485ddd 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/drop_down.xml b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
index 602250ace6..602250ace6 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/drop_down.xml
+++ b/indra/newview/skins/default/xui/en/widgets/drop_down.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
index 8c805da048..8c805da048 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
index c6331ec87b..c6331ec87b 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index 2cc4abdd30..2cc4abdd30 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index e05ddf9815..e05ddf9815 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 97a5ae7d4e..97a5ae7d4e 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
index 83df10e417..83df10e417 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index 6fa74f403d..bbd53ccb12 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -7,4 +7,10 @@
   selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
-  />
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
index 808683864d..808683864d 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_list.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
index 36ee6dd7eb..36ee6dd7eb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/group_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
index 92080df154..92080df154 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
+++ b/indra/newview/skins/default/xui/en/widgets/hint_popup.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml
index cf8edfcedb..cf8edfcedb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/icon.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 77d8024cb2..590a4730a9 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -5,7 +5,13 @@
   item_height="20" 
   item_top_pad="4"
   selection_image="Rounded_Square"
-  >
+  left_pad="5"
+  icon_pad="2"
+  icon_width="16"
+  text_pad="1"
+  text_pad_right="4"
+  arrow_size="12"
+  max_folder_item_overlap="2">
 	<new_badge 
         label="New" 
         label_offset_horiz="-1"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
index 7a7a6e9a09..7a7a6e9a09 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
index 830c27bdac..d5b10e7f51 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml
@@ -1,2 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<inbox_inventory_panel show_load_status="false" />
+<inbox_inventory_panel show_load_status="false"
+                       start_folder.type="inbox"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml
index 8c171c387f..8c171c387f 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/inspector.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
index da9059c819..da9059c819 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_list_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
index eaf148c5e4..eaf148c5e4 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
index a190da3909..a190da3909 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
+++ b/indra/newview/skins/default/xui/en/widgets/joystick_rotate.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
index 48bcb46533..48bcb46533 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
+++ b/indra/newview/skins/default/xui/en/widgets/layout_stack.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
index a054960bf8..a054960bf8 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/list_view.xml b/indra/newview/skins/default/xui/en/widgets/list_view.xml
index 2e976bc755..2e976bc755 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list_view.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
index ea1d89c975..ea1d89c975 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
+++ b/indra/newview/skins/default/xui/en/widgets/loading_indicator.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 44436fb6f2..4ea1aa6efb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -112,6 +112,22 @@
     follows="right|top"
     image_name="Parcel_Health_Dark"
     />
+  <pathfinding_dirty_icon
+    name="pathfinding_dirty_icon"
+    width="22"
+    height="18"
+    top="21"
+    follows="right|top"
+    image_name="Pathfinding_Dirty"
+    />
+  <pathfinding_disabled_icon
+    name="pathfinding_disabled_icon"
+    width="22"
+    height="18"
+    top="21"
+    follows="right|top"
+    image_name="Pathfinding_Disabled"
+    />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
     name="damage_text"
@@ -134,6 +150,7 @@
   <combo_button
 		name="Location History"
                 label=""
+                image_hover_unselected="ComboButton_Hovered"
                 pad_right="0"/>
   <combo_list
 	      bg_writeable_color="MenuDefaultBgColor"
diff --git a/indra/newview/skins/default/xui/en/widgets/menu.xml b/indra/newview/skins/default/xui/en/widgets/menu.xml
index 13ac84beb2..13ac84beb2 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
index 27efa72563..27efa72563 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_bar.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
index 563f3dc5c2..563f3dc5c2 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
index 24bda97f44..24bda97f44 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_call.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
index f6b06cb50b..f6b06cb50b 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_check.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
index 7452d685eb..7452d685eb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_separator.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
index 72af3924c1..72af3924c1 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
+++ b/indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
index 90b0625982..90b0625982 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
+++ b/indra/newview/skins/default/xui/en/widgets/multi_slider.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
index bbcb008df4..bbcb008df4 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/multi_slider_bar.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/name_editor.xml b/indra/newview/skins/default/xui/en/widgets/name_editor.xml
index 21ba5c77f8..21ba5c77f8 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/name_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/name_editor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/name_list.xml b/indra/newview/skins/default/xui/en/widgets/name_list.xml
index 3ae0f68227..3ae0f68227 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/name_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/name_list.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
deleted file mode 100644
index d19c47f54f..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_folder_view_folder
-  folder_arrow_image="Folder_Arrow"
-  folder_indentation="8"
-  item_height="20" 
-  item_top_pad="4"
-  selection_image="Rounded_Square"
-  >
-</outbox_folder_view_folder>
diff --git a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
deleted file mode 100644
index 3964569da2..0000000000
--- a/indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<outbox_inventory_panel show_empty_message="false" show_load_status="false" />
diff --git a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
index 9d71ceca2f..9d71ceca2f 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/output_monitor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml
index b36f723831..b36f723831 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
index 98707b8495..98707b8495 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml b/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
new file mode 100644
index 0000000000..af5aec2c34
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/person_tab_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<person_tab_view
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="5"
+  item_height="24" 
+  item_top_pad="3"
+  mouse_opaque="true"
+  follows="left|top|right"
+  text_pad="6"
+  text_pad_left="4"
+  text_pad_right="4"
+  arrow_size="10"
+  max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/en/widgets/person_view.xml b/indra/newview/skins/default/xui/en/widgets/person_view.xml
new file mode 100644
index 0000000000..46c1b7ff75
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/person_view.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<person_view
+  folder_arrow_image="Folder_Arrow"
+  folder_indentation="5"
+  item_height="24" 
+  item_top_pad="3"
+  mouse_opaque="true"
+  follows="left|top|right"
+  icon_pad="4"
+  icon_width="20"
+  text_pad="6"
+  text_pad_left="4"
+  text_pad_right="4"
+  arrow_size="10"
+  max_folder_item_overlap="2">
+    <facebook_icon
+      follows="left"
+      height="14"
+      image_name="Facebook_Icon"
+      left="5"
+      bottom="6"
+      name="facebook_icon"
+      tool_tip="Facebook User"
+      visible="false"
+      width="14" />
+    <avatar_icon
+      follows="left"
+      layout="topleft"
+      height="20"
+      default_icon_name="Generic_Person"
+      left="5"
+      top="2"
+      visible="false"
+      width="20" />
+    <last_interaction_time_textbox
+      layout="topleft"
+      follows="right"
+      font="SansSerifSmall"
+      height="15"
+      left_pad="5"
+      right="-164"
+      name="last_interaction_time_textbox"
+      text_color="LtGray_50"
+      value="0s"
+      visible="false" 
+      width="35" />
+    <permission_edit_theirs_icon
+      layout="topleft"
+      height="16"
+      follows="right"
+      image_name="Permission_Edit_Objects_Theirs"
+      left_pad="3"
+      right="-129"
+      name="permission_edit_theirs_icon"
+      tool_tip="You can edit this friend&apos;s objects"
+      top="4"
+      visible="false" 
+      width="16" />
+    <permission_edit_mine_icon
+      layout="topleft"
+      height="16"
+      follows="right"
+      image_name="Permission_Edit_Objects_Mine"
+      left_pad="3"
+      right="-110"
+      name="permission_edit_mine_icon"
+      tool_tip="This friend can edit, delete or take your objects"
+      top="4"
+      visible="false" 
+      width="16" />
+    <permission_map_icon
+      height="16"
+      follows="right"
+      image_name="Permission_Visible_Map"
+      left_pad="3"
+      tool_tip="This friend can locate you on the map"
+      right="-91"
+      name="permission_map_icon"
+      visible="false" 
+      width="16" />
+    <permission_online_icon
+      height="16"
+      follows="right"
+      image_name="Permission_Visible_Online"
+      left_pad="3"
+      right="-72"
+      name="permission_online_icon"
+      tool_tip="This friend can see when you&apos;re online"
+      visible="false" 
+      width="16" />
+    <info_btn
+      follows="right"
+      height="16"
+      image_pressed="Info_Press"
+      image_unselected="Info_Over"
+      left_pad="3"
+      right="-53"
+      name="info_btn"
+      tool_tip="More info"
+      tab_stop="false"
+      visible="false"      
+      width="16" />
+    <profile_btn
+      layout="topleft"
+      follows="right"
+      height="20"
+      image_overlay="Web_Profile_Off"
+      left_pad="5"
+      right="-28"
+      name="profile_btn"
+      tab_stop="false"
+      tool_tip="View profile"
+      top="2"
+      visible="false"
+      width="20" />
+    <output_monitor
+      auto_update="true"
+      follows="right"
+      draw_border="false"
+      height="16"
+      right="-3"
+      mouse_opaque="true"
+      name="speaking_indicator"
+      visible="false"
+      width="20" />
+ </person_view>
+
diff --git a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
index 339e53fbb8..339e53fbb8 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/progress_bar.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_group.xml b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
index ab3184d34b..ab3184d34b 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/radio_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_group.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/radio_item.xml b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
index 3ddf18b2cb..3ddf18b2cb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/radio_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/radio_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
index 682dcf40d8..682dcf40d8 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_bar.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
index 8a48fcb32d..8a48fcb32d 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_column_header.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
index a6d096a964..a6d096a964 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_container.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index e43989c6c7..e43989c6c7 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
index 40cbf5977a..40cbf5977a 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scrolling_panel_list.xml
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 ce84cfedc0..ce84cfedc0 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/search_editor.xml b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
index faa0404b35..faa0404b35 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/search_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/search_editor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
index 022564c12f..022564c12f 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml
+++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
index aa8461d367..aa8461d367 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sidetray_tab.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index a120b1aec8..a120b1aec8 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/slider.xml b/indra/newview/skins/default/xui/en/widgets/slider.xml
index f735d09476..f735d09476 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/slider.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
index 0335213ed6..0335213ed6 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/slider_bar.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml
index d7af6077e5..d7af6077e5 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/spinner.xml
+++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
index 2ff9ada90a..2ff9ada90a 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/split_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 0586119681..9559be214a 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -24,17 +24,26 @@ label_pad_left - padding to the left of tab button labels
                tab_bottom_image_unselected="Toolbar_Left_Off"
                tab_bottom_image_selected="Toolbar_Left_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
+               tab_top_image_hovered="TabTop_Left_Selected"
+               tab_button_image_hovered="Toolbar_Left_Selected"
+               tab_left_image_hovered="SegmentedBtn_Left_Selected_Over"/>
   <middle_tab tab_top_image_unselected="TabTop_Middle_Off"
                tab_top_image_selected="TabTop_Middle_Selected"
                tab_bottom_image_unselected="Toolbar_Middle_Off"
                tab_bottom_image_selected="Toolbar_Middle_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
+               tab_top_image_hovered="TabTop_Middle_Selected"
+               tab_button_image_hovered="Toolbar_Middle_Selected"
+               tab_left_image_hovered="SegmentedBtn_Left_Selected_Over"/>
   <last_tab tab_top_image_unselected="TabTop_Right_Off"
                tab_top_image_selected="TabTop_Right_Selected"
                tab_bottom_image_unselected="Toolbar_Right_Off"
                tab_bottom_image_selected="Toolbar_Right_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
-               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"/>
+               tab_left_image_selected="SegmentedBtn_Left_Selected_Over"
+               tab_top_image_hovered="TabTop_Right_Selected"
+               tab_button_image_hovered="Toolbar_Right_Selected"
+               tab_left_image_hovered="SegmentedBtn_Left_Selected_Over"/>
 </tab_container>
diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
index d792e9f29c..d792e9f29c 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
index 4f574d75d5..4f574d75d5 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/teleport_history_menu_item.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml
index 134f2d7522..2102074674 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/text.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text.xml
@@ -9,6 +9,7 @@
       h_pad="0" 
       allow_scroll="false"
       text_readonly_color="LabelTextColor"
+      text_tentative_color="TextFgTentativeColor"
       bg_writeable_color="FloaterDefaultBackgroundColor" 
       use_ellipses="false"
       bg_visible="false" 
diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
index 100571cc01..100571cc01 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/textbase.xml b/indra/newview/skins/default/xui/en/widgets/textbase.xml
index b2da2147c1..b2da2147c1 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/textbase.xml
+++ b/indra/newview/skins/default/xui/en/widgets/textbase.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
index ba2fdf4f1f..ba2fdf4f1f 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
+++ b/indra/newview/skins/default/xui/en/widgets/texture_picker.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/time.xml b/indra/newview/skins/default/xui/en/widgets/time.xml
index b5bdd564a6..b5bdd564a6 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/time.xml
+++ b/indra/newview/skins/default/xui/en/widgets/time.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
index 48950a98ad..48950a98ad 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
index 9ca15ae50d..9ca15ae50d 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tool_tip.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 0aa478ace9..0ace37a5dc 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,9 +30,9 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="99999"
-                        button_flash_rate="1.0"
-                        flash_color="EmphasisColor"/>
+                        button_flash_count="4"
+                        button_flash_rate="0.5"
+                        flash_color="BeaconColor"/>
   <button_icon pad_left="10"
                pad_right="10"
                image_bottom_pad="10"
@@ -51,7 +51,7 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="99999"
-               button_flash_rate="1.0"
-               flash_color="EmphasisColor"/>
+               button_flash_count="4"
+               button_flash_rate="0.5"
+               flash_color="BeaconColor"/>
 </toolbar>
diff --git a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
index f4dbb8f404..f4dbb8f404 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/widgets/ui_ctrl.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/view_border.xml b/indra/newview/skins/default/xui/en/widgets/view_border.xml
index bf40e3086b..bf40e3086b 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/view_border.xml
+++ b/indra/newview/skins/default/xui/en/widgets/view_border.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/web_browser.xml b/indra/newview/skins/default/xui/en/widgets/web_browser.xml
index 676fafd828..676fafd828 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/web_browser.xml
+++ b/indra/newview/skins/default/xui/en/widgets/web_browser.xml
diff --git a/indra/newview/skins/default/xui/en/widgets/window_shade.xml b/indra/newview/skins/default/xui/en/widgets/window_shade.xml
index 23eb2f13fb..23eb2f13fb 100644..100755
--- a/indra/newview/skins/default/xui/en/widgets/window_shade.xml
+++ b/indra/newview/skins/default/xui/en/widgets/window_shade.xml
diff --git a/indra/newview/skins/default/xui/en/xui_version.xml b/indra/newview/skins/default/xui/en/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/en/xui_version.xml
+++ b/indra/newview/skins/default/xui/en/xui_version.xml
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 307b61133f..e0a2375067 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -8,7 +8,9 @@
 		Compilado con [COMPILER], versión [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Estás en la posición [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1], de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(coordenadas globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -66,27 +68,26 @@ Versión del servidor de voz: [VOICE_VERSION]
 		</panel>
 		<panel label="Licencias" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         El visor de Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (y sus licenciadores). Reservados todos los derechos. Vea los detalles en www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index fd54d74af2..f8c40d798a 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -465,7 +465,7 @@ los media:
 				Permitir únicamente el acceso a los Residentes que:
 			</text>
 			<check_box label="Han aportado información de pago [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Para poder acceder a esta parcela los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
-			<check_box label="Han verificado su edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Para poder acceder a esta parcela los Residentes deben haber verificado su edad. Para más información, ver [SUPPORT_SITE]."/>
+			<check_box label="Son mayores de 18 años [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Para poder acceder a esta parcela los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
 			<check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
 			<check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/es/floater_activeim.xml b/indra/newview/skins/default/xui/es/floater_activeim.xml
index 988786c1ae..988786c1ae 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/es/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
deleted file mode 100644
index d57405f7e5..0000000000
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Fallo al iniciar el movimiento
-	</floater.string>
-	<floater.string name="anim_too_long">
-		El archivo de la animación dura [LENGTH] segundos.
-
-La duración máxima de una animación es de [MAX_LENGTH] segundos.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		No se ha podido leer el archivo de la animación.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fin prematuro del archivo.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		No se puede leer la definición de la restricción.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		No se puede abrir el archivo BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		&apos;HIERARCHY header&apos; inválido.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		No se pueden encontrar &apos;ROOT&apos; o &apos;JOINT&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		No se puede obtener el nombre &apos;JOINT&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		No se puede encontrar &apos;OFFSET&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		No se puede encontrar &apos;CHANNELS&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		No se puede conseguir el orden de la rotación.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		No se puede encontrar el eje de rotación.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		No se puede encontrar &apos;MOTION&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		No se puede conseguir el número de frames.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		No se puede conseguir el tiempo del frame.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		No se pueden conseguir los valores de la posición.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		No se pueden conseguir los valores de la rotación.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		No se puede abrir el archivo de traducción.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		No se puede leer el encabezamiento de la traducción.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		No se puede leer la traducción de los nombres.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		No se puede leer la traducción de los valores ignorados.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		No se puede leer el valor relativo de la traducción.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		No se puede leer la traducción del valor &apos;outname&apos;
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		No se puede leer la matriz de traducciones.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		No se puede conseguir el nombre &apos;mergechild&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		No se puede conseguir el nombre &apos;mergeparent&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		No se puede obtener el valor prioritario.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		No se puede conseguir el valor del bucle.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		No se pueden conseguir los valores &apos;easeIn&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		No se pueden conseguir los valores &apos;easeOut&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		No se puede conseguir el valor de &apos;hand morph&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		No se puede leer el nombre del gesto.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nombre incorrecto de &apos;root joint&apos;, usa &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		Nombre:
-	</text>
-	<text name="description_label">
-		Descripción:
-	</text>
-	<spinner label="Prioridad:" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta"/>
-	<check_box label="Bucle:" name="loop_check" tool_tip="Hace esta animación en bucle"/>
-	<spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indica el punto en el que la animación vuelve a empezar"/>
-	<spinner label="Acaba(%)" name="loop_out_point" tool_tip="Indica el punto en el que la animación acaba el bucle"/>
-	<text name="hand_label">
-		Posición de las manos
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación">
-		<combo_box.item label="Extendidas" name="Spread"/>
-		<combo_box.item label="Relajadas" name="Relaxed"/>
-		<combo_box.item label="Ambas señalan" name="PointBoth"/>
-		<combo_box.item label="Puño" name="Fist"/>
-		<combo_box.item label="La izq. relajada" name="RelaxedLeft"/>
-		<combo_box.item label="La izq. señala" name="PointLeft"/>
-		<combo_box.item label="Puño izq." name="FistLeft"/>
-		<combo_box.item label="La der. relajada" name="RelaxedRight"/>
-		<combo_box.item label="La der. señala" name="PointRight"/>
-		<combo_box.item label="Puño der." name="FistRight"/>
-		<combo_box.item label="La derecha saluda" name="SaluteRight"/>
-		<combo_box.item label="Escribiendo" name="Typing"/>
-		<combo_box.item label="&apos;Paz&apos; en la der." name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expresión
-	</text>
-	<combo_box name="emote_combo" tool_tip="Controla qué hace la cara durante la animación">
-		<item label="(ninguno)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Con miedo" name="Afraid" value="Miedo"/>
-		<item label="Enfado" name="Angry" value="Enfado"/>
-		<item label="Gran sonrisa" name="BigSmile" value="Gran sonrisa"/>
-		<item label="Aburrimiento" name="Bored" value="Aburrimiento"/>
-		<item label="Llorar" name="Cry" value="Lloro"/>
-		<item label="Desdén" name="Disdain" value="Desdén"/>
-		<item label="Avergonzarse" name="Embarrassed" value="Vergüenza"/>
-		<item label="Fruncir el ceño" name="Frown" value="Fruncir el ceño"/>
-		<item label="Beso" name="Kiss" value="Beso"/>
-		<item label="Reír" name="Laugh" value="Risa"/>
-		<item label="Sacar la lengua" name="Plllppt" value="Sacar la lengua"/>
-		<item label="Rechazo" name="Repulsed" value="Rechazo"/>
-		<item label="Triste" name="Sad" value="Tristeza"/>
-		<item label="Encogerse de hombros" name="Shrug" value="Encogerse de hombros"/>
-		<item label="Sonrisa" name="Smile" value="Sonrisa"/>
-		<item label="Sorpresa" name="Surprise" value="Sorpresa"/>
-		<item label="Guiño" name="Wink" value="Guiño"/>
-		<item label="Preocupación" name="Worry" value="Preocupación"/>
-	</combo_box>
-	<text name="preview_label">
-		Vista previa mientras
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
-		<item label="De pie" name="Standing" value="De pie"/>
-		<item label="Caminando" name="Walking" value="Caminando"/>
-		<item label="Sentado/a" name="Sitting" value="Sentado"/>
-		<item label="Volando" name="Flying" value="Volando"/>
-	</combo_box>
-	<spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones"/>
-	<spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones"/>
-	<button bottom_delta="-32" name="play_btn" tool_tip="Ejecutar tu animación"/>
-	<button name="pause_btn" tool_tip="Pausar tu animación"/>
-	<button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		No se ha podido leer el archivo de la animación.
-
-Recomendamos usar archivos BVH exportados de Poser 4.
-	</text>
-	<button label="Subir ([AMOUNT] L$)" name="ok_btn"/>
-	<button label="Cancelar" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
index 6faf19dbb5..6faf19dbb5 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_auction.xml
+++ b/indra/newview/skins/default/xui/es/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
new file mode 100755
index 0000000000..15abccc376
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Configuración de reemplazo automático">
+	<check_box label="Habilitar el reemplazo automático" name="autoreplace_enable" tool_tip="Al escribir el texto del chat, reemplaza las palabras clave especificadas con la sustitución correspondiente"/>
+	<button label="Importar lista..." name="autoreplace_import_list" tool_tip="Carga una lista previamente exportada desde un archivo."/>
+	<button label="Exportar lista..." name="autoreplace_export_list" tool_tip="Guarda la lista seleccionada en un archivo para poder compartirla."/>
+	<button label="Lista nueva..." name="autoreplace_new_list" tool_tip="Crea una lista nueva."/>
+	<button label="Eliminar lista" name="autoreplace_delete_list" tool_tip="Elimina la lista seleccionada."/>
+	<button name="autoreplace_list_up" tool_tip="Aumenta la prioridad de esta lista."/>
+	<button name="autoreplace_list_down" tool_tip="Baja la prioridad de esta lista."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Palabra clave" name="keyword"/>
+		<scroll_list.columns label="Reemplazo" name="replacement"/>
+	</scroll_list>
+	<button label="Añadir..." name="autoreplace_add_entry"/>
+	<button label="Eliminar" name="autoreplace_delete_entry"/>
+	<button label="Guardar entrada" name="autoreplace_save_entry" tool_tip="Guarda esta entrada."/>
+	<button label="Guardar cambios" name="autoreplace_save_changes" tool_tip="Guarda todos los cambios."/>
+	<button label="Cancelar" name="autoreplace_cancel" tool_tip="Descarta todos los cambios."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/es/floater_avatar.xml b/indra/newview/skins/default/xui/es/floater_avatar.xml
index 21d202309f..21d202309f 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
index 49fce5d4ec..49fce5d4ec 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
index 54ef34264c..54ef34264c 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml
index 49f990c84d..49f990c84d 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/es/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index a3e656cc17..a3e656cc17 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
index f1948220b4..5cd8b3c01f 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDITAR LOS PERMISOS DEL CONTENIDO">
+<floater name="floaterbulkperms" title="AJUSTAR LOS PERMISOS DEL CONTENIDO">
 	<floater.string name="nothing_to_modify_text">
 		Lo seleccionado tiene contenidos no editables.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Todos" label_selected="Todo" name="check_all"/>
 	<button label="Limpiar" label_selected="Ninguno" name="check_none"/>
 	<text name="newperms">
-		Permisos nuevos del contenido
+		Ajustar los permisos del contenido a
 	</text>
 	<text name="GroupLabel">
 		Grupo:
@@ -49,6 +49,7 @@
 	<check_box label="Modificarlo" name="next_owner_modify"/>
 	<check_box label="Copiarlo" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transferirlo" name="next_owner_transfer" tool_tip="El próximo propietario puede dar o revender este objeto"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Aplicar" name="apply"/>
 	<button label="Cancelar" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
index 6d4196ca7c..6d4196ca7c 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 3563d4bd0f..3563d4bd0f 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index 2c8848265f..2c8848265f 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml
index 08ea67d4cb..08ea67d4cb 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index 005fe90318..005fe90318 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml
index a774bc6d05..a774bc6d05 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
index b0704ab788..b0704ab788 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_camera.xml
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/es/floater_chat_bar.xml b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
index 2e94805057..02369c9a43 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT">
+<floater name="nearby_chat" title="CHAT">
 	<panel name="bottom_panel">
 		<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 		<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml
index a5967b814e..a5967b814e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/es/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
index ed168c09d5..ed168c09d5 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
new file mode 100644
index 0000000000..9202fab92d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar la gente" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
new file mode 100644
index 0000000000..f579e720fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSACIÓN:">
+	<floater.string name="Title">
+		CONVERSACIÓN: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml
index e5cbea8810..e5cbea8810 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_critical.xml
+++ b/indra/newview/skins/default/xui/es/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
index 5e7df8530e..5e7df8530e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/es/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/es/floater_destinations.xml b/indra/newview/skins/default/xui/es/floater_destinations.xml
index df18698d2f..df18698d2f 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/es/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml
index f1a31a6776..f1a31a6776 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/es/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
index 6ac46351db..6ac46351db 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/es/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
index d2197b80fa..d2197b80fa 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/es/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
index f90ad59f78..f90ad59f78 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/es/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/es/floater_environment_settings.xml b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
index a9c5705d52..a9c5705d52 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/es/floater_event.xml b/indra/newview/skins/default/xui/es/floater_event.xml
index d2724bf8b0..d2724bf8b0 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_event.xml
diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
index eeb39583ef..eeb39583ef 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml
index 9a665321a4..9a665321a4 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/es/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index d90de8c9f4..d90de8c9f4 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
index 218a5effe8..218a5effe8 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/es/floater_goto_line.xml b/indra/newview/skins/default/xui/es/floater_goto_line.xml
new file mode 100644
index 0000000000..ef3ed80fcb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="IR A LA LÍNEA">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Ir a la línea
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
index b96076836b..c2327c96c4 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Activar VBO:
 	</text>
 	<check_box initial_value="true" label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
+	<text name="tc label">
+		Activar S3TC:
+	</text>
+	<check_box initial_value="true" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas de la memoria de vídeo, lo cual permite cargar texturas de una resolución más alta, pero con una cierta pérdida de calidad del color."/>
 	<slider label="Memoria para texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también hacer que las texturas se vean borrosas."/>
 	<spinner label="Intensidad de la niebla:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/es/floater_help_browser.xml b/indra/newview/skins/default/xui/es/floater_help_browser.xml
index 5ebd7ad6e0..5ebd7ad6e0 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/es/floater_how_to.xml b/indra/newview/skins/default/xui/es/floater_how_to.xml
index 4a57dc3643..4a57dc3643 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/es/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml
index e458913452..e458913452 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_hud.xml
+++ b/indra/newview/skins/default/xui/es/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
index 1cd752e6ec..f772441141 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSACIONES"/>
+<multi_floater name="floater_im_box" title="CONVERSACIONES">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
+					<button name="add_btn" tool_tip="Iniciar una conversación nueva"/>
+					<button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Cerrar este panel"/>
+					<text name="stub_textbox">
+						Esta conversación está en una ventana aparte.   [secondlife:/// Traerla de vuelta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 3d9d17fc81..e5f48e3fd5 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/>
+	<floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/>
+	<floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/>
+	<floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<button name="add_btn" tool_tip="Añadir alguien a esta conversación"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexión de voz"/>
+				<button name="close_btn" tool_tip="Finalizar esta conversación"/>
+				<button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
index 84c5bfc824..84c5bfc824 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/es/floater_import_collada.xml b/indra/newview/skins/default/xui/es/floater_import_collada.xml
index 7e9a00797a..7e9a00797a 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/es/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index b5b756abb6..acbb25b713 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anónimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		está llamando.
+		te está llamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha entrado en un chat de voz en multiconferencia.
@@ -25,9 +25,9 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz?
 	</floater.string>
 	<text name="question">
-		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
+		Si respondes, te desconectarás de la conversación de voz actual.
 	</text>
-	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
-	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
-	<button label="Comenzar un MI" name="Start IM"/>
+	<button label="Responder" label_selected="Responder" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Abrir MI en su lugar" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
index d95653ddd0..d95653ddd0 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/es/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
deleted file mode 100644
index 0f0ba2fce6..0000000000
--- a/indra/newview/skins/default/xui/es/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MI INVENTARIO">
-	<floater.string name="Title">
-		MI INVENTARIO
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MI INVENTARIO (obteniendo [ITEM_COUNT] ítems...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MI INVENTARIO ([ITEM_COUNT] ítems) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Obtenido
-	</floater.string>
-	<panel label="Panel del inventario" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index bf84c3d808..bf84c3d808 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 6004034504..6004034504 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
index 2c1804bd90..2c1804bd90 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
index 227689a194..227689a194 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index ed7055b3a1..ed7055b3a1 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index 4ff54bccb5..4ff54bccb5 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
index 43a7ede030..43a7ede030 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/es/floater_map.xml b/indra/newview/skins/default/xui/es/floater_map.xml
index 69f638418e..69f638418e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_map.xml
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
index 9c4ef1eb2f..9c4ef1eb2f 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/es/floater_media_settings.xml b/indra/newview/skins/default/xui/es/floater_media_settings.xml
index 3f7cef5785..3f7cef5785 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
index da8ba780bc..da8ba780bc 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
index a7c17fc136..a7c17fc136 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
index ab3ba5aed7..e2313bce99 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triángulos" name="triangles" value="Triángulos"/>
 				<text initial_value="Vértices" name="vertices" value="Vértices"/>
 				<text initial_value="Alto" name="high_label" value="Alto"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Medio" name="medium_label" value="Medio"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+					<item name="Use LoD above" value="Usar nivel de detalle superior"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Bajo" name="low_label" value="Bajo"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+					<item name="Use LoD above" value="Usar nivel de detalle superior"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Mínimo" name="lowest_label" value="Mínimo"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+					<item name="Use LoD above" value="Usar nivel de detalle superior"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Generar normales" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/es/floater_model_wizard.xml b/indra/newview/skins/default/xui/es/floater_model_wizard.xml
deleted file mode 100644
index 5bd6b5e0e5..0000000000
--- a/indra/newview/skins/default/xui/es/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="CARGAR ASISTENTE DE MODELO">
-	<button label="5. Subir" name="upload_btn"/>
-	<button label="4. Revisar" name="review_btn"/>
-	<button label="3. Física" name="physics_btn"/>
-	<button label="2. Optimizar" name="optimize_btn"/>
-	<button label="1. Seleccionar archivo" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Elige el archivo de modelo
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Usuarios avanzados: si tienes experiencia con las herramientas de creación de contenidos 3D, quizá te interese utilizar la función de subida avanzada.
-			</text>
-			<button label="Cambiar al modo Avanzado" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Elige el archivo de modelo que deseas subir
-			</text>
-			<button label="Examinar..." label_selected="Examinar..." name="browse"/>
-			<text name="Model types">
-				‎Second Life admite los archivos COLLADA (.dae)
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				ATENCIÓN:
-			</text>
-			<text name="warning_text">
-				No podrás completar el paso final de la subida de este modelo a los servidores de Second Life. [secondlife:///app/floater/learn_more Averigua cómo] configurar tu cuenta para subir modelos de malla.
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Optimizar el modelo
-			</text>
-		</panel>
-		<text name="optimize_description">
-			Hemos optimizado el rendimiento del modelo, pero puedes ajustarlo más si lo deseas.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Generar el nivel de detalle: Alto
-			</text>
-			<text name="medium_detail_text">
-				Generar el nivel de detalle: Medio
-			</text>
-			<text name="low_detail_text">
-				Generar el nivel de detalle: Bajo
-			</text>
-			<text name="lowest_detail_text">
-				Generar el nivel de detalle: Mínimo
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Recalcular la geometría" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Vista previa de geometría
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="LOD para ver en renderizado de prueba">
-				<combo_item name="high">
-					Detalle alto
-				</combo_item>
-				<combo_item name="medium">
-					Detalles medios
-				</combo_item>
-				<combo_item name="low">
-					Detalle bajo
-				</combo_item>
-				<combo_item name="lowest">
-					Detalles mínimos
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Ajustar la física
-			</text>
-		</panel>
-		<text name="physics_description">
-			Crearemos una forma para la apariencia exterior del modelo. Ajusta el nivel de detalle de la forma según se necesite para el propósito proyectado del modelo.
-		</text>
-		<panel name="physics_content">
-			<button label="Recalcular física" name="recalculate_physics_btn"/>
-			<button label="Recalculando..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Prueba de física
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="LOD para ver en renderizado de prueba">
-				<combo_item name="high">
-					Detalle alto
-				</combo_item>
-				<combo_item name="medium">
-					Detalles medios
-				</combo_item>
-				<combo_item name="low">
-					Detalle bajo
-				</combo_item>
-				<combo_item name="lowest">
-					Detalles mínimos
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				Revisar
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Impacto en la parcela/región: [EQUIV] equivalentes en prim
-			</text>
-			<text name="review_fee">
-				Cargaremos en tu cuenta el precio de subida de L$ [FEE].
-			</text>
-			<text name="review_confirmation">
-				Al pulsar en el botón de subida, confirmas que posees los derechos necesarios sobre el material que contiene el modelo.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Subida finalizada
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Se ha subido tu modelo.
-		</text>
-		<text name="inventory_text">
-			Puedes buscar la carpeta Objetos en tu inventario.
-		</text>
-		<text name="charged_fee">
-			Se han cargado [FEE] L$ en tu cuenta.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Atrás" name="back"/>
-	<button label="Siguiente &gt;&gt;" name="next"/>
-	<button label="Calcular pesos y precio &gt;&gt;" name="calculate"/>
-	<button label="Calculando..." name="calculating"/>
-	<button label="Subir" name="upload" tool_tip="Cargar al simulador"/>
-	<button label="Cancelar" name="cancel"/>
-	<button label="Cerrar" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Inactivo
-	</string>
-	<string name="status_parse_error">
-		Problema de análisis de DAE - consulta los datos en el registro.
-	</string>
-	<string name="status_reading_file">
-		Cargando...
-	</string>
-	<string name="status_generating_meshes">
-		Generando redes...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Error: El número de intersección es superior a 65534. Cancelado.
-	</string>
-	<string name="bad_element">
-		Error: el elemento no es válido
-	</string>
-	<string name="high">
-		Alto
-	</string>
-	<string name="medium">
-		Media
-	</string>
-	<string name="low">
-		Bajo
-	</string>
-	<string name="lowest">
-		Mínimo
-	</string>
-	<string name="mesh_status_good">
-		Factúralo.
-	</string>
-	<string name="mesh_status_na">
-		N/A
-	</string>
-	<string name="mesh_status_none">
-		Ninguno
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Los niveles de detalle poseen un número distinto de caras a las que se pueden aplicar texturas.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Los niveles de detalle poseen un número distinto de ejemplos de red.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		El nivel de detalle posee demasiadas intersecciones.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Falta un nivel de detalle requerido.
-	</string>
-	<string name="layer_all">
-		Todo
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
index 0e7b950bd3..0e7b950bd3 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/es/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
index 4cd16a59ed..4cd16a59ed 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/es/floater_my_appearance.xml b/indra/newview/skins/default/xui/es/floater_my_appearance.xml
index 774babf04e..774babf04e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/es/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/es/floater_my_inventory.xml b/indra/newview/skins/default/xui/es/floater_my_inventory.xml
index 0efd9f1c6d..0efd9f1c6d 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/es/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
deleted file mode 100644
index b3b8cdcfff..0000000000
--- a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT">
-	<check_box label="Traducir chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_object_weights.xml b/indra/newview/skins/default/xui/es/floater_object_weights.xml
index 50c4f0518d..50c4f0518d 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/es/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
index b8b688df60..b8b688df60 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/es/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
index f48d0d2d0c..f48d0d2d0c 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/es/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
index 5fd9dba9ac..5fd9dba9ac 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..e3ee0563d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personajes de pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Consultando los personajes de pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Se ha detectado un error al consultar los personajes de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		No hay personajes de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personajes seleccionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Cargando]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Desconocido]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[grupo]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nombre" name="name"/>
+			<scroll_list.columns label="Descripción" name="description"/>
+			<scroll_list.columns label="Propietario" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitud" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personajes:
+		</text>
+		<button label="Actualizar la lista" name="refresh_objects_list"/>
+		<button label="Seleccionar todo" name="select_all_objects"/>
+		<button label="No seleccionar ninguno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Acciones en los personajes seleccionados:
+		</text>
+		<check_box label="Mostrar baliza" name="show_beacon"/>
+		<check_box label="Mostrar la cápsula de física" name="show_physics_capsule"/>
+		<button label="Tomar" name="take_objects"/>
+		<button label="Tomar una copia" name="take_copy_objects"/>
+		<button label="Teleportarme a él" name="teleport_me_to_object" tool_tip="Se habilita solo cuando está seleccionado un personaje."/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Eliminar" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..e93ecc9e10
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Vista/prueba de pathfinding">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		No se encuentra la implementación de la biblioteca de localización de rutas.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Esperando a que termine la carga de la región.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Comprobando el estado del navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Descargando el navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		El navmesh se ha modificado en el servidor. Descargando el último navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Se ha descargado el último navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		No se puede descargar el navmesh correctamente.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		El navmesh tiene cambios pendientes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		El navmesh se está construyendo.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Algunas regiones del navmesh tienen cambios pendientes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Algunas regiones del navmesh se están construyendo.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Algunas regiones del navmesh tienen cambios pendientes y otras se están construyendo.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		El navmesh está actualizado.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		No se encuentra la implementación de la biblioteca de localización de rutas.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Elige los puntos inicial y final.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Elige el punto inicial.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Elige el punto final.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		La ruta se muestra de color naranja.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		No se encuentra una ruta entre los puntos seleccionados.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Error durante la generación de la ruta.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Vista" name="view_panel">
+			<text name="show_label">
+				Mostrar:
+			</text>
+			<check_box label="Mundo virtual" name="show_world"/>
+			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
+			<check_box label="Navmesh" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Mostrar el mapa de transitabilidad:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="No mostrar" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Personaje de tipo A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Personaje de tipo B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Personaje de tipo C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Personaje de tipo D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Objetos transitables" name="show_walkables"/>
+			<check_box label="Volúmenes materiales" name="show_material_volumes"/>
+			<check_box label="Obstáculos estáticos" name="show_static_obstacles"/>
+			<check_box label="Volúmenes de exclusión" name="show_exclusion_volumes"/>
+			<check_box label="Plano de agua" name="show_water_plane"/>
+			<check_box label="Con visión de rayos X" name="show_xray"/>
+		</panel>
+		<panel label="Probar ruta" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl-clic para seleccionar el punto inicial.
+			</text>
+			<text name="shift_click_label">
+				Mayús-clic para seleccionar el punto final.
+			</text>
+			<text name="character_width_label">
+				Ancho del personaje
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Tipo de personaje
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Ninguno" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Borrar ruta" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..e6f864eef5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Linksets de pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Consultando los linksets de pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Se ha detectado un error al consultar los linksets de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modificando los linksets de pathfinding seleccionados...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Se ha detectado un error al modificar los linksets de pathfinding seleccionados.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		No hay linksets de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] linksets seleccionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terreno]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Cargando]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Desconocido]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[grupo]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Sí
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		No
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Desconocido
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Objeto transitable
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Obstáculo estático
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Obstáculo móvil
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volumen material
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volumen de exclusión
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Inmaterial móvil
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[no modificable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restringido]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[cóncavo]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restringido,cóncavo]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Elegir la utilización del linkset...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtrar por utilización de linkset..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Objeto transitable" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Obstáculo estático" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Obstáculo móvil" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volumen material" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volumen de exclusión" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Inmaterial móvil" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Aplicar" name="apply_filters"/>
+		<button label="Limpiar" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nombre (prim raíz)" name="name"/>
+			<scroll_list.columns label="Descripción (prim raíz)" name="description"/>
+			<scroll_list.columns label="Propietario" name="owner"/>
+			<scroll_list.columns label="Con scripts" name="scripted"/>
+			<scroll_list.columns label="Impacto" name="land_impact"/>
+			<scroll_list.columns label="Distancia" name="dist_from_you"/>
+			<scroll_list.columns label="Utilización de linkset" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Linksets:
+		</text>
+		<button label="Actualizar la lista" name="refresh_objects_list"/>
+		<button label="Seleccionar todo" name="select_all_objects"/>
+		<button label="No seleccionar ninguno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Mostrar baliza" name="show_beacon"/>
+		<button label="Tomar" name="take_objects"/>
+		<button label="Tomar una copia" name="take_copy_objects"/>
+		<button label="Teleportarme a él" name="teleport_me_to_object"/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Eliminar" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Transitabilidad:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Transitabilidad de los personajes de tipo A. El tipo del personaje del ejemplo es humanoide."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Transitabilidad de los personajes de tipo B. El tipo del personaje del ejemplo es criatura."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Transitabilidad de los personajes de tipo C. El tipo del personaje del ejemplo es mecánico."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Transitabilidad de los personajes de tipo D. El tipo del personaje del ejemplo es otro."/>
+		<button label="Aplicar cambios" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoide)
+		</text>
+		<text name="suggested_use_b_label">
+			(Criatura)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mecánico)
+		</text>
+		<text name="suggested_use_d_label">
+			(Otro)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index ad9a43ad71..ad9a43ad71 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 4767f4dfa0..4767f4dfa0 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/es/floater_people.xml b/indra/newview/skins/default/xui/es/floater_people.xml
index f5a3eab008..f5a3eab008 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_people.xml
+++ b/indra/newview/skins/default/xui/es/floater_people.xml
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
index 93e2088aba..93e2088aba 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/es/floater_picks.xml b/indra/newview/skins/default/xui/es/floater_picks.xml
index 255aa5dcdc..255aa5dcdc 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_picks.xml
+++ b/indra/newview/skins/default/xui/es/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/es/floater_places.xml b/indra/newview/skins/default/xui/es/floater_places.xml
index 12c6548205..12c6548205 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_places.xml
+++ b/indra/newview/skins/default/xui/es/floater_places.xml
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
index 5c62ccde36..5c62ccde36 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
deleted file mode 100644
index b5b9805fe2..0000000000
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="FOTO POR CORREO">
-	<text name="to_label">
-		Correo del destinatario:
-	</text>	
-	<text name="from_label">
-		Su correo:
-	</text>	
-	<text name="name_label">
-		Su nombre:
-	</text>	
-	<text name="subject_label">
-		Asunto:
-	</text>
-	<line_editor label="Escriba aquí el asunto." name="subject_form"/>
-	<text name="msg_label">
-		Mensaje:
-	</text>
-	<text_editor name="msg_form">
-		Escriba aquí el mensaje.
-	</text_editor>
-	<text name="fine_print">
-		Si su destinatario se registra en [SECOND_LIFE],
-usted conseguirá un bono de referido.
-	</text>
-	<button label="Cancelar" name="cancel_btn"/>
-	<button label="Enviar" name="send_btn"/>
-	<string name="default_subject">
-		Postal desde [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		¡Mira esto!
-	</string>
-	<string name="upload_message">
-		Enviando...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index 372680f55d..372680f55d 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
index f656f5d662..f656f5d662 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index c3f377a71a..c3f377a71a 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
index bd13262dcd..bd13262dcd 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
index d05a023279..d05a023279 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
index 62525c9536..62525c9536 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index 4012191c78..4012191c78 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
index 8d6cdc86c0..8d6cdc86c0 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/es/floater_publish_classified.xml b/indra/newview/skins/default/xui/es/floater_publish_classified.xml
index a1645f0c64..a1645f0c64 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/es/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
index 40851f897e..40851f897e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/es/floater_region_info.xml b/indra/newview/skins/default/xui/es/floater_region_info.xml
index 46d0839238..46d0839238 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/es/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index dc5d430375..dc5d430375 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
index e7eddfd9f3..e7eddfd9f3 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml
index db9fd5f36e..db9fd5f36e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/es/floater_script_limits.xml b/indra/newview/skins/default/xui/es/floater_script_limits.xml
index 410f7b5e36..410f7b5e36 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
index 5c190a4682..5c190a4682 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
index 39c84103c4..39c84103c4 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
index 1ab6682023..1ab6682023 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml
index e24d8064a1..e24d8064a1 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_search.xml
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
index 6503a3d5cb..6503a3d5cb 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
index d883683945..d883683945 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index 1da2e491e1..1da2e491e1 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index 23078b3a55..23078b3a55 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/es/floater_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
index 0291f9e796..0291f9e796 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
index 8b8d9f13ce..8b8d9f13ce 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck.xml b/indra/newview/skins/default/xui/es/floater_spellcheck.xml
new file mode 100755
index 0000000000..b664b96928
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Configuración del corrector ortográfico">
+	<check_box label="Habilitar la revisión ortográfica" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Diccionario principal:
+	</text>
+	<text label="Registros:" name="spellcheck_additional">
+		Diccionarios adicionales:
+	</text>
+	<text name="spellcheck_available">
+		Disponibles
+	</text>
+	<text name="spellcheck_active">
+		Activos
+	</text>
+	<button label="Eliminar" name="spellcheck_remove_btn"/>
+	<button label="Importar..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..bd86ed00da
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Importar diccionario">
+	<button label="Examinar" label_selected="Examinar" name="dictionary_path_browse"/>
+	<button label="Importar" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
index ba4af2e866..00601920f2 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris generados por segundo" name="ktrissec"/>
 					<stat_bar label="Objetos en total" name="objs"/>
 					<stat_bar label="Objetos nuevos" name="newobjs"/>
+					<stat_bar label="Índice de aciertos de caché de objetos" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Textura" name="texture">
+					<stat_bar label="Índice de aciertos de caché" name="texture_cache_hits"/>
+					<stat_bar label="Latencia de lectura de caché" name="texture_cache_read_latency"/>
 					<stat_bar label="Número" name="numimagesstat"/>
 					<stat_bar label="Raw: número" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>
@@ -44,6 +47,12 @@
 					<stat_bar label="Objetos con bajo nivel de detalle" name="physicslodtasks"/>
 					<stat_bar label="Memoria asignada" name="physicsmemoryallocated"/>
 				</stat_view>
+				<stat_bar label="Scripts ejecutados" name="simpctscriptsrun"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="Tiempo de paso de IA" name="simsimaistepmsec"/>
+					<stat_bar label="Pasos de silueta omitidos" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personajes actualizados" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_view label="Tiempo (ms)" name="simperf">
 					<stat_bar label="Tiempo total de los frames" name="simframemsec"/>
 					<stat_bar label="Tiempo de red" name="simnetmsec"/>
diff --git a/indra/newview/skins/default/xui/es/floater_sys_well.xml b/indra/newview/skins/default/xui/es/floater_sys_well.xml
index 8c8190be55..8c8190be55 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/es/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
index 87cc9c1659..87cc9c1659 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/es/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml
index b479d5f6d6..b479d5f6d6 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/es/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index ed2787ea60..01b024bc3e 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -1,24 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="DESTACADO: TEXTURA">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Pulse para elegir una imagen
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Elegir:
+	</floater.string>
 	<text name="Multiple">
 		Texturas múltiples
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventario" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Tamaño: [DIMENSIONS]
 	</text>
 	<button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/>
-	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
-	<check_box label="Ver las carpetas" name="show_folders_check"/>
-	<search_editor label="Filtrar las texturas" name="inventory search editor"/>
-	<check_box label="Aplicarlo ahora" name="apply_immediate_check"/>
+	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Vista previa inhabilitada"/>
+	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
+	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
+	<button label="Añadir" label_selected="Añadir" name="l_add_btn"/>
+	<button label="Eliminar" label_selected="Eliminar" name="l_rem_btn"/>
+	<button label="Subir" label_selected="Subir" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nombre" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Elegir:
-	</string>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..59aaf7f74a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Depurador de obtención de texturas">
+	<text name="total_num_fetched_label">
+		1, Número total de texturas obtenidas: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Número total de solicitudes de obtención: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Número total de aciertos de caché: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Número total de texturas visibles: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Número total de solicitudes de obtención de texturas visibles: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Número total de datos obtenidos: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Número total de datos visibles: [SIZE1] KB, Datos descodificados: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Número total de datos representados: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tiempo total en lecturas de caché: [TIME] segundos
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tiempo total en escrituras de caché: [TIME] segundos
+	</text>
+	<text name="total_time_decode_label">
+		11, Tiempo total en descodificaciones: [TIME] segundos
+	</text>
+	<text name="total_time_gl_label">
+		12, Tiempo total en la creación de texturas gl: [TIME] segundos
+	</text>
+	<text name="total_time_http_label">
+		13, Tiempo total en obtención de HTTP: [TIME] segundos
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tiempo total en obtención completa: [TIME] segundos
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Volviendo a obtener visibles de la caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, Volviendo a obtener todas las texturas de caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, Volviendo a obtener visibles de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, Volviendo a obtener todas las texturas de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<spinner label="19, Proporción de texeles/píxeles:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, Fuente de texturas:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Caché + HTTP" name="0"/>
+		<radio_item label="Solo HTTP" name="1"/>
+	</radio_group>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Restablecer" name="clear_btn"/>
+	<button label="Cerrar" name="close_btn"/>
+	<button label="Lectura de caché" name="cacheread_btn"/>
+	<button label="Escritura de caché" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Descodificar" name="decode_btn"/>
+	<button label="Textura GL" name="gl_btn"/>
+	<button label="Volver a obtener caché de vis." name="refetchviscache_btn"/>
+	<button label="Volver a obtener toda la caché" name="refetchallcache_btn"/>
+	<button label="Volver a obtener HTTP de vis." name="refetchvishttp_btn"/>
+	<button label="Volver a obtener todo el HTTP" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 650b4b457d..32baa5bb7d 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -128,6 +128,12 @@
 			<panel.string name="text modify info 4">
 				No puedes modificar estos objetos
 			</panel.string>
+			<panel.string name="text modify info 5">
+				No se puede modificar este objeto a través del límite de una región
+			</panel.string>
+			<panel.string name="text modify info 6">
+				No se pueden modificar estos objetos a través del límite de una región
+			</panel.string>
 			<panel.string name="text modify warning">
 				Para configurar los permisos, debes seleccionar el objeto completo
 			</panel.string>
@@ -177,12 +183,12 @@
 				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="En venta:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copia" name="Copy"/>
 				<combo_box.item label="Contenidos" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Precio: L$" name="Edit Cost"/>
 			<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -218,6 +224,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Atributos de pathfinding:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objeto" name="Object">
 			<check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/>
@@ -432,16 +443,11 @@
 				<combo_box.item label="succión" name="suction"/>
 				<combo_box.item label="tejido" name="weave"/>
 			</combo_box>
-			<check_box initial_value="falso" label="Alinear caras del plano" name="checkbox planar align" tool_tip="Alinear texturas en todas las caras seleccionadas con la última cara seleccionada. Requiere la representación de texturas en el plano."/>
-			<text name="rpt">
-				Repeticiones por cara
-			</text>
 			<spinner label="Horizontal (U)" name="TexScaleU"/>
 			<check_box label="Voltear" name="checkbox flip s"/>
 			<spinner label="Vertical (V)" name="TexScaleV"/>
 			<check_box label="Voltear" name="checkbox flip t"/>
 			<spinner label="Rotación" name="TexRot"/>
-			<spinner label="Repeticiones / Metro" name="rptctrl"/>
 			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
 			<text name="tex offset">
 				Desplazar
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index 033633bd22..bb53f116c2 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Tiempo
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Tiempo en Mono
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Objetos que colisionan
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nombre" name="name"/>
 		<scroll_list.columns label="Propietario" name="owner"/>
 		<scroll_list.columns label="Posición" name="location"/>
+		<scroll_list.columns label="Parcela" name="parcel"/>
 		<scroll_list.columns label="Tiempo" name="time"/>
-		<scroll_list.columns label="Tiempo en Mono" name="mono_time"/>
 		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="Memoria (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID del objeto:
@@ -48,6 +46,10 @@
 		Propietario:
 	</text>
 	<button label="Filtro" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parcela:
+	</text>
+	<button label="Filtro" name="filter_parcel_btn"/>
 	<button label="Actualizar" name="refresh_btn"/>
 	<button label="Devolver lo seleccionado" name="return_selected_btn" width="170"/>
 	<button label="Devolver todo" left="190" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index 89092201d9..89092201d9 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/es/floater_toybox.xml b/indra/newview/skins/default/xui/es/floater_toybox.xml
index 7275b0546b..7275b0546b 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/es/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/es/floater_translation_settings.xml b/indra/newview/skins/default/xui/es/floater_translation_settings.xml
index 765c9a05a2..765c9a05a2 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
index f7c85ff068..f7c85ff068 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..1115d67239
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ">
+	<slider label="Chat de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_controls.xml b/indra/newview/skins/default/xui/es/floater_voice_controls.xml
index eff21239be..eff21239be 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 1a265845af..02ebe80ff7 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ">
+<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
 	<string name="no_voice_effect">
 		(Sin transformación de voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
new file mode 100644
index 0000000000..0ebc511887
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUMEN DE VOZ">
+	<slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_web_content.xml b/indra/newview/skins/default/xui/es/floater_web_content.xml
index 5e02fad2dd..5e02fad2dd 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/es/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml
index 7dc47ca367..7dc47ca367 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/es/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml
index f57ce08eac..6c1ad02319 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/es/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Definir el tamaño de la ventana:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="ancho x alto">
-		<combo_box.item label="1000 x 700 (por defecto)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720 p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080 p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (por defecto)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Configurar" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index acc63e52a0..acc63e52a0 100644..100755
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/es/inspect_avatar.xml b/indra/newview/skins/default/xui/es/inspect_avatar.xml
index 1d70fa6a90..1d70fa6a90 100644..100755
--- a/indra/newview/skins/default/xui/es/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/es/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/es/inspect_group.xml b/indra/newview/skins/default/xui/es/inspect_group.xml
index ba10b19f41..ba10b19f41 100644..100755
--- a/indra/newview/skins/default/xui/es/inspect_group.xml
+++ b/indra/newview/skins/default/xui/es/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/es/inspect_object.xml b/indra/newview/skins/default/xui/es/inspect_object.xml
index d608b4a0f7..d608b4a0f7 100644..100755
--- a/indra/newview/skins/default/xui/es/inspect_object.xml
+++ b/indra/newview/skins/default/xui/es/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/es/inspect_remote_object.xml b/indra/newview/skins/default/xui/es/inspect_remote_object.xml
index f814e84a6f..f814e84a6f 100644..100755
--- a/indra/newview/skins/default/xui/es/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/es/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/es/language_settings.xml b/indra/newview/skins/default/xui/es/language_settings.xml
index 997293a741..997293a741 100644..100755
--- a/indra/newview/skins/default/xui/es/language_settings.xml
+++ b/indra/newview/skins/default/xui/es/language_settings.xml
diff --git a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml
index f2367c72a3..f2367c72a3 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
index 00bdb74881..7698348c00 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Expulsar" name="Eject..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_self.xml b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
index 0ba39378bb..5acd0c327a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Mis grupos" name="Groups..."/>
 	<menu_item_call label="Mi perfil" name="Profile..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Soltar" name="Drop"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml
index fe7331a108..fe7331a108 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
index 7df2d7c4e0..244099214a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Expulsar" name="Eject..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_self.xml b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
index 268d6f70ab..717b46ac74 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Mis grupos" name="Groups..."/>
 	<menu_item_call label="Mi perfil" name="Profile..."/>
 	<menu_item_call label="Depurar las texturas" name="Debug..."/>
+	<menu_item_call label="Volcar XML" name="Dump XML"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_bottomtray.xml b/indra/newview/skins/default/xui/es/menu_bottomtray.xml
deleted file mode 100644
index 40058a1749..0000000000
--- a/indra/newview/skins/default/xui/es/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Botón Hablar" name="EnableVoiceChat"/>
-	<menu_item_check label="Botón Gestos" name="ShowGestureButton"/>
-	<menu_item_check label="Botón Moverse" name="ShowMoveButton"/>
-	<menu_item_check label="Botón Vista" name="ShowCameraButton"/>
-	<menu_item_check label="Botón Foto" name="ShowSnapshotButton"/>
-	<menu_item_check label="Botón Construir" name="ShowBuildButton"/>
-	<menu_item_check label="Botón Buscar" name="ShowSearchButton"/>
-	<menu_item_check label="Botón Mapa" name="ShowWorldMapButton"/>
-	<menu_item_check label="Botón Minimapa" name="ShowMiniMapButton"/>
-	<menu_item_call label="Cortar" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copiar" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Pegar" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Borrar" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Seleccionar todo" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml
index 7541530601..7541530601 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml
index 56b95bdc3b..56b95bdc3b 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml
index 3c0c588284..3c0c588284 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
index ff8ad0977a..a889992b8a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
new file mode 100644
index 0000000000..b63711589d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
+	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Cerrar seleccionados" name="close_selected_conversations"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar la voz" name="block_unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+	<menu_item_call label="Perfil del grupo" name="group_profile"/>
+	<menu_item_call label="Activar el grupo" name="activate_group"/>
+	<menu_item_call label="Abandonar el grupo" name="leave_group"/>
+	<context_menu label="Opciones del moderador" name="Moderator Options">
+		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
+		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..090e6fb0bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Llamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir el historial de chat..." name="Chat history"/>
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..b8b4616b2d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por fecha" name="sort_by_date"/>
+	<menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/>
+	<menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_edit.xml b/indra/newview/skins/default/xui/es/menu_edit.xml
index 96fc9d8881..96fc9d8881 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_edit.xml
+++ b/indra/newview/skins/default/xui/es/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/es/menu_favorites.xml b/indra/newview/skins/default/xui/es/menu_favorites.xml
index 85210d5c49..85210d5c49 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/es/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml
index 24706eb2c8..24706eb2c8 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_group_plus.xml b/indra/newview/skins/default/xui/es/menu_group_plus.xml
index 6b26ba42c4..6b26ba42c4 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/es/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml
index 9945908c4f..9945908c4f 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/es/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
new file mode 100644
index 0000000000..5ba0fb898e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Historial del chat..." name="chat_history"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
+	<menu_item_check label="Ignorar el texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..6ea970b826
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compacta" name="compact_view"/>
+	<menu_item_check label="Vista ampliada" name="expanded_view"/>
+	<menu_item_check label="Mostrar tiempo" name="IMShowTime"/>
+	<menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_well_button.xml b/indra/newview/skins/default/xui/es/menu_im_well_button.xml
deleted file mode 100644
index c8f6c217cc..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Cerrar todo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml
index e11e9bdc58..e11e9bdc58 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/es/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml
index a5e60ea40b..a5e60ea40b 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/es/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml
index 492801026c..492801026c 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/es/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
index 82fc8ddd39..82fc8ddd39 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml
index 9d0a8c50ef..9d0a8c50ef 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
index 29ad718fdd..29ad718fdd 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml
index 20d99afde1..20d99afde1 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/es/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 4a8f37dee4..803d3f1331 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -67,6 +67,7 @@
 	<menu_item_call label="Borrar carpeta del sistema" name="Delete System Folder"/>
 	<menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/>
 	<menu_item_call label="Escuchar" name="Sound Play"/>
+	<menu_item_call label="Copiar la SLurl" name="url_copy"/>
 	<menu_item_call label="Acerca del hito" name="About Landmark"/>
 	<menu_item_call label="Escuchar en el mundo" name="Animation Play"/>
 	<menu_item_call label="Ejecutarla para usted" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_add.xml b/indra/newview/skins/default/xui/es/menu_inventory_add.xml
index f17cfe4ceb..f17cfe4ceb 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
index 0e9644629e..0e9644629e 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/es/menu_land.xml b/indra/newview/skins/default/xui/es/menu_land.xml
index b0f15be1b6..2097628356 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_land.xml
+++ b/indra/newview/skins/default/xui/es/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Comprar un pase" name="Land Buy Pass"/>
 	<menu_item_call label="Construir" name="Create"/>
 	<menu_item_call label="Modificar el terreno" name="Edit Terrain"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_landmark.xml b/indra/newview/skins/default/xui/es/menu_landmark.xml
index f69b1539b8..f69b1539b8 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/es/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 289ac3f075..2286d0527a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -17,7 +17,13 @@
 		<menu_item_call label="Mostrar los &apos;TOS&apos;" name="TOS"/>
 		<menu_item_call label="Mostrar mensaje crítico" name="Critical"/>
 		<menu_item_call label="Prueba de depuración de ventanas de contenido web" name="Web Content Floater Debug Test"/>
-		<menu label="Configurar el nivel de registro" name="Set Logging Level"/>
+		<menu label="Configurar el nivel de registro" name="Set Logging Level">
+			<menu_item_check label="Depurar" name="Debug"/>
+			<menu_item_check label="Información" name="Info"/>
+			<menu_item_check label="¡Atención!" name="Warning"/>
+			<menu_item_check label="Error" name="Error"/>
+			<menu_item_check label="Ninguno" name="None"/>
+		</menu>
 		<menu_item_check label="Mostrar el selector de Grid" name="Show Grid Picker"/>
 		<menu_item_call label="Mostrar la consola de notificaciones" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
index b4dfe9907a..b4dfe9907a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
index 07d1b08572..07d1b08572 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/es/menu_mode_change.xml b/indra/newview/skins/default/xui/es/menu_mode_change.xml
deleted file mode 100644
index 608505d192..0000000000
--- a/indra/newview/skins/default/xui/es/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Básico" name="BasicMode"/>
-	<menu_item_check label="Avanzado" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
index 0d4f1314c9..0d4f1314c9 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/es/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/es/menu_mute_particle.xml b/indra/newview/skins/default/xui/es/menu_mute_particle.xml
new file mode 100644
index 0000000000..daddf982de
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_navbar.xml b/indra/newview/skins/default/xui/es/menu_navbar.xml
index 63e5468020..63e5468020 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/es/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml
index 94b281b6c7..94b281b6c7 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
index 0562d35be7..0562d35be7 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/es/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index d8c75eaf47..e75c7283af 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -10,6 +10,8 @@
 	<menu_item_call label="Levantarme" name="Object Stand Up"/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
+	<menu_item_call label="Mostrar en linksets" name="show_in_linksets"/>
+	<menu_item_call label="Mostrar en personajes" name="show_in_characters"/>
 	<context_menu label="Ponerme" name="Put On">
 		<menu_item_call label="Ponerme" name="Wear"/>
 		<menu_item_call label="Añadir" name="Add"/>
@@ -26,4 +28,5 @@
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Comprar" name="Buy..."/>
 	<menu_item_call label="Borrar" name="Delete"/>
+	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index 7e4578b950..a99c889bb0 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
 	<menu_item_call label="Ignorar..." name="Block"/>
+	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
+	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 558ff6afd3..56e64c729f 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
 		<menu_item_call label="Ojos nuevos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Abrir todas las carpetas" name="expand"/>
+	<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
 	<menu_item_call label="Renombrar el vestuario" name="rename"/>
 	<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml
index 4136082a62..4136082a62 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/es/menu_participant_list.xml b/indra/newview/skins/default/xui/es/menu_participant_list.xml
index f6eedd1170..f6eedd1170 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/es/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml
new file mode 100644
index 0000000000..fcfeeb922b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferencias de chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversaciones..." name="Conversation"/>
+	<menu_item_check label="Traducir el chat" name="Translate_chat"/>
+	<menu_item_check label="Configuración de traducción..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..986389a4fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="No ignorar" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..10f6a3fc14
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/>
+	<menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..bc557c7ec1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
new file mode 100644
index 0000000000..ad896c1b74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
+	<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
index 3899ad9e96..3899ad9e96 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 51bd2c7208..125e25cd1a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Llamada de voz" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
new file mode 100644
index 0000000000..c3973625b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
index 1bd3efb611..1bd3efb611 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index dc1486d879..09bb119d5a 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
-	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Ver el perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Llamada de voz" name="voice_call"/>
+	<menu_item_call label="Ver el historial de chat..." name="chat_history"/>
+	<menu_item_call label="Añadir como amigo" name="add_friend"/>
+	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
+	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
+	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index 227c5ebe58..9df160f5ad 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
-	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Llamar" name="Call"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
+	<menu_item_call label="Añadir como amigos" name="add_friends"/>
+	<menu_item_call label="Quitar amigos" name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Visita" name="call"/>
+	<menu_item_call label="Compartir" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..c2fb360dd1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+	<menu_item_check label="Ver mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
index 1403e4db01..1403e4db01 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
new file mode 100644
index 0000000000..f0ffd14024
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por más reciente" name="sort_most"/>
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
+	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
index e4aaa89110..e4aaa89110 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/es/menu_picks.xml b/indra/newview/skins/default/xui/es/menu_picks.xml
index 9da68d7c9b..9da68d7c9b 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_picks.xml
+++ b/indra/newview/skins/default/xui/es/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/es/menu_picks_plus.xml b/indra/newview/skins/default/xui/es/menu_picks_plus.xml
index cc59bf1d29..cc59bf1d29 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/es/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/es/menu_place.xml b/indra/newview/skins/default/xui/es/menu_place.xml
index 675f0699e9..675f0699e9 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_place.xml
+++ b/indra/newview/skins/default/xui/es/menu_place.xml
diff --git a/indra/newview/skins/default/xui/es/menu_place_add_button.xml b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
index 4b2f908a06..4b2f908a06 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/es/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml
index 4051ff4075..4051ff4075 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/es/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
index c92bd19787..c92bd19787 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/es/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml
index 5ee8c50949..5ee8c50949 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/es/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/es/menu_save_outfit.xml b/indra/newview/skins/default/xui/es/menu_save_outfit.xml
index a04ec75b60..a04ec75b60 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/es/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml
index f517baf566..f517baf566 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/es/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml
index ca19acec6e..ca19acec6e 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/es/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml
index b708f3bc20..b708f3bc20 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
index c482907812..c482907812 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml
index 17e90422a5..17e90422a5 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/es/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml
index 095e461734..6253463725 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/es/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(desconocido)" name="Suggestion 1"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 2"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 3"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 4"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 5"/>
+	<menu_item_call label="Añadir al diccionario" name="Add to Dictionary"/>
+	<menu_item_call label="Añadir a ignorados" name="Add to Ignore"/>
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Pegar" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/es/menu_toolbars.xml b/indra/newview/skins/default/xui/es/menu_toolbars.xml
index 63f3dc43bd..63f3dc43bd 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/es/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/es/menu_topinfobar.xml b/indra/newview/skins/default/xui/es/menu_topinfobar.xml
index 2125fd51b2..2125fd51b2 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/es/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index a089c8f68e..610d65465d 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/>
+	<menu_item_call label="Ver el perfil" name="show_agent"/>
+	<menu_item_call label="Enviar un MI..." name="send_im"/>
+	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
+	<menu_item_call label="Quitar de los amigos..." name="remove_friend"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_group.xml b/indra/newview/skins/default/xui/es/menu_url_group.xml
index 79374b9739..79374b9739 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_http.xml b/indra/newview/skins/default/xui/es/menu_url_http.xml
index 585c059ff3..585c059ff3 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_inventory.xml b/indra/newview/skins/default/xui/es/menu_url_inventory.xml
index 13a8711c76..13a8711c76 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_map.xml b/indra/newview/skins/default/xui/es/menu_url_map.xml
index f96a0c7170..f96a0c7170 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index 8791a290af..c3c8439ea2 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar la información del objeto" name="show_object"/>
+	<menu_item_call label="Perfil del objeto..." name="show_object"/>
+	<menu_item_call label="Ignorar..." name="block_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_url_parcel.xml b/indra/newview/skins/default/xui/es/menu_url_parcel.xml
index 9e789ef8ee..9e789ef8ee 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_slapp.xml b/indra/newview/skins/default/xui/es/menu_url_slapp.xml
index 7147dcd3cf..7147dcd3cf 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_slurl.xml b/indra/newview/skins/default/xui/es/menu_url_slurl.xml
index 4ab47c2f61..4ab47c2f61 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/es/menu_url_teleport.xml b/indra/newview/skins/default/xui/es/menu_url_teleport.xml
index 8f86a91be3..8f86a91be3 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 9522d4eac6..e4fe871683 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Estado" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
+			<menu_item_check label="Ausente" name="Away"/>
+			<menu_item_check label="No molestar" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
@@ -27,17 +27,25 @@
 		<menu_item_call label="Preferencias..." name="Preferences"/>
 		<menu_item_call label="Botones de la barra de herramientas..." name="Toolbars"/>
 		<menu_item_call label="Ocultar todos los controles" name="Hide UI"/>
+		<menu_item_check label="Mostrar los HUD anexados" name="Show HUD Attachments"/>
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
+		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
-		<menu_item_check label="Configuración de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Transformación de voz..." name="ShowVoice"/>
+		<menu_item_check label="Registro de conversación..." name="Conversation Log..."/>
+		<menu label="Transformación de voz" name="VoiceMorphing">
+			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Probar..." name="Preview"/>
+			<menu_item_call label="Suscribir..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Gente cerca" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Gente cerca" name="Active Speakers"/>
+		<menu_item_call label="Lista de ignorados" name="Block List"/>
+		<menu_item_check label="No molestar" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_call label="Crear un hito de este sitio" name="Create Landmark Here"/>
@@ -106,13 +114,13 @@
 			<menu_item_call label="Incluir la parte siguiente" name="Include Next Part"/>
 			<menu_item_call label="Incluir la parte previa" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
 		<menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
 		<menu label="Objeto" name="Object">
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Tomar" name="Menu Object Take"/>
 			<menu_item_call label="Coger una copia" name="Take Copy"/>
-			<menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -123,6 +131,12 @@
 			<menu_item_call label="Definir los scripts a ejecutar" name="Set Scripts to Running"/>
 			<menu_item_call label="Configurar scripts como no ejecutándose" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="Opciones" name="Options">
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
 			<menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/>
@@ -151,6 +165,13 @@
 	<menu label="Ayuda" name="Help">
 		<menu_item_call label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guía del usuario" name="User’s guide"/>
+		<menu_item_call label="Base de Conocimientos" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Foros comunitarios" name="Community Forums"/>
+		<menu_item_call label="Portal de soporte" name="Support portal"/>
+		<menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar una infracción" name="Report Abuse"/>
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
@@ -173,7 +194,6 @@
 			<menu_item_check label="Ocultar las partículas" name="Hide Particles"/>
 			<menu_item_check label="Ocultar lo seleccionado" name="Hide Selected"/>
 			<menu_item_check label="Realzar las transparencias" name="Highlight Transparent"/>
-			<menu_item_check label="Mostrar los HUD anexados" name="Show HUD Attachments"/>
 			<menu_item_check label="Mostrar el Punto de Mira en la vista subjetiva" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Objetos representados" name="Rendering Types">
@@ -225,11 +245,10 @@
 			<menu_item_check label="Texture Console" name="Texture Console"/>
 			<menu_item_check label="Debug Console" name="Debug Console"/>
 			<menu_item_call label="Notifications Console" name="Notifications"/>
-			<menu_item_check label="Texture Size Console" name="Texture Size"/>
-			<menu_item_check label="Texture Category Console" name="Texture Category"/>
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
 			<menu_item_check label="Memory" name="Memory"/>
 			<menu_item_check label="Datos de la escena" name="Scene Statistics"/>
+			<menu_item_call label="Consola de depuración de obtención de texturas" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Camera" name="Camera"/>
 			<menu_item_check label="Wind" name="Wind"/>
@@ -259,6 +278,7 @@
 			<menu_item_check label="Camera Offset" name="Camera Offset"/>
 			<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
 			<menu_item_check label="Frame Test" name="Frame Test"/>
+			<menu_item_call label="Perfil del fotograma" name="Frame Profile"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
 			<menu_item_check label="Normales" name="Normals"/>
@@ -270,18 +290,24 @@
 			<menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/>
 			<menu_item_check label="Bytes de adjunto" name="attachment bytes"/>
 			<menu_item_check label="Esculpir" name="Sculpt"/>
+			<menu label="Densidad de textura" name="Texture Density">
+				<menu_item_check label="Ninguna" name="None"/>
+				<menu_item_check label="Actual" name="Current"/>
+				<menu_item_check label="Deseada" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
+			<menu_item_call label="Información sobre el material seleccionado" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luces y sombras" name="Lighting and Shadows"/>
+			<menu_item_check label="Modelo de iluminación avanzado" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras del sol/la luna/proyectores" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO y sombras suavizadas" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Capas alfa automáticas (deferidas)" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="Capas alfa automáticas (no deferidas)" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Animation Textures" name="Animation Textures"/>
 			<menu_item_check label="Disable Textures" name="Disable Textures"/>
-			<menu_item_check label="Atlas de texturas (experimental)" name="Texture Atlas"/>
 			<menu_item_check label="Render Attached Lights" name="Render Attached Lights"/>
 			<menu_item_check label="Render Attached Particles" name="Render Attached Particles"/>
 			<menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/>
@@ -300,7 +326,6 @@
 			<menu_item_call label="Prueba de navegadores de medios" name="Web Browser Test"/>
 			<menu_item_call label="Navegador de contenido web" name="Web Content Browser"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
-			<menu_item_call label="Memory Stats" name="Memory Stats"/>
 			<menu_item_check label="Consola de depuración de región" name="Region Debug Console"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
 			<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
@@ -324,9 +349,14 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocidad de animación" name="Animation Speed">
+				<menu_item_call label="Acelerar todas las animaciones un 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Ralentizar todas las animaciones un 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Restablecer la velocidad de todas las animaciones" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animaciones a cámara lenta" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Animation Info" name="Animation Info"/>
-			<menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/>
 			<menu_item_check label="Disable Level Of Detail" name="Disable LOD"/>
 			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
 			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml
index 4bffa689e7..4bffa689e7 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/es/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
index ec13f99a01..ec13f99a01 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
index 64fd7ce4cf..64fd7ce4cf 100644..100755
--- a/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/es/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/es/mime_types.xml b/indra/newview/skins/default/xui/es/mime_types.xml
index 85ff4cfb48..85ff4cfb48 100644..100755
--- a/indra/newview/skins/default/xui/es/mime_types.xml
+++ b/indra/newview/skins/default/xui/es/mime_types.xml
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
index 77d05934f4..77d05934f4 100644..100755
--- a/indra/newview/skins/default/xui/es/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml
index 77d05934f4..77d05934f4 100644..100755
--- a/indra/newview/skins/default/xui/es/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index d47c3d7ad8..d4451ad251 100644..100755
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -200,6 +206,14 @@ No podrás removérseles de ese rol, sino que deberán renunciar a él por sí m
 ¿Añadir esta capacidad a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Estás a punto de expulsar a [AVATAR_NAME] del grupo.
+		<usetemplate ignoretext="Confirmar la expulsión de un miembro del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Estás a punto de expulsar a [COUNT] miembros del grupo.
+		<usetemplate ignoretext="Confirmar la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Vas a soltar tu anexado.
     ¿Estás seguro de que quieres continuar?
@@ -357,13 +371,19 @@ Tienes que volver a introducir el nombre de usuario de tu avatar.
 
 Necesitas una cuenta para acceder a [SECOND_LIFE]. ¿Te gustaría crear una ahora?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=es-ES
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Volver a intentarlo" yestext="Crear una cuenta nueva"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Escribe el nombre de usuario o el nombre y el apellido de tu avatar en el campo Nombre de usuario e inicia sesión otra vez.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; no es un identificador de cuadrícula válido.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Tu localización inicial no especifica una cuadrícula válida.
+	</notification>
 	<notification name="DeleteClassified">
 		¿Borrar el clasificado &apos;[NAME]&apos;?
 No se reembolsan las cuotas pagadas.
@@ -467,8 +487,8 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		Al guardar un script compilado, hubo un problema por: [REASON]. Por favor, vuelve a intentar guardarlo más tarde..
 	</notification>
 	<notification name="StartRegionEmpty">
-		Perdón, no está definida tu Posición inicial.
-Por favor, escribe el nombre de la región en el cajetín de Posición inicial, o elige para esa posición Mi Base o Mi última posición.
+		No está definida tu región inicial.
+Por favor, escribe el nombre de la región en el cuadro de Posición inicial o elige para esa posición Mi Base o Mi última posición.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -490,6 +510,33 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="El hardware de mi ordenador no está admitido" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.intel.com/p/es_XL/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos.  La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=es
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -590,6 +637,9 @@ todos los objetos.
 
 Por favor, asegúrate de que no hay ninguno bloqueado, y de que eres el propietario de todos.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		No se pueden vincular objetos a través de límites de región.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Imposible enlazarlos, porque hay objetos de distintos propietarios.
 
@@ -971,6 +1021,41 @@ no tienes el permiso de comprar terreno para el grupo que tienes activado actual
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification label="Añadir lista de reemplazo automático" name="AddAutoReplaceList">
+		Nombre de la nueva lista:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Cambiar nombre de la lista de reemplazo automático" name="RenameAutoReplaceList">
+		El nombre &apos;[DUPNAME]&apos; ya se está utilizando.
+    Escribe un nombre nuevo que sea único:
+		<form name="form">
+			<button name="ReplaceList" text="Reemplazar la lista actual"/>
+			<button name="SetName" text="Usar un nombre nuevo"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		La palabra clave debe ser una palabra única y el reemplazo no puede estar vacío.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		La lista de reemplazo no es válida.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Debes especificar un archivo, un nombre y un idioma.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		El diccionario [DIC_NAME] aparentemente no contiene un archivo &quot;aff&quot;, lo cual significa que es un diccionario &quot;secundario&quot;.
+Puedes utilizarlo como un diccionario adicional, pero no como el diccionario principal.
+
+Consulta https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		No se puede copiar
+    [FROM_NAME]
+    a
+    [TO_NAME]
+	</notification>
 	<notification label="Guardar el vestuario" name="SaveOutfitAs">
 		Guardar como un nuevo vestuario lo que estoy llevando:
 		<form name="form">
@@ -1036,7 +1121,7 @@ en TODO EL TERRENO de este sim?
 Por favor, elige un pago mayor.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Por lo menos uno  de los elementos seleccionados contiene vínculos que le señalan. Si eliminas este elemento, los vínculos dejarán de funcionar permanentemente. Lo más recomendable es eliminar primero los vínculos.
+		Por lo menos uno de los elementos contiene vínculos que lo señalan.  Si eliminas este elemento, los vínculos dejarán de funcionar permanentemente.  Lo más recomendable es eliminar primero los vínculos.
 
 ¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
@@ -1054,9 +1139,9 @@ Por favor, elige un pago mayor.
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		No eres el propietario de, al menos, uno de los ítems que has seleccionado.
+		Uno o más de los elementos seleccionados no son tuyos.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1067,25 +1152,25 @@ Al menos un objeto no es copiable.
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		Al menos un objeto está bloqueado.
-No eres propietario de, al menos, un objeto.
+		Hay un objeto bloqueado como mínimo.
+No eres propietario de al menos un objeto.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Al menos un objeto no es copiable.
-No eres propietario de, al menos, un objeto.
+		No se puede copiar un objeto como mínimo.
+No eres propietario de al menos un objeto.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		Al menos un objeto está bloqueado.
-Al menos un objeto no es copiable.
-No eres propietario de, al menos, un objeto.
+		Hay un objeto bloqueado como mínimo.
+No se puede copiar un objeto como mínimo.
+No eres propietario de al menos un objeto.
 
-¿Estás seguro de que quieres borrar estos ítems?
+¿Estás seguro de que quieres eliminar los elementos?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
@@ -1152,7 +1237,7 @@ a &apos;[THIS_GPU]&apos;
 Se te ha llevado a una región cercana.
 	</notification>
 	<notification name="AvatarMovedLast">
-		En estos momentos no está disponible tu última posición.
+		En estos momentos no está disponible la posición solicitada.
 Se te ha llevado a una región cercana.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1170,9 +1255,8 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre
 	<notification name="FirstRun">
 		Se ha completado la instalación de [SECOND_LIFE].
 
-Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta antes de poder iniciar una sesión.
-¿Volver a [http://join.secondlife.com secondlife.com] para crear una cuenta nueva?
-		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/>
+Si es la primera vez que usas [SECOND_LIFE], debes crear una cuenta para poder iniciar una sesión.
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Crear cuenta..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Tenemos problemas de conexión. Puede deberse a un problema de tu conexión a Internet o de [SECOND_LIFE_GRID].
@@ -1410,13 +1494,43 @@ Versión [VERSION] [[RELEASE_NOTES_FULL_URL]; información acerca de esta actual
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Hemos descargado una actualización de software necesaria.
-Versión [VERSION]
+Versión [VERSION] [[INFO_URL] Información sobre esta actualización]
 
-Debemos reiniciar [APP_NAME] para instalar la actualización.
+Para instalar la actualización, hay que reiniciar [APP_NAME].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
-		Debemos reiniciar [APP_NAME] para instalar la actualización.
+		Para instalar la actualización, hay que reiniciar [APP_NAME].
+[[INFO_URL] Información sobre esta actualización]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Hemos descargado una actualización aplicable a tu instalación de [APP_NAME].
+Versión [VERSION] 
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] para informarte sobre esta actualización.]
+		<usetemplate name="okcancelbuttons" notext="Más tarde..." yestext="Instalar ahora y reiniciar [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Hemos descargado una actualización aplicable a tu instalación de [APP_NAME].
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
+		<usetemplate name="okcancelbuttons" notext="Más tarde..." yestext="Instalar ahora y reiniciar [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Hemos descargado una actualización de software necesaria.
+Versión [VERSION]
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
+
+Para instalar la actualización, hay que reiniciar [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Para instalar la actualización, hay que reiniciar [APP_NAME].
+Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
+Consulta [[INFO_URL] Información sobre esta actualización].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1467,6 +1581,10 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 ¿Deseas abandonar el grupo?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		No es posible abandonar el grupo. No puedes abandonarlo porque eres su último propietario. Antes tienes que asignar el papel de propietario a otro miembro.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		¿Quieres realmente expulsar a todos los residentes de la cuadrícula?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los Residentes"/>
@@ -1495,10 +1613,13 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 		En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Pasar al modo ocupado.
-Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera.
-		<usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones.
+
+- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias &gt; General).
+- Se rehusarán los ofrecimientos de teleporte.
+- Se rechazarán las llamadas de voz.
+		<usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta.
@@ -1694,83 +1815,128 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		No estás autorizado en esa región por su nivel de calificación. Puede deberse a que no hay información validada de tu edad.
-
-Por favor, comprueba que tienes instalado el último visor, y dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado.  Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		No estás autorizado en esa región por su nivel de calificación. 
-
-¿Quieres ir a la Base de Conocimientos para aprender más sobre el nivel de calificación?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="No puedo entrar a esta región dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+		<usetemplate ignoretext="Paso a otra región: la región que intentas visitar tiene un contenido solo accesible para los adultos." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		No estás autorizado en esa región por su nivel de calificación.
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		No estás autorizado en esta región por tus preferencias sobre el nivel de calificación.
-
-Para entrar en la región que deseas, cambia tu preferencia de nivel de calificación. Esto te permitirá buscar contenidos [REGIONMATURITY] y tener acceso a ellos. Para deshacer los cambios, elige Yo &gt; Preferencias &gt; General.
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias o tú puedes cancelar la visita. Después de cambiar tus preferencias, intenta otra vez acceder a la región.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button default="true" name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Paso a otra región: tus preferencias de contenido no te permiten visitar la región que has seleccionado."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos experimentando dificultades técnicas con el teleporte porque tus preferencias no están sincronizadas con el servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Teleportarme: la región que intentas visitar tiene un contenido solo accesible para los adultos." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias y proceder a teleportarte o bien tú puedes cancelar el teleporte.
 		<form name="form">
-			<button name="OK" text="Cambiar las preferencias"/>
-			<button default="true" name="Cancel" text="Cerrar"/>
-			<ignore name="ignore" text="Mis preferencias sobre nivel de calificación me impiden entrar a esta región"/>
+			<button name="OK" text="Cambiar y continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teleportar (reiniciable): tus preferencias de contenido no te permiten visitar la región que has seleccionado."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Puedes cambiar tus preferencias o bien cancelar el teleporte. Después de cambiar tus preferencias, intenta teleportarte otra vez.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teleportar (no reiniciable): tus preferencias de contenido no te permiten visitar la región que has seleccionado."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos experimentando dificultades técnicas con el teleporte porque tus preferencias no están sincronizadas con el servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Tu preferencia de nivel de calificación actual es [RATING].
+		No recibirás más notificaciones cuando vayas a visitar una región con un contenido [RATING]. En el futuro, puedes cambiar tus preferencias de contenido en Yo &gt; Preferencias &gt; General en la barra de menús.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		En este momento no se pueden cambiar tus preferencias para ver el contenido [PREFERRED_MATURITY].  Tus preferencias se han restablecido para que puedas ver el contenido [ACTUAL_MATURITY]. Si deseas cambiar las preferencias otra vez, en la barra de menús, selecciona Yo &gt; Preferencias &gt; General.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		No puedes reclamar este terreno por su nivel de calificación. Puede deberse a que no hay información validada de tu edad.
-
-Por favor, comprueba que tienes instalado el último visor, y dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias actuales de calificación de contenido te impiden reclamar el terreno que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		No puedes reclamar este terreno por su nivel de calificación. 
-
-¿Quieres ir a la Base de Conocimientos para más información sobre el nivel de calificación?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Solo los adultos pueden reclamar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="No puedo reclamar este terreno dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+		<usetemplate ignoretext="Solo los adultos pueden reclamar este terreno." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		No puedes reclamar este terreno debido a su nivel de calificación.
+		El terreno que intentas reclamar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		El terreno que intentas reclamar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		No puedes reclamar este terreno por tus preferencias sobre el nivel de calificación.
-
-Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferencias del nivel de calificación y, así, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo &gt; Preferencias &gt; General.
-		<usetemplate ignoretext="Mis preferencias sobre el nivel de calificación me impiden reclamar este terreno" name="okcancelignore" notext="Cerrar" yestext="Cambiar preferencia"/>
+		El terreno que intentas reclamar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias y después puedes volver a intentar reclamar el terreno.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Tus preferencias de contenido no te permiten reclamar el terreno que has seleccionado."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		No puedes comprar este terreno por su nivel de calificación. Puede deberse a que no hay información validada de tu edad.
-
-Por favor, comprueba que tienes instalado el último visor, y dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias actuales de calificación de contenido te impiden comprar el terreno que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		No puedes comprar este terreno por tus preferencias de nivel de calificación. 
-
-¿Quieres ir a la Base de Conocimientos para más información sobre el nivel de calificación?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Solo los adultos pueden comprar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="No puedo comprar este terreno dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+		<usetemplate ignoretext="Solo los adultos pueden comprar este terreno." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		No puedes comprar este terreno por su nivel de calificación.
+		El terreno que intentas comprar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		El terreno que intentas comprar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		No puedes comprar este terreno por tus preferencias sobre el nivel de calificación.
-
-Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferencias del nivel de calificación y, así, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo &gt; Preferencias &gt; General.
-		<usetemplate ignoretext="Mis preferencias sobre el nivel de calificación me impiden comprar el terreno" name="okcancelignore" notext="Cerrar" yestext="Cambiar preferencia"/>
+		El terreno que intentas comprar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias y después puedes volver a intentar comprar el terreno.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Tus preferencias de contenido no te permiten comprar el terreno que has seleccionado."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Hay demasiados prims seleccionados.  Por favor, selecciona [MAX_PRIM_COUNT] o menos y vuelve a intentarlo
@@ -1825,10 +1991,9 @@ Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferen
 		</form>
 	</notification>
 	<notification label="Cambiada la calificación de la región" name="RegionMaturityChange">
-		Se ha actualizado el nivel de calificación de esta región.
+		Se ha cambiando el nivel de calificación de esta región.
 Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa.
-
-Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Desajuste en la versión de voz" name="VoiceVersionMismatch">
 		Esta versión de [APP_NAME] no es compatible con la prestación de voz de esta región. Para que el chat de voz funcione correctamente debes actualizar [APP_NAME].
@@ -1941,6 +2106,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta?
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación.
+		<usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
@@ -2014,14 +2183,14 @@ Linden Lab
 			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
-	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
-		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
+	<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
+		Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
 
-¿Quieres salir del modo Ocupado antes de completar esta transacción?
+¿Deseas desactivar No molestar antes de finalizar esta transacción?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/>
-			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
-			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
+			<ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/>
+			<button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/>
+			<button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2117,14 +2286,11 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 		<usetemplate ignoretext="Ponerme la ropa que estoy creando mientras modifico mi apariencia" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Para acceder al contenido Adulto y los lugares de Second Life con dicho carácter, debes tener por lo menos 18 años. Visita la página de verificación de edad para confirmar que tienes más de 18 años. 
-Al hacerlo se iniciará el navegador web.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="Cancelar" yestext="Ir a Verificación de la edad"/>
+		El lugar que intentas visitar tiene el acceso restringido a los Residentes mayores de 18 años.
+		<usetemplate ignoretext="No tengo la edad suficiente para visitar áreas restringidas por edad." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Localización restringida para mayores de 18 años.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Para visitar este sitio debes haber aportado información de pago en tu cuenta.  ¿Quieres ir al sitio web de [SECOND_LIFE] y configurar esto?
@@ -2159,11 +2325,8 @@ Al hacerlo se iniciará el navegador web.
 	<notification name="GroupNotice">
 		Asunto: [SUBJECT], Mensaje: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está conectado
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está desconectado
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
@@ -2283,9 +2446,7 @@ Por favor, selecciona un sólo objeto.
     elegir &apos;Teleportar&apos;.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Para ponerte en contacto con Residentes como &apos;[NAME]&apos;, pulsa el botón &quot;Gente&quot;, selecciona un Residente en la ventana que se abre y después pulsa en &apos;MI&apos; en
-    la parte inferior de la ventana.
-    (También puedes pulsar dos veces en su nombre o pulsarlo con el botón derecho y elegir &apos;MI&apos;).
+		Para abrir una conversación privada con alguien, pulsa con el botón derecho en su avatar y selecciona &apos;MI&apos; en el menú.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		No puedes seleccionar un terreno que cruce las fronteras entre servidores.
@@ -2385,6 +2546,16 @@ Aquí no puedes volar.
 	<notification name="NoBuild">
 		Este terreno tiene desactivado el poder construir. Aquí no puedes ni construir ni crear objetos.
 	</notification>
+	<notification name="PathfindingDirty">
+		La región contiene cambios de pathfinding pendientes.  Si tienes derechos de construcción, puedes recargarla pulsando el botón “Recargar región”.
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Esta parcela oculta los avatares y el chat de texto de otras parcelas. No podrás ver a los residentes que estén fuera la parcela ni ellos podrán verte a ti. El chat de texto regular del canal 0 también está bloqueado.
 	</notification>
@@ -2403,9 +2574,7 @@ Los scripts no funcionan aquí, excepto los pertenecientes al propietario del te
 		Sólo puedes reclamar terreno público de la región en que estás.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		No estás autorizado en esa región por su nivel de calificación. Debes validar tu edad y/o instalar el último visor.
-
-Por favor, dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Se te ha prohibido el acceso a la región.
@@ -2416,11 +2585,11 @@ Por favor, dirígete a la Base de Conocimientos para más detalles sobre el acce
 	<notification name="ImproperPaymentStatus">
 		No tienes el estado de pago adecuado para entrar a esta región.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Debes tener verificada la edad para entrar a esta región
+	<notification name="MustGetAgeRegion">
+		Solo pueden acceder a esta región los mayores de 18 años.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Debes haber verificado tu edad para entrar a esta parcela.
+		Para acceder a esta parcela debes ser mayor de 18 años.
 	</notification>
 	<notification name="NoDestRegion">
 		No se ha encontrada la región de destino.
@@ -2520,14 +2689,35 @@ Por favor, vuelve a intentarlo en unos momentos.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] te ha ofrecido teleportarte a su posición:
+		[NAME_SLURL] te ofrece teleportarte a su localización:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teleportar"/>
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] te ofrece teleportarte a su localización:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Esta región tiene un contenido [REGION_CONTENT_MATURITY, pero tus preferencias actuales no te autorizan a ver los contenidos [REGION_CONTENT_MATURITY].  Podemos cambiar tus preferencias y proceder a teleportarte o bien tú puedes cancelar el teleporte.
+		<form name="form">
+			<button name="Teleport" text="Cambiar y continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] te ofrece teleportarte a su localización:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+No obstante, el contenido de esta región solo es accesible para los adultos.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Teleporte ofrecido a [TO_NAME]
 	</notification>
@@ -2622,33 +2812,32 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objeto de nombre &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, propiedad de &apos;[NAME]&apos;, quiere:
-
-[QUESTIONS]
-Si no confias en este objeto y en su creador, deberías rehusar esta petición.
-
-¿Autorizar esta petición?
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
+  
+No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
 		<form name="form">
-			<button name="Grant" text="Autorizar"/>
+			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
-			<button name="Details" text="Detalles..."/>
 		</form>
 	</notification>
-	<notification name="ScriptDialog">
-		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
-[MESSAGE]
+	<notification name="UnknownScriptQuestion">
+		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un objeto propiedad de &apos;[NAME]&apos;, ha solicitado un permiso de script en tiempo de ejecución que el visor no reconoce ni puede conceder.
+
+Para obtener el permiso, descárgate aquí la última versión: [DOWNLOADURL].
 		<form name="form">
+			<button name="Deny" text="Aceptar"/>
 			<button name="Mute" text="Ignorar"/>
-			<button name="Ignore" text="Ignorar"/>
 		</form>
 	</notification>
+	<notification name="ScriptDialog">
+		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
+[MESSAGE]
+		<form name="form"/>
+	</notification>
 	<notification name="ScriptDialogGroup">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]
 [MESSAGE]
-		<form name="form">
-			<button name="Mute" text="Ignorar"/>
-			<button name="Ignore" text="Ignorar"/>
-		</form>
+		<form name="form"/>
 	</notification>
 	<notification name="BuyLindenDollarSuccess">
 		¡Gracias por tu pago!
@@ -2934,6 +3123,10 @@ Has actualizado una textura obtenida mediante bake de [RESOLUTION] para &apos;[B
 		( [EXISTENCE] segundos con vida )
 Has actualizado de manera local una textura obtenida mediante bake de [RESOLUTION] para &apos;[BODYREGION]&apos; después de [TIME] segundos.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		No se puede mostrar una vista previa de esta textura porque es de tipo &apos;no copiable&apos; y/o &apos;no transferible&apos;.
+		<usetemplate ignoretext="Advertirme si el modo Vista previa inmediata no está disponible para las texturas &apos;no copiable&apos; y/o &apos;no transferible&apos;" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		¿Estás seguro de que deseas salir de esta multiconferencia?
 		<usetemplate ignoretext="Confirma antes de salir de la llamada" name="okcancelignore" notext="No" yestext="Sí"/>
@@ -3102,6 +3295,62 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 		Esta acción ocultará todos los botones y elementos de menú. Para restaurarlos, pulsa otra vez en [SHORTCUT].
 		<usetemplate ignoretext="Confirmar antes de ocultar la IU" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		El indicador de inmaterial de algunos linksets seleccionados se conmutará.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="El indicador de inmaterial de algunos linksets seleccionados se conmutará." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; debido a restricciones de los permisos del linkset.  Estos linksets se configurarán como &apos;[RESTRICTED_TYPE]&apos;.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="Algunos de los linksets seleccionados no pueden configurarse debido a restricciones de los permisos del linkset." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; porque su forma no es convexa.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="Algunos de los linksets seleccionados no pueden configurarse porque su forma no es convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		El indicador de inmaterial de algunos linksets seleccionados se conmutará.
+
+Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; debido a restricciones de los permisos del linkset.  Estos linksets se configurarán como &apos;[RESTRICTED_TYPE]&apos;.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="El indicador de inmaterial de algunos linksets seleccionados se conmutará y otros no se podrán establecer debido a restricciones de los permisos del linkset." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		El indicador de inmaterial de algunos linksets seleccionados se conmutará.
+
+Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; porque su forma no es convexa.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="El indicador de inmaterial de algunos linksets seleccionados se conmutará y otros no se podrán establecer porque la forma no es convexa" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; debido a restricciones de los permisos del linkset.  Estos linksets se configurarán como &apos;[RESTRICTED_TYPE]&apos;.
+
+Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; porque su forma no es convexa. Los tipos de utilización de estos linksets no cambiarán.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="Algunos de los linksets seleccionados no pueden configurarse debido a restricciones de los permisos del linkset y porque su forma no es convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		El indicador de inmaterial de algunos linksets seleccionados se conmutará.
+
+Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; debido a restricciones de los permisos del linkset.  Estos linksets se configurarán como &apos;[RESTRICTED_TYPE]&apos;.
+
+Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; porque su forma no es convexa. Los tipos de utilización de estos linksets no cambiarán.
+
+¿Quieres continuar?
+		<usetemplate ignoretext="El indicador de inmaterial de algunos linksets seleccionados se conmutará y otros no se podrán establecer debido a restricciones de los permisos del linkset y porque su forma no es convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		El objeto que has seleccionado afecta al navmesh. Al cambiarlo a una Ruta flexible se eliminará del navmesh.
+		<usetemplate ignoretext="El objeto que has seleccionado afecta al navmesh. Al cambiarlo a una Ruta flexible se eliminará del navmesh." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Parece que no tienes el hardware apropiado para [APP_NAME]. [APP_NAME] requiere una tarjeta gráfica OpenGL que admita texturas múltiples (&apos;multitexture support&apos;). Si la tienes, comprueba que tienes los últimos &apos;drivers&apos; para tu tarjeta gráfica, así como los últimos parches y &apos;service packs&apos; para tu sistema operativo.
 
@@ -3126,4 +3375,653 @@ También puedes buscar en el Mapa lugares marcados como &quot;Puntos de Informac
 	<global name="You died and have been teleported to your home location">
 		Has muerto y te has teleportado a tu Base.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] no se ha podido actualizar porque el archivo ya no se encuentra.
+Desactivando futuras actualizaciones de este archivo.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] se ha intentado abrir o descodificar durante [NRETRIES] intentos sin éxito, y ahora se considera roto.
+Desactivando futuras actualizaciones de este archivo.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Se ha intentado añadir un archivo de imagen [FNAME] no válido o ilegible, que no se puede abrir ni descodificar.
+Intento cancelado.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Vas a devolver [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
+		<usetemplate ignoretext="¿Estás seguro de que quieres devolver varios objetos?" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
+		<usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] te ha descongelado.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Error al congelar: no tienes permisos de administrador en esa parcela.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		La congelación ha terminado, puedes seguir con tus asuntos.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Lo sentimos, ese usuario no se puede congelar.
+	</notification>
+	<notification name="NowOwnObject">
+		Ahora eres el propietario del objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		El objeto no se puede colocar porque hay demasiadas solicitudes.
+	</notification>
+	<notification name="SitFailCantMove">
+		No te puedes sentar porque en este momento no puedes desplazarte.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		No te puedes sentar porque no tienes permiso para estar en ese terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Acércate. No te puedes sentar en el objeto porque
+no está en la misma región que tú.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		No se puede crear el nuevo objeto. La región está llena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		No puedes crear árboles y hierba en un terreno que no es tuyo.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Error al copiar: careces de permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Error al copiar: no se te puede transferir el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Error al copiar porque el objeto &apos;[OBJ_NAME]&apos; contribuye al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicación sin objetos raíz seleccionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		No se pueden duplicar objetos porque la región está llena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		No se puede crear el objeto porque 
+la parcela está llena.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Error al intentar colocar un objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		No se puede crear un objeto que ha causado problemas en esta región.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Ese objeto de inventario está en la lista negra.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Búsqueda de terrenos bloqueada.
+Has realizado demasiadas búsquedas de terreno con excesiva rapidez.
+Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Has muerto y te has teleportado a tu lugar de origen
+	</notification>
+	<notification name="EjectComingSoon">
+		Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		No puedes entrar en esta región porque 
+el servidor está lleno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Se ha deshabilitado Devolver el objeto a mi inventario.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque no tienes permiso para modificar el objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		No se puede guardar &apos;[OBJ_NAME]&apos; de nuevo en el inventario; esta operación está desactivada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		No se puede copiar tu selección porque no tienes permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoTransNoCopy">
+		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		El sistema de permisos no admite la eliminación del objeto &apos;[OBJ_NAME]&apos; del simulador.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		No se puede guardar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		No se puede guardar tu selección porque el objeto &apos;[OBJ_NAME]&apos; no se puede copiar.
+	</notification>
+	<notification name="NoModNoTaking">
+		No se puede aceptar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Error interno: tipo de destino desconocido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Error al borrar: el objeto no se encuentra
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Lo sentimos, ese usuario no se puede expulsar.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsado.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Error al expulsar: no tienes permiso de administrador en esa parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		No tienes permiso para modificar ese objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		No se puede habilitar la física para un objeto que contribuye al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		No se puede activar la física para los objetos con fotogramas clave.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		No se puede habilitar la física para el objeto: recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		¡No se puede añadir un objeto!
+	</notification>
+	<notification name="UnableEditItem">
+		¡No se puede editar esto!
+	</notification>
+	<notification name="NoPermToEdit">
+		No puedes editar esto.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		No está permitido copiar ese inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		No se puede guardar en el contenido del objeto: el objeto ya no existe.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Demasiados scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		¡No se puede añadir un script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta región no tiene habilitadas las formas de física.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		No se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		No se pueden establecer propiedades de física en ese tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		No se puede establecer que un prim raíz no tenga forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta región no tiene habilitados los materiales de física.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Solo se pueden ajustar los materiales de física de las prims raíces.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Aun no es posible configurar materiales de física para los personajes.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Una o varias de las propiedades de los materiales de física especificados no son válidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		No se puede cambiar el tipo de unión de un objeto de la malla.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		No se puede cambiar la forma de un objeto de la malla
+	</notification>
+	<notification name="FullRegionCantEnter">
+		No puedes entrar en esta región porque \nla región está llena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Error de vínculo: los propietarios son diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Error de vínculo: no se puede modificar el navmesh a través de límites de región.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Error de vínculo: no tienes permiso de edición.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Error de vínculo: demasiadas primitivas
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Error de vínculo: no se pueden vincular &apos;no copiable&apos; y &apos;no transferible&apos;
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Error de vínculo: no hay objetos que se puedan vincular.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Error de vínculo: demasiados personajes de pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Error de vínculo: recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Has sido teleportado al origen por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Has sido teleportado a tu origen por el objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Has sido teleportado por un anexo de [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; cuyo propietario es un usuario desconocido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		No se puede crear el objeto solicitado. La región está llena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		No puedes anexar varios objetos a un solo lugar.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Aquí no se pueden crear varios objetos.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		No se puede crear el objeto solicitado. Vuelve a intentarlo.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Error al colocar: la carga del objeto solicitado ha tardado demasiado.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		No se pueden crear plantas en este terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		No se puede restaurar el objeto. No se ha encontrado una posición del mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		No se puede colocar el objeto porque sus datos de malla no son válidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		No se puede colocar el objeto porque la región ya contiene demasiados scripts.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Tus privilegios de acceso no te permiten crear objetos allí.
+	</notification>
+	<notification name="CantCreateObject">
+		Actualmente no tienes autorización para crear objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Los parámetros de objeto no son válidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Tus privilegios de acceso no te permiten duplicar objetos aquí.
+	</notification>
+	<notification name="CantChangeShape">
+		No tienes permiso para cambiar esta forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Tus privilegios de acceso no te permiten reclamar objetos aquí.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Error de transferencia: no tienes permiso para transferir objetos para tu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Tus privilegios de acceso no te autorizan a comprar objetos aquí.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		No se puede anexar el objeto porque un avatar está sentado en él.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		No te puedes poner árboles y hierba como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		No se pueden anexar objetos que son propiedad de grupos.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		No puedes anexar objetos de los que no eres propietario.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		No se pueden anexar objetos que contribuyen al navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		No se puede anexar el objeto porque no tienes permiso para moverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		No hay suficientes recursos de script disponibles para anexar el objeto
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Error al soltar el anexo: no tienes permiso para soltarlo allí.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Error al soltar el anexo: recurso de terreno disponible insuficiente.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Error al soltar los anexos: los recursos disponibles son insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		No se puede soltar el objeto aquí. La parcela está llena.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Acota los parámetros de eliminación.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		No se puede subir el activo.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		No se ha podido encontrar el usuario para teleportarlo al origen
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		error en la solicitud de superpoderes
+	</notification>
+	<notification name="GenericRequestFailed">
+		error de solicitud genérico
+	</notification>
+	<notification name="CantUploadPostcard">
+		No se puede subir la postal. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		No se pueden obtener los datos de inventario del aviso de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		No se puede enviar el aviso de grupo: no está permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		No se puede enviar el aviso del grupo: el inventario no se puede construir.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		No se puede analizar el inventario del aviso.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Error al subir terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Se ha registrado el archivo de terreno.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Archivo de terreno registrado, iniciando la descarga...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno predeterminado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Para comprar esta parcela debes actualizar el visor.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Error al comprar: esta parcela no está en venta.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		No se puede comprar: el precio de venta o la superficie del terreno han cambiado.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		No eres el comprador autorizado de esta parcela.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		No puedes comprar esta parcela porque ya está en espera de una autorización de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		No se pueden construir objetos aquí porque se desbordaría la parcela.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		La selección no contiene suficientes parcelas alquiladas para unirlas.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -&gt; Notificar fallo...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		El terreno se ha dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Has comprado un pase.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		La región no permite anuncios.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Tu pase para este terreno está a punto de caducar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Esta superficie no es adecuada para sentarse, prueba en otro sitio.
+	</notification>
+	<notification name="CantSitNoRoom">
+		No hay sitio para sentarse aquí, prueba en otro lugar.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Error al reclamar el objeto: no tienes permiso
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Error al reclamar el objeto: no tienes suficientes L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		No se puede transferir un terreno propiedad de un grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Error al comprar el objeto, no tienes suficientes L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Error al comprar el inventario: no tienes suficientes L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		No tienes suficientes L$ para comprar un pase a este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		No se puede crear el objeto porque \nla parcela está llena.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		No se puede crear un hito para el evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		¡Tus superpoderes anulan la congelación!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Error en la solicitud de poderes especiales. Esta solicitud se ha registrado.
+	</notification>
+	<notification name="ExpireExplanation">
+		El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud.
+	</notification>
+	<notification name="DieExplanation">
+		El sistema no puede procesar tu solicitud.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Dinero insuficiente para crear la primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Dinero insuficiente para crear el objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Se ha restaurado la posición de origen, puesto que dicha posición no era válida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta región no te permite configurar aquí tu lugar de origen.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posición de origen ajustada.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		No se puede quitar el objeto por un error del inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		No se puede crear el inventario solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		No se puede crear la carpeta de inventario solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		No se puede crear el inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		No se puede crear un hito.
+	</notification>
+	<notification name="CantCreateOutfit">
+		No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		El inventario no está en venta.
+	</notification>
+	<notification name="CantFindInvItem">
+		No se encuentra el objeto del inventario.
+	</notification>
+	<notification name="CantFindObject">
+		No se puede encontrar el objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		En esta región actualmente no están activadas las transferencias de dinero a los objetos.
+	</notification>
+	<notification name="CantPayNoAgent">
+		No se ha averiguado a quién se debe pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		No se pueden dar L$ a los objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Error al crear un inventario de objeto del mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo.
+		<usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup.
+		<usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		No se pueden mover los archivos. Ruta anterior restaurada.
+		<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100644..100755
--- a/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/es/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/es/panel_active_object_row.xml b/indra/newview/skins/default/xui/es/panel_active_object_row.xml
index 8d4fadb101..8d4fadb101 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/es/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
index c64a93e0e5..c64a93e0e5 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
index 5220df5d21..c73e34b299 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index cddbad1195..a3de14ae67 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de ignorados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
-	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
-	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
-	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/>
+		<menu_button name="view_btn" tool_tip="Opciones de clasificación"/>
+		<menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/>
+		<button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml
index 8f4e0101aa..8f4e0101aa 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml
index 66ae7d868b..66ae7d868b 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray.xml b/indra/newview/skins/default/xui/es/panel_bottomtray.xml
deleted file mode 100644
index 2b1d017a2d..0000000000
--- a/indra/newview/skins/default/xui/es/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Activa/Desactiva el micrófono"/>
-	<string name="VoiceControlBtnToolTip" value="Muestra/Oculta el panel del control de voz"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Hablar" label_selected="Hablar" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gestos" name="Gesture" tool_tip="Muestra/Oculta los gestos"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Moverme" name="movement_btn" tool_tip="Muestra/Oculta los controles del movimiento"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Visión" name="camera_btn" tool_tip="Muestra/Oculta los controles de la cámara"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Hacer una foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construir" name="build_btn" tool_tip="Muestra/Oculta las herramientas de construcción"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Buscar" name="search_btn" tool_tip="Muestra/Oculta la búsqueda"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Mapa" name="world_map_btn" tool_tip="Muestra/Oculta el mapa del mundo"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Minimapa" name="mini_map_btn" tool_tip="Muestra/Oculta el minimapa"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversaciones"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notificaciones"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml
index 8d1b84a5fd..8d1b84a5fd 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/es/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml
index eaaa5dbe78..eaaa5dbe78 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/es/panel_classified_info.xml b/indra/newview/skins/default/xui/es/panel_classified_info.xml
index 3c168b9e53..3c168b9e53 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/es/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml
index d3b3d31bd9..d3b3d31bd9 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml
index 959b83d658..959b83d658 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml
index a2994894c1..a2994894c1 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/es/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..cc4a7e951d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(cargando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..2fc8cd3aff
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversación incluía voz"/>
+	<icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/>
+	<button name="delete_btn" tool_tip="Quitar esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml
index d1d7d8ec82..d1d7d8ec82 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml
index bc3046978c..bc3046978c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml
index 829c206ae1..829c206ae1 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_classified.xml b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
index ffad843732..ffad843732 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml
index 29a416f698..29a416f698 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml
index d536a862f5..d536a862f5 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_hair.xml b/indra/newview/skins/default/xui/es/panel_edit_hair.xml
index 25af1ea8cb..25af1ea8cb 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml
index 22a46a2f75..22a46a2f75 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pants.xml b/indra/newview/skins/default/xui/es/panel_edit_pants.xml
index fb35e0953b..fb35e0953b 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_physics.xml b/indra/newview/skins/default/xui/es/panel_edit_physics.xml
index dfb5ab330a..dfb5ab330a 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_pick.xml b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
index cda465da9c..cda465da9c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_profile.xml b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
index 8e5e09cfec..8e5e09cfec 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shape.xml b/indra/newview/skins/default/xui/es/panel_edit_shape.xml
index 368be35ed9..368be35ed9 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml
index 73b712374e..73b712374e 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml
index 5e457612d5..5e457612d5 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_skin.xml b/indra/newview/skins/default/xui/es/panel_edit_skin.xml
index 8d895a6152..8d895a6152 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml
index 416d174298..416d174298 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_socks.xml b/indra/newview/skins/default/xui/es/panel_edit_socks.xml
index ac9b2a773e..ac9b2a773e 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml
index 8776dd6c10..8776dd6c10 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml
index aac8af44b9..aac8af44b9 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml
index c26c554c1a..c26c554c1a 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml
index 799512968d..799512968d 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/es/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
index b398293175..b398293175 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index b00c300c85..b00c300c85 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
index 09c4eec4d9..09c4eec4d9 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 0d877f78f2..319e9d0f1b 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Alguno de los Residentes que has elegido ya están en el grupo: no se les enviará la invitación.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Las invitaciones al grupo no se han enviado: has seleccionado demasiados Residentes. Solo se permiten 100 invitaciones al grupo por solicitud.
+	</panel.string>
 	<text bottom_delta="-96" height="72" name="help_text" width="214">
 		Puedes elegir a varios Residentes para invitarles a tu grupo. Para empezar, pulsa &apos;Abrir el selector de residentes&apos;.
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 3afb0f5665..3afb0f5665 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
index 5c9f1c3688..4d682068d7 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconocido"/>
+	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index 1eaa69abff..1eaa69abff 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_notify.xml b/indra/newview/skins/default/xui/es/panel_group_notify.xml
index 7bdacbd1e0..7bdacbd1e0 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 390b4e2e9d..390b4e2e9d 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
index f218324d50..f218324d50 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/es/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/es/panel_inventory_item.xml b/indra/newview/skins/default/xui/es/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/es/panel_landmark_info.xml b/indra/newview/skins/default/xui/es/panel_landmark_info.xml
index 1a0ac3ba79..1a0ac3ba79 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/es/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/es/panel_landmarks.xml b/indra/newview/skins/default/xui/es/panel_landmarks.xml
index b92685f0ae..b92685f0ae 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/es/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index 0e94cbe70b..1d7f077fe7 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=es
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				INICIAR SESIÓN
+			</text>
 			<text name="username_text">
 				Nombre de usuario:
 			</text>
@@ -15,34 +15,32 @@
 			<text name="password_text">
 				Contraseña:
 			</text>
-			<check_box label="Recordar la contraseña" name="remember_check"/>
-			<button label="Iniciar sesión" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Modo:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Selecciona el modo. Elige Básico para una exploración rápida y fácil y para chatear. Elige Avanzado para tener acceso a más funciones.">
-				<combo_box.item label="Básico" name="Basic"/>
-				<combo_box.item label="Avanzado" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Empezar en:
 			</text>
 			<combo_box name="start_location_combo">
 				<combo_box.item label="Mi última posición" name="MyLastLocation"/>
 				<combo_box.item label="Mi Base" name="MyHome"/>
-				<combo_box.item label="&lt;Escribe en qué región&gt;" name="Typeregionname"/>
+				<combo_box.item label="&lt;Escribe el nombre de la región&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Registrarme
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				¿Necesitas ayuda para conectarte?
 			</text>
 			<text name="forgot_password_text">
 				¿Olvidaste el nombre de usuario o la contraseña?
 			</text>
-			<text name="login_help">
-				¿Necesitas ayuda para conectarte?
+			<button label="Iniciar sesión" name="connect_btn"/>
+			<check_box label="Recordar la contraseña" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CREA TU CUENTA
 			</text>
+			<button label="Iniciar ahora" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
index 7e318a150b..7e318a150b 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/panel_me.xml b/indra/newview/skins/default/xui/es/panel_me.xml
index 850cd6ec71..850cd6ec71 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_me.xml
+++ b/indra/newview/skins/default/xui/es/panel_me.xml
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
index afc11a4250..afc11a4250 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml
index ec9edbfa15..ec9edbfa15 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
index a1a3ec86cf..a1a3ec86cf 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
index d36c6283bc..d36c6283bc 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
index 4220ab3c9f..4220ab3c9f 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
index af2b6e920b..e6ca59f912 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Pulsa aquí para chatear." name="chat_box" tool_tip="Pulsa Enter para decirlo o Ctrl+Enter para gritarlo"/>
 	<button name="show_nearby_chat" tool_tip="Muestra o esconde el registro del chat"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_nearby_media.xml b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
index 8d4f9eda18..8d4f9eda18 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/es/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml
index dc7c873303..dc7c873303 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/es/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/es/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
index 9e2f3c3adc..9e2f3c3adc 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml
index 9e669995aa..9e669995aa 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
index 1107e72b54..1107e72b54 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml
index 8f805c3d18..8f805c3d18 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_list.xml b/indra/newview/skins/default/xui/es/panel_outfits_list.xml
index 3f8057f242..3f8057f242 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
index 8cea619bd5..8cea619bd5 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/es/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index a9d38dca25..06150f7619 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -14,81 +14,56 @@
 	<string name="no_filtered_friends_msg">
 		¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar].
 	</string>
-	<string name="people_filter_label" value="Filtrar a la gente"/>
-	<string name="groups_filter_label" value="Filtrar a los grupos"/>
 	<string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/>
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
-	<filter_editor label="Filtrar" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="MIS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MIS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opciones"/>
-				<button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
-				<button name="activate_btn" tool_tip="Activar el grupo seleccionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar los grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/>
+				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
+				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
 			</panel>
+			<text name="groupcount">
+				Formas parte de [COUNT] grupos y puedes unirte a [REMAINING] más.
+			</text>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opciones"/>
-				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar la gente" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
+				<menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/>
+				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADO" name="blocked_panel">
+			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_pick_info.xml b/indra/newview/skins/default/xui/es/panel_pick_info.xml
index 3450279b4a..3450279b4a 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/es/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/es/panel_picks.xml b/indra/newview/skins/default/xui/es/panel_picks.xml
index 904cdd12f1..904cdd12f1 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_picks.xml
+++ b/indra/newview/skins/default/xui/es/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/es/panel_place_profile.xml b/indra/newview/skins/default/xui/es/panel_place_profile.xml
index e1cf1332e2..e1cf1332e2 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/es/panel_places.xml b/indra/newview/skins/default/xui/es/panel_places.xml
index e9984b4512..e9984b4512 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_places.xml
+++ b/indra/newview/skins/default/xui/es/panel_places.xml
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_message.xml b/indra/newview/skins/default/xui/es/panel_postcard_message.xml
index 7316d91f5c..7316d91f5c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/es/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
index 3931319447..3931319447 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/es/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
index 620a95de4d..620a95de4d 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
index f34edf149e..f34edf149e 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index aea9b9ce4a..7feff9005c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<text name="font_size">
-		Tamaño de la fuente:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Disminuir" name="radio" value="0"/>
-		<radio_item label="Medio" name="radio2" value="1"/>
-		<radio_item label="Aumentar" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
-	<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
-	<check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/>
-	<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar los MI en:
-	</text>
-	<text name="requires_restart_label">
-		(requiere reiniciar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
-		<radio_item label="Ventanas distintas" name="radio" value="0"/>
-		<radio_item label="Pestañas" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Permitir ventanas de chat emergentes:
-	</text>
-	<check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/>
-	<check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/>
-	<spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/>
-	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
-	<button label="Configuración de la traducción del chat" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
+		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamaño de la fuente:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeño" name="Small" value="0"/>
+			<item label="Medio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			MI de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			MI de no amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			MI de conferencias:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Chat de grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Chat con gente cercana:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			MI de objetos:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Abrir ventana de conversaciones" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir el mensaje en una ventana emergente" name="PopUpMessage" value="toast"/>
+			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Ninguna acción" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Reproducir sonido" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Para dejar de recibir avisos durante un tiempo, usa Comunicarme &gt; No molestar.
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Reproducir sonido:
+		</text>
+		<check_box label="Nueva conversación" name="new_conversation"/>
+		<check_box label="Llamada de voz entrante" name="incoming_voice_call"/>
+		<check_box label="Oferta de teleporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventario" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Borrar registro..." name="clear_log"/>
+		<button label="Borrar grabaciones..." name="delete_transcripts"/>
+		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
+	</panel>
+	<button label="Traducción…" name="ok_btn"/>
+	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
+	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
index d47a6d718a..d47a6d718a 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 4fc163f5b6..98b0081da9 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta cuando estoy en modo ocupado:
+		Respuesta de No molestar:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 281b871fed..a9eab74e2b 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -25,14 +25,14 @@
 		<text name="ShadersText">
 			Shaders:
 		</text>
-		<check_box initial_value="verdadero" label="Agua transparente" name="TransparentWater"/>
+		<check_box initial_value="true" label="Agua transparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/>
-		<check_box initial_value="verdadero" label="Luces locales" name="LocalLights"/>
+		<check_box initial_value="true" label="Luces locales" name="LocalLights"/>
 		<check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
 		<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="verdadero" label="Luces y sombras" name="UseLightShaders"/>
-		<check_box initial_value="verdadero" label="Oclusión del ambiente" name="UseSSAO"/>
-		<check_box initial_value="verdadero" label="Profundidad del campo" name="UseDoF"/>
+		<check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Oclusión del ambiente" name="UseSSAO"/>
+		<check_box initial_value="true" label="Profundidad del campo" name="UseDoF"/>
 		<text name="shadows_label">
 			Sombras:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_move.xml b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
index b2ff6b61c2..b2ff6b61c2 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
index c162130af6..c162130af6 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 81a29dae5a..508bfbcd32 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -21,7 +21,7 @@
 	<check_box initial_value="true" label="Activar plugins" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Aceptar las &apos;cookies&apos;" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Activar Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="falso" label="Permitir las ventanas emergentes en el navegador" name="media_popup_enabled"/>
+	<check_box initial_value="false" label="Permitir las ventanas emergentes en el navegador" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Actualizaciones de software:
 	</text>
@@ -29,6 +29,7 @@
 		<combo_box.item label="Instalar automáticamente" name="Install_automatically"/>
 		<combo_box.item label="Descargar e instalar actualizaciones manualmente" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Admitir candidatos a la versión comercial a la hora de realizar actualizaciones" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Configuración de proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
index 5cb1654c70..dcd6984715 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_sound.xml
@@ -19,7 +19,7 @@
 	<check_box label="Activado" name="enable_voice_check"/>
 	<check_box label="Permitir la ejecución automática de los media" name="media_auto_play_btn" tool_tip="Marcar esto para permitir la ejecución automática de los media" value="true"/>
 	<check_box label="Ejecutar para otros avatares los media anexados" name="media_show_on_others_btn" tool_tip="Al desmarcar esto se esconderán los media anexados a otros avatares cercanos" value="true"/>
-	<check_box label="Reproducir sonidos de los gestos" name="gesture_audio_play_btn" tool_tip="Selecciona esta opción para escuchar los sonidos de los gestos" value="verdadero"/>
+	<check_box label="Reproducir sonidos de los gestos" name="gesture_audio_play_btn" tool_tip="Selecciona esta opción para escuchar los sonidos de los gestos" value="true"/>
 	<text name="voice_chat_settings">
 		Configuración del chat de voz
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
index 90b9e475e7..90b9e475e7 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 2beacda235..2beacda235 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index 64162220a6..71bdba1a25 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="297" name="top_scripts_help"/>
 	<button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/>
 	<button label="?" name="restart_help"/>
-	<button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
+	<button label="Cancelar reinicio" name="cancel_restart_btn" tool_tip="Cancelar el reinicio de región"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_environment.xml b/indra/newview/skins/default/xui/es/panel_region_environment.xml
index a73f1deed4..a73f1deed4 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 84c1ed7686..6089dfb8db 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -26,7 +26,7 @@
 		Permitir únicamente el acceso a los Residentes que:
 	</text>
 	<check_box label="Han aportado la información de pago." name="limit_payment" tool_tip="Para poder acceder a este estado los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
-	<check_box label="Han verificado su edad" name="limit_age_verified" tool_tip="Para poder acceder a este estado los Residentes deben haber verificado su edad. Para más información, ver [SUPPORT_SITE]."/>
+	<check_box label="Son mayores de 18 años" name="limit_age_verified" tool_tip="Para poder acceder a este estado, los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
 	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 453d1fe43c..453d1fe43c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index cb6c03dbb5..cb6c03dbb5 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
deleted file mode 100644
index 047e8f2f30..0000000000
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texturas del terreno" name="Textures">
-	<text name="region_text_lbl">
-		Región:
-	</text>
-	<text name="region_text">
-		desconocida
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texturas del terreno (se requieren archivos .tga de 512x512 y 24 bites)
-	</text>
-	<text name="height_text_lbl">
-		1 (Baja)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Alta)
-	</text>
-	<text name="height_text_lbl5">
-		Rangos de la elevación de la textura
-	</text>
-	<text name="height_text_lbl6">
-		Noroeste
-	</text>
-	<text name="height_text_lbl7">
-		Noreste
-	</text>
-	<text name="height_text_lbl8">
-		Suroeste
-	</text>
-	<text name="height_text_lbl9">
-		Sureste
-	</text>
-	<spinner label="Baja" name="height_start_spin_0"/>
-	<spinner label="Baja" name="height_start_spin_1"/>
-	<spinner label="Baja" name="height_start_spin_2"/>
-	<spinner label="Baja" name="height_start_spin_3"/>
-	<spinner label="Alta" name="height_range_spin_0"/>
-	<spinner label="Alta" name="height_range_spin_1"/>
-	<spinner label="Alta" name="height_range_spin_2"/>
-	<spinner label="Alta" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Estos valores representan la gama de mezclas para las texturas superiores.
-	</text>
-	<text name="height_text_lbl11">
-		Midiendo en metros, el valor BAJA es la altura MÁXIMA de la textura #1, y el valor ALTA es la altura MÍNIMA de la textura #4.
-	</text>
-	<text name="height_text_lbl12">
-		y el valor ALTA es la altura MÍNIMA de la textura #4.
-	</text>
-	<button label="Aplicar" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_script_ed.xml b/indra/newview/skins/default/xui/es/panel_script_ed.xml
index 4c4077b96f..87314820a6 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/es/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Seleccionar todo" name="Select All"/>
 			<menu_item_call label="Deseleccionar" name="Deselect"/>
 			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
+			<menu_item_call label="Ir a la línea..." name="Go to line..."/>
 		</menu>
 		<menu label="Ayuda" name="Help">
 			<menu_item_call label="Ayuda..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml
index 9334d58af2..9334d58af2 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/es/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml
index 37dc0a576c..37dc0a576c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/es/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
index bafd4e5e55..bafd4e5e55 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/es/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/es/panel_side_tray.xml b/indra/newview/skins/default/xui/es/panel_side_tray.xml
deleted file mode 100644
index cf5afb3cd1..0000000000
--- a/indra/newview/skins/default/xui/es/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Manejar la barra lateral." name="sidebar_openclose" tab_title="Barra lateral"/>
-	<sidetray_tab description="Inicio." name="sidebar_home" tab_title="Inicio">
-		<panel label="Inicio" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Edita tu perfil público y tus destacados." name="sidebar_me" tab_title="Mi perfil">
-		<panel_container name="panel_container">
-			<panel label="Yo" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encuentra a tus amigos, contactos y gente que esté cerca." name="sidebar_people" tab_title="Gente">
-		<panel_container name="panel_container">
-			<panel label="Perfil del grupo" name="panel_group_info_sidetray"/>
-			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encontrar lugares donde ir o que ya visitaste." label="Lugares" name="sidebar_places" tab_title="Lugares">
-		<panel label="Lugares" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Mira tu inventario." name="sidebar_inventory" tab_title="Mi inventario">
-		<panel label="Modificar el inventario" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Cambia tu apariencia y tu &apos;look&apos; actual." name="sidebar_appearance" tab_title="Mi apariencia">
-		<panel label="Modificar la apariencia" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml
index 775e343dc9..775e343dc9 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/es/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
index 12c74b5cd1..12c74b5cd1 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
index 08c45d2e76..08c45d2e76 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
index 2b2584f66c..2b2584f66c 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
index 649d547ba0..649d547ba0 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
index 6a0bc22d68..6a0bc22d68 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/es/panel_sound_devices.xml b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
index 9531b99cc8..9531b99cc8 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/es/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml
index 350aec9c69..350aec9c69 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/es/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index 7eead3bc18..7eead3bc18 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history.xml b/indra/newview/skins/default/xui/es/panel_teleport_history.xml
index 364451b26b..364451b26b 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/es/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
index 10b37b6880..10b37b6880 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/es/panel_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
new file mode 100644
index 0000000000..b820880e60
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Textura" name="Texture">
+	<panel.string name="string repeats per meter">
+		Repeticiones por metro
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Repeticiones por cara
+	</panel.string>
+	<text name="color label">
+		Color
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+	<text name="color trans">
+		Porcentaje de transparencia
+	</text>
+	<text name="glow label">
+		Resplandor
+	</text>
+	<check_box label="Brillo total" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Materiales" name="Materials"/>
+		<combo_box.item label="Media" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Textura (difuminar)" name="Texture (diffuse)"/>
+		<combo_box.item label="Rugosidad (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Brillo (efecto espejo)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una imagen"/>
+	<text name="label alphamode">
+		Modo alfa
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Ninguno" name="None"/>
+		<combo_box.item label="Mezclado alfa" name="Alpha blending"/>
+		<combo_box.item label="Máscara alfa" name="Alpha masking"/>
+		<combo_box.item label="Máscara de emisión lumínica" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Límite de máscara
+	</text>
+	<texture_picker label="Textura" name="bumpytexture control" tool_tip="Pulsa para elegir una imagen"/>
+	<text name="label bumpiness">
+		Rugosidad
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Ninguna" name="None"/>
+		<combo_box.item label="Claridad" name="Brightness"/>
+		<combo_box.item label="Oscuridad" name="Darkness"/>
+		<combo_box.item label="madera" name="woodgrain"/>
+		<combo_box.item label="corteza" name="bark"/>
+		<combo_box.item label="ladrillos" name="bricks"/>
+		<combo_box.item label="cuadrícula" name="checker"/>
+		<combo_box.item label="hormigón" name="concrete"/>
+		<combo_box.item label="azulejo" name="crustytile"/>
+		<combo_box.item label="piedralabrada" name="cutstone"/>
+		<combo_box.item label="discos" name="discs"/>
+		<combo_box.item label="gravilla" name="gravel"/>
+		<combo_box.item label="placadepetri" name="petridish"/>
+		<combo_box.item label="revestimiento" name="siding"/>
+		<combo_box.item label="baldosa" name="stonetile"/>
+		<combo_box.item label="estuco" name="stucco"/>
+		<combo_box.item label="succión" name="suction"/>
+		<combo_box.item label="tejido" name="weave"/>
+	</combo_box>
+	<texture_picker label="Textura" name="shinytexture control" tool_tip="Pulsa para elegir una imagen"/>
+	<text name="label shininess">
+		Brillo
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Ninguno" name="None"/>
+		<combo_box.item label="Bajo" name="Low"/>
+		<combo_box.item label="Medio" name="Medium"/>
+		<combo_box.item label="Alto" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Efecto pulido
+	</text>
+	<text name="label environment">
+		Entorno
+	</text>
+	<text name="label shinycolor">
+		Color
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+	<text name="media_info">
+		Espacio para la URL del media elegido, si procede
+	</text>
+	<button label="Elegir..." name="add_media" tool_tip="Añadir un media"/>
+	<button label="Eliminar" name="delete_media" tool_tip="Borrar esta textura para media"/>
+	<button label="Centrar" label_selected="Centrar los media" name="button align" tool_tip="Centrar esta textura para media (primero debe cargarse)"/>
+	<text name="tex gen">
+		Representación
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Por defecto" name="Default"/>
+		<combo_box.item label="En el plano" name="Planar"/>
+	</combo_box>
+	<spinner label="Escala horizontal" name="TexScaleU"/>
+	<spinner label="Escala vertical" name="TexScaleV"/>
+	<spinner label="Repeticiones por metro" name="rptctrl"/>
+	<spinner label="Grados de rotación" name="TexRot"/>
+	<spinner label="Desplazamiento horizontal" name="TexOffsetU"/>
+	<spinner label="Desplazamiento vertical" name="TexOffsetV"/>
+	<spinner label="Escala horizontal" name="bumpyScaleU"/>
+	<spinner label="Escala vertical" name="bumpyScaleV"/>
+	<spinner label="Grados de rotación" name="bumpyRot"/>
+	<spinner label="Desplazamiento horizontal" name="bumpyOffsetU"/>
+	<spinner label="Desplazamiento vertical" name="bumpyOffsetV"/>
+	<spinner label="Escala horizontal" name="shinyScaleU"/>
+	<spinner label="Escala vertical" name="shinyScaleV"/>
+	<spinner label="Grados de rotación" name="shinyRot"/>
+	<spinner label="Desplazamiento horizontal" name="shinyOffsetU"/>
+	<spinner label="Desplazamiento vertical" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Alinear caras del plano" name="checkbox planar align" tool_tip="Alinear texturas en todas las caras seleccionadas con la última cara seleccionada. Requiere la representación de texturas en el plano."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml
index 94a0428941..94a0428941 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..426783aa8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater" width="215">
+	<slider label="General" label_width="55" name="System Volume" width="155"/>
+	<slider label="Botones" label_width="55" name="UI Volume" width="155"/>
+	<slider label="Ambiental" label_width="55" name="Wind Volume" width="155"/>
+	<slider label="Sonidos" label_width="55" name="SFX Volume" width="155"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Activar sonidos de los gestos"/>
+	<slider label="Música" label_width="55" name="Music Volume" width="155"/>
+	<check_box name="enable_music" tool_tip="Activar música en streaming"/>
+	<slider label="Media" label_width="55" name="Media Volume" width="155"/>
+	<check_box name="enable_media" tool_tip="Activar media en streaming"/>
+	<slider label="Voz" label_width="55" name="Voice Volume" width="155"/>
+	<check_box name="enable_voice_check" tool_tip="Activar el chat de voz"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_world_map.xml b/indra/newview/skins/default/xui/es/panel_world_map.xml
index b1dea02210..b1dea02210 100644..100755
--- a/indra/newview/skins/default/xui/es/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/es/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index 660293b02c..902ed4df52 100644..100755
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración, así como si se muestra en Buscar y las opciones del punto de llegada y el de teleporte." name="Parcel Identity">
 		<action description="Cambiar &apos;Mostrar el sitio en Buscar&apos; y configurar la categoría" longdescription="Cambia &apos;Mostrar el sitio en Buscar&apos; y el configurar la categoría de una parcela en Acerca del terreno &gt; pestaña Opciones." name="land find places" value="17"/>
-		<action description="Cambiar el nombre de la parcela, su descripción, y la configuración de &apos;Mostrar el sitio en Buscar&apos;" longdescription="Cambia el nombre de la parcela, su descripción, y la configuración de &apos;Mostrar el sitio en Buscar&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land change identity" value="18"/>
+		<action description="Cambia el nombre de la parcela, su descripción y la configuración de &apos;Contenido moderado&apos;." longdescription="Cambia el nombre de la parcela, su descripción y la configuración de &apos;Contenido moderado&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land change identity" value="18"/>
 		<action description="Definir los puntos de llegada y teleporte" longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden precisar el punto de llegada o el de teleporte. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
index bdef89c392..bdef89c392 100644..100755
--- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
index f68dcc65e3..f68dcc65e3 100644..100755
--- a/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
index ef7c6781be..176247f90e 100644..100755
--- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(desconocidas)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(desconocido/múltiple)
+	</panel.string>
 	<panel.string name="public">
 		(público)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index bd814ecc66..cb061796e7 100644..100755
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		No puedes modificar estos objetos
 	</panel.string>
+	<panel.string name="text modify info 5">
+		No se puede modificar este objeto a través del límite de una región
+	</panel.string>
+	<panel.string name="text modify info 6">
+		No se pueden modificar estos objetos a través del límite de una región
+	</panel.string>
 	<panel.string name="text modify warning">
 		Este objeto tiene partes enlazadas
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar el objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Precio: L$" name="Edit Cost"/>
 		<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objeto en los resultados de la búsqueda"/>
+		<text name="pathfinding_attributes_label">
+			Atributos de pathfinding:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 67c65c6ce9..484511a08b 100644..100755
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,10 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download.
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
@@ -439,6 +442,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="SLappAgentRequestFriend">
 		Petición de amistad
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Eliminación de amigos
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Cerrar (⌘W)
 	</string>
@@ -610,8 +616,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AvatarAway">
 		Ausente
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		No molestar
 	</string>
 	<string name="AvatarMuted">
 		Ignorado
@@ -823,6 +829,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="anim_yes_head">
 		Sí
 	</string>
+	<string name="use_texture">
+		Usar textura
+	</string>
 	<string name="texture_loading">
 		Cargando...
 	</string>
@@ -844,6 +853,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ST_NO_JOINT">
 		No se puede encontrar ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat)
+	</string>
 	<string name="whisper">
 		susurra:
 	</string>
@@ -871,6 +886,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ScriptQuestionCautionChatDenied">
 		A &apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Si autorizas el acceso a tu cuenta, también permitirás al objeto:
+	</string>
 	<string name="ScriptTakeMoney">
 		Cogerle a usted dólares Linden (L$)
 	</string>
@@ -904,6 +922,27 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
+	<string name="AgentNameSubst">
+		(Tú)
+	</string>
+	<string name="TeleportYourAgent">
+		Teleportarte
+	</string>
+	<string name="JoinAnExperience">
+		Únete a una experiencia
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Suprimir alertas al gestionar las listas de acceso a un estado
+	</string>
+	<string name="OverrideYourAnimations">
+		Reemplazar tus animaciones predeterminadas
+	</string>
+	<string name="ScriptReturnObjects">
+		Devolver objetos en tu nombre
+	</string>
+	<string name="UnknownScriptPermission">
+		(desconocido)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -982,17 +1021,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="script_files">
 		Scripts
 	</string>
-	<string name="AvatarSetNotAway">
-		Salir del estado ausente
-	</string>
-	<string name="AvatarSetAway">
-		Pasar al estado ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Salir del estado ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Pasar al estado ocupado
+	<string name="dictionary_files">
+		Diccionarios
 	</string>
 	<string name="shape">
 		Forma
@@ -1226,7 +1256,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1381,6 +1411,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InvFolder favorite">
 		Mis Favoritos
 	</string>
+	<string name="InvFolder Favorites">
+		Mis Favoritos
+	</string>
+	<string name="InvFolder favorites">
+		Mis Favoritos
+	</string>
 	<string name="InvFolder Current Outfit">
 		Vestuario actual
 	</string>
@@ -1396,6 +1432,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InvFolder Meshes">
 		Redes
 	</string>
+	<string name="InvFolder Received Items">
+		Objetos recibidos
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Buzón de salida de comerciante
+	</string>
 	<string name="InvFolder Friends">
 		Amigos
 	</string>
@@ -1926,6 +1968,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD: abajo der.
 	</string>
+	<string name="ATTACH_NECK">
+		Cuello
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centro del avatar
+	</string>
 	<string name="CursorPos">
 		Línea [LINE], Columna [COLUMN]
 	</string>
@@ -1938,8 +1986,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="PanelContentsNewScript">
 		Script nuevo
 	</string>
-	<string name="BusyModeResponseDefault">
-		El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente tiene activado &apos;No molestar&apos; y verá tu mensaje más tarde.
 	</string>
 	<string name="MuteByName">
 		(Por el nombre)
@@ -2052,9 +2100,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenidos
-	</string>
 	<string name="AcquiredItems">
 		Artículos adquiridos
 	</string>
@@ -2916,6 +2961,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Hip Width">
 		Cadera: ancho
 	</string>
+	<string name="Hover">
+		Pasa el cursor
+	</string>
 	<string name="In">
 		Pegadas
 	</string>
@@ -3772,7 +3820,13 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Región General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Los avatares están visibles y está permitido el chat fuera de esta parcela
+		Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Esta región no tiene activado el pathfinding dinámico.
 	</string>
 	<string name="UpdaterWindowTitle">
 		Actualizar [APP_NAME]
@@ -3840,6 +3894,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Saved_message">
 		(Guardado [LONG_TIMESTAMP])
 	</string>
+	<string name="OnlineStatus">
+		Conectado/a
+	</string>
+	<string name="OfflineStatus">
+		Desconectado/a
+	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
@@ -3849,6 +3909,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Has entrado en la llamada de voz
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Rechazaste la llamada de voz automáticamente porque estaba activado &apos;No molestar&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] inició una llamada de voz
 	</string>
@@ -3861,6 +3924,9 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Se colgó la llamada de voz
 	</string>
+	<string name="conference-title">
+		Chat multi-persona
+	</string>
 	<string name="conference-title-incoming">
 		Conferencia con [AGENT_NAME]
 	</string>
@@ -4739,6 +4805,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversaciones
+	</string>
 	<string name="Command_Compass_Label">
 		Brújula
 	</string>
@@ -4814,6 +4883,9 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Tooltip">
 		Habla por chat de texto con las personas próximas
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar con todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Brújula
 	</string>
@@ -4907,6 +4979,21 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Ninguno
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Afecta al navmesh
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personaje
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Múltiple)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Muy bajo
 	</string>
@@ -4922,4 +5009,22 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="snapshot_quality_very_high">
 		Muy alto
 	</string>
+	<string name="TeleportMaturityExceeded">
+		El Residente no puede visitar esta región.
+	</string>
+	<string name="UserDictionary">
+		[Usuario]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
+	</string>
+	<string name="loading_chat_logs">
+		Cargando...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index a23d9c43d0..94975a83f8 100644..100755
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -44,6 +44,9 @@ Para repetir el tutorial, visita la isla de bienvenida pública.
 		<message name="no_inventory_host">
 			En estos momentos no está disponible el sistema del inventario.
 		</message>
+		<message name="MustGetAgeRegion">
+			Solo pueden acceder a esta región los mayores de 18 años.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -79,5 +82,8 @@ Para repetir el tutorial, visita la isla de bienvenida pública.
 		<message name="requesting">
 			Solicitando teleporte...
 		</message>
+		<message name="pending">
+			Teleporte pendiente...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/es/xui_version.xml
+++ b/indra/newview/skins/default/xui/es/xui_version.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 4409949584..384966354e 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -8,7 +8,9 @@
 		Compilé avec [COMPILER] version [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Vous êtes à [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL : &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(coordonnées globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -66,27 +68,26 @@ Version serveur vocal : [VOICE_VERSION]
 		</panel>
 		<panel label="Licences" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm et Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University et David Luebke, Brenden Schubert, University of Virginia.
+        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University, et David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly et Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-Loup Gailly et Mark Adler.
 
         Le client Second Life utilise Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (et ses concédants de licence). Tous droits réservés. Pour plus de détails, consultez le site Web www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 6f8885487a..25c49b97b5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -134,7 +134,7 @@
 			<text name="DwellText">
 				Chargement...
 			</text>
-			<button label="Acheter du terrain" label_selected="Acheter le terrain..." left_delta="60" name="Buy Land..." width="125"/>
+			<button label="Acheter le terrain" label_selected="Acheter le terrain..." left_delta="60" name="Buy Land..." width="125"/>
 			<button label="Vente Linden" label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères."/>
 			<button label="Infos sur les scripts" name="Scripts..." width="110"/>
 			<button label="Acheter pour le groupe" label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
@@ -339,7 +339,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			<check_box label="Groupe" name="check group scripts"/>
 			<check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n&apos;y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
 			<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
-			<check_box label="Afficher le lieu dans la recherche (30 L$/semaine)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
+			<check_box label="Voir le lieu dans la recherche (30 L$/sem.)" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
 			<combo_box name="land category with adult">
 				<combo_box.item label="Toutes catégories" name="item0"/>
 				<combo_box.item label="Appartenant aux Lindens" name="item1"/>
@@ -377,7 +377,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			</text>
 			<texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image"/>
 			<text name="allow_label5">
-				Les avatars présents sur d&apos;autres parcelles peuvent voir et chatter avec les avatars présents sur cette parcelle.
+				Les avatars sur d&apos;autres parcelles peuvent voir et chatter avec les avatars sur cette parcelle.
 			</text>
 			<check_box label="Voir les avatars" name="SeeAvatarsCheck" tool_tip="Permettre aux avatars présents sur d&apos;autres parcelles de voir et chatter avec les avatars présents sur cette parcelle et à vous de les voir et de chatter avec eux."/>
 			<text name="landing_point">
@@ -439,7 +439,7 @@ musique :
 			<text name="Sound:">
 				Son :
 			</text>
-			<check_box label="Limiter les gestes et sons d&apos;objet à cette parcelle" name="check sound local"/>
+			<check_box label="Limiter les sons des gestes et des objets à cette parcelle" name="check sound local"/>
 			<text name="Avatar Sounds:">
 				Sons d&apos;avatar :
 			</text>
@@ -470,7 +470,7 @@ musique :
 				Conditions d&apos;accès des résidents :
 			</text>
 			<check_box label="Informations de paiement enregistrées [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Pour pouvoir accéder à cette parcelle, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
-			<check_box label="Âge vérifié [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour que les résidents puissent accéder à cette parcelle, leur âge doit avoir fait l&apos;objet d&apos;une vérification. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
+			<check_box label="Avoir plus de 18 ans [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour accéder à cette parcelle, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
 			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
 			<check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
 			<combo_box name="pass_combo" width="110">
diff --git a/indra/newview/skins/default/xui/fr/floater_activeim.xml b/indra/newview/skins/default/xui/fr/floater_activeim.xml
index 18e3d66bb7..18e3d66bb7 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/fr/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml
index e82518ce80..e82518ce80 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
index 84c40b5987..84c40b5987 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
deleted file mode 100644
index aa42fe6150..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Echec de l&apos;initialisation du mouvement
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Le fichier d&apos;animation fait [LENGTH] secondes.
-
-La longueur maximale est de [MAX_LENGTH] secondes.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Impossible de lire le fichier d&apos;animation.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fichier incomplet.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Impossible de lire la définition des contraintes.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Impossible d&apos;ouvrir le fichier BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		En-tête HIERARCHY non valide.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Impossible de trouver ROOT ou JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Impossible de trouver le nom JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Impossible de trouver OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Impossible de trouver les CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Impossible d&apos;obtenir l&apos;ordre de rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Impossible d&apos;obtenir l&apos;axe de rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Impossible de trouver MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Impossible d&apos;obtenir le nombre de cadres.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Impossible d&apos;obtenir le temps du cadre.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Impossible de trouver les valeurs de la position.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Impossible de trouver les valeurs de rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Impossible d&apos;ouvrir le fichier de traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Impossible de lire l&apos;en-tête de traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Impossible de lire la traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Impossible de lire la traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Impossible de lire la valeur de traduction relative.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Impossible de lire la traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Impossible de lire la matrice de traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Impossible de trouver le nom mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Impossible de trouver le nom mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Impossible de définir la valeur de la priorité.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Impossible de définir la valeur de la boucle
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossible de trouver les valeurs easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Impossible de trouver les valeurs easeOut.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Impossible d&apos;obtenir la valeur hand morph.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Impossible de lire le nom emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nom de racine incorrect.
-	</floater.string>
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles autres animations peuvent être remplacées par cette animation"/>
-	<check_box label="Boucle" left="6" name="loop_check" tool_tip="Lit cette animation en boucle"/>
-	<spinner label="Début (%)" label_width="65" name="loop_in_point" tool_tip="Définit un point de l&apos;animation auquel retourne la boucle" width="105"/>
-	<spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit un point de l&apos;animation qui met fin à la boucle"/>
-	<text name="hand_label">
-		Mouvement de
-main
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle ce que font les mains pendant l&apos;animation">
-		<combo_box.item label="Espacement" name="Spread"/>
-		<combo_box.item label="Détendues" name="Relaxed"/>
-		<combo_box.item label="Pointer (les deux)" name="PointBoth"/>
-		<combo_box.item label="Poing" name="Fist"/>
-		<combo_box.item label="Détendue (gauche)" name="RelaxedLeft"/>
-		<combo_box.item label="Pointer (gauche)" name="PointLeft"/>
-		<combo_box.item label="Poing (gauche)" name="FistLeft"/>
-		<combo_box.item label="Détendue (droite)" name="RelaxedRight"/>
-		<combo_box.item label="Pointer (droite)" name="PointRight"/>
-		<combo_box.item label="Poing (droite)" name="FistRight"/>
-		<combo_box.item label="Saluer (droite)" name="SaluteRight"/>
-		<combo_box.item label="Taper" name="Typing"/>
-		<combo_box.item label="Paix (main droite)" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expression
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Contrôle ce que fait le visage pendant l&apos;animation">
-		<item label="(aucun)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Effrayé" name="Afraid" value="Effrayé"/>
-		<item label="En colère" name="Angry" value="En colère"/>
-		<item label="Grand sourire" name="BigSmile" value="Grand sourire"/>
-		<item label="Ennui" name="Bored" value="Ennui"/>
-		<item label="Pleurer" name="Cry" value="Pleurer"/>
-		<item label="Mépris" name="Disdain" value="Mépris"/>
-		<item label="Gêne" name="Embarrassed" value="Gêne"/>
-		<item label="Froncer les sourcils" name="Frown" value="Froncer les sourcils"/>
-		<item label="Embrasser" name="Kiss" value="Embrasser"/>
-		<item label="Rire" name="Laugh" value="Rire"/>
-		<item label="Plllppt" name="Plllppt" value="Tirer la langue"/>
-		<item label="Dégoût" name="Repulsed" value="Dégoût"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Hausser les épaules" name="Shrug" value="Hausser les épaules"/>
-		<item label="Sourire" name="Smile" value="Sourire"/>
-		<item label="Surprise" name="Surprise" value="Surprise"/>
-		<item label="Clin d&apos;œil" name="Wink" value="Clin d&apos;œil"/>
-		<item label="Soucis" name="Worry" value="Inquiétude"/>
-	</combo_box>
-	<text name="preview_label">
-		Prévisualiser
-pendant
-	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
-		<item label="Debout" name="Standing" value="Debout"/>
-		<item label="Marche" name="Walking" value="Marche"/>
-		<item label="Assis" name="Sitting" value="Assis"/>
-		<item label="Vol" name="Flying" value="Vol"/>
-	</combo_box>
-	<spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) de l&apos;entrée en fondu de l&apos;animation"/>
-	<spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) de la sortie en fondu de l&apos;animation"/>
-	<button label="" name="play_btn" tool_tip="Lire votre animation"/>
-	<button name="pause_btn" tool_tip="Pauser votre animation"/>
-	<button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		Impossible de lire le fichier d&apos;animation.
-
-Nous recommandons les fichiers BVH extraits de Poser 4.
-	</text>
-	<button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
-	<button label="Annuler" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
index 6cef2a3591..6cef2a3591 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/fr/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
new file mode 100755
index 0000000000..1d19181692
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Paramètres Rechercher/Remplacer">
+	<check_box label="Activer la fonction Rechercher/Remplacer" name="autoreplace_enable" tool_tip="Lors de la saisie du texte d&apos;un chat, remplace chaque mot-clé spécifié par la valeur correspondante."/>
+	<button label="Importer une liste..." name="autoreplace_import_list" tool_tip="Charger une liste précédemment exportée à partir d&apos;un fichier."/>
+	<button label="Exporter la liste..." name="autoreplace_export_list" tool_tip="Enregistrer la liste sélectionnée dans un fichier afin de pouvoir la partager."/>
+	<button label="Nouvelle liste..." name="autoreplace_new_list" tool_tip="Créer une nouvelle liste."/>
+	<button label="Supprimer la liste" name="autoreplace_delete_list" tool_tip="Supprimer la liste sélectionnée."/>
+	<button name="autoreplace_list_up" tool_tip="Augmenter la priorité de cette liste."/>
+	<button name="autoreplace_list_down" tool_tip="Diminuer la priorité de cette liste."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Mot-clé" name="keyword"/>
+		<scroll_list.columns label="Remplacement" name="replacement"/>
+	</scroll_list>
+	<button label="Ajouter..." name="autoreplace_add_entry"/>
+	<button label="Supprimer" name="autoreplace_delete_entry"/>
+	<button label="Enregistrer" name="autoreplace_save_entry" tool_tip="Enregistrer cette entrée."/>
+	<button label="Enregistrer les modifications" name="autoreplace_save_changes" tool_tip="Enregistrer toutes les modifications."/>
+	<button label="Annuler" name="autoreplace_cancel" tool_tip="Ignorer toutes les modifications."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar.xml b/indra/newview/skins/default/xui/fr/floater_avatar.xml
index 7cbb50a3d6..7cbb50a3d6 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index 74de4ddb1c..74de4ddb1c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index e1786eafc7..e1786eafc7 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml
index ebd4dab683..ebd4dab683 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
index a200ed192f..a200ed192f 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
index ab68ce166b..7ee4441758 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFIER LES DROITS">
+<floater name="floaterbulkperms" title="MODIFIER LES DROITS RELATIFS AU CONTENU">
 	<floater.string name="nothing_to_modify_text">
 		Certains contenus sont non modifiables.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Tout" label_selected="Tout" name="check_all"/>
 	<button label="Effacer" label_selected="Aucun" name="check_none"/>
 	<text name="newperms">
-		Nouveaux droits
+		Modifier les droits relatifs au contenu et remplacer par
 	</text>
 	<text name="GroupLabel">
 		Groupe :
@@ -49,6 +49,7 @@
 	<check_box label="Modifier" name="next_owner_modify"/>
 	<check_box label="Copier" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transférer" name="next_owner_transfer" tool_tip="Le prochain propriétaire peut donner ou revendre cet objet"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Appliquer" name="apply"/>
 	<button label="Annuler" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
index 32714ea09c..32714ea09c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index 0436dc8a91..0436dc8a91 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 148a5a35d2..148a5a35d2 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml
index 953fca3544..953fca3544 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index b7f8f36f81..b7f8f36f81 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 519e741a25..519e741a25 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index f2b0ee8af3..893e389f69 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="camera_floater" title="PARAMÈTRES DE LA CAMÉRA">
+<floater name="camera_floater" title="CONTRÔLE DE LA CAMÉRA">
 	<floater.string name="rotate_tooltip">
 		Faire tourner la caméra autour du point central
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
index 890411d091..7dcb9a280d 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT PRÈS DE MOI">
+<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
 	<panel name="bottom_panel">
 		<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl+Entrée pour crier"/>
 		<button name="show_nearby_chat" tool_tip="Afficher/masquer le journal de chat près de vous."/>
diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
index b73bedd7b5..b73bedd7b5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index c54e3e9ce0..c54e3e9ce0 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
new file mode 100644
index 0000000000..e9017c79b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..9a486a84c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSATION:">
+	<floater.string name="Title">
+		CONVERSATION: [NAME]
+	</floater.string>
+	<text name="page_label" value="Page"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml
index 6d30d97048..6d30d97048 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_critical.xml
+++ b/indra/newview/skins/default/xui/fr/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
index 035bdbe5f3..035bdbe5f3 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/fr/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_destinations.xml b/indra/newview/skins/default/xui/fr/floater_destinations.xml
index 25e6c90a8e..25e6c90a8e 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/fr/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml
index eebe7abf2c..eebe7abf2c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/fr/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
index 0100419bc5..5ec68458e1 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/fr/floater_edit_day_cycle.xml
@@ -22,13 +22,13 @@
 		Remarque : si vous changez votre préréglage de nom, un nouveau préréglage sera créé et celui existant restera tel quel.
 	</text>
 	<text name="hint_item1">
-		- Cliquez sur un repère pour modifier le réglage du ciel et l&apos;heure associés.
+		- Modifier un réglage de ciel/heure : clic sur le repère
 	</text>
 	<text name="hint_item2">
-		- Cliquez sur les repères et faites-les glisser afin de définir les heures de transition.
+		- Heures de transition : clic-glissement des repères
 	</text>
 	<text name="hint_item3">
-		- Déplacez le marqueur en forme de triangle pour afficher un aperçu du cycle du jour.
+		- Aperçu du cycle du jour : déplacement du triangle
 	</text>
 	<panel name="day_cycle_slider_panel">
 		<multi_slider initial_value="0" name="WLTimeSlider"/>
@@ -91,11 +91,11 @@
 		</text>
 	</panel>
 	<text name="WLCurKeyPresetText">
-		Réglage du ciel :
+		Régl. ciel :
 	</text>
 	<combo_box label="Préréglage" name="WLSkyPresets"/>
 	<text name="WLCurKeyTimeText">
-		Heure :
+		H. :
 	</text>
 	<time name="time" value="6h"/>
 	<check_box label="Appliquer ce nouveau cycle du jour" name="make_default_cb"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
index 4ec9bbb3dd..4ec9bbb3dd 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/fr/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
index 81d9d34cfb..81d9d34cfb 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/fr/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
index 9ea47a3dd7..ea12749d27 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_environment_settings.xml
@@ -18,7 +18,7 @@
 			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
 		</combo_box>
 		<text name="sky_dayc_settings_title">
-			Ciel / Cycle du jour
+			Ciel/Cycle du jour
 		</text>
 		<radio_group name="sky_dayc_settings_radio_group">
 			<radio_item label="Ciel fixe" name="my_sky_settings"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_event.xml b/indra/newview/skins/default/xui/fr/floater_event.xml
index 67d70ac003..67d70ac003 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_event.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
index 0100b10557..0100b10557 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml
index 974a5ca3a2..974a5ca3a2 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/fr/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index 5ead1cae3a..5ead1cae3a 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index e4c53d866c..0d21a8af32 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -71,8 +71,8 @@
 			<button label="Supprimer tous les objets scriptés de la cible sur les terrains des autres" label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non copiables seront renvoyés."/>
 			<button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non copiables seront renvoyés."/>
 			<button label="Supprimer *tous* les objets de la cible" label_selected="Supprimer *tous* les objets de la cible" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non copiables seront renvoyés."/>
-			<button label="Afficher les collisions les plus consommatrices" label_selected="Afficher les collisions les plus consommatrices" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. " width="300"/>
-			<button label="Afficher les objets scriptés les plus consommateurs" label_selected="Afficher les objets scriptés les plus consommateurs" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts." width="300"/>
+			<button label="Collisions les plus consommatrices" label_selected="Collisions les plus consommatrices" name="Get Top Colliders" tool_tip="Liste des objets avec les callbacks les plus fréquents. " width="300"/>
+			<button label="Scripts les plus consommateurs" label_selected="Scripts les plus consommateurs" name="Get Top Scripts" tool_tip="Liste des objets passant le plus de temps à exécuter des scripts." width="300"/>
 			<button label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences." width="300"/>
 		</panel>
 		<panel label="Requête" name="request">
diff --git a/indra/newview/skins/default/xui/fr/floater_goto_line.xml b/indra/newview/skins/default/xui/fr/floater_goto_line.xml
new file mode 100644
index 0000000000..fdc800b40b
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ALLER À LA LIGNE">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Aller à la ligne
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 2bc76e0c63..bb146556ba 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Activer le VBO :
 	</text>
 	<check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
+	<text name="tc label">
+		Activer S3TC :
+	</text>
+	<check_box initial_value="true" label="Activer la compression des textures (redémarrage requis)" name="texture compression" tool_tip="Comprime les textures en mémoire vidéo afin de permettre de charger des textures de résolution plus élevée au prix d&apos;une certaine qualité de couleur."/>
 	<slider label="Mémoire textures (Mo) :" name="GraphicsCardTextureMemory" tool_tip="Quantité de mémoire à affecter aux textures. Utilise la mémoire de la carte vidéo par défaut. Si vous réduisez ce paramètre, cela peut améliorer les performances, mais les textures risquent d&apos;être floues."/>
 	<spinner label="Indice du brouillard :" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_help_browser.xml b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
index 11caca640c..11caca640c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml
index a414212ba0..a414212ba0 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/fr/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml
index f212f113b3..f212f113b3 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_hud.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
index 5ea073365e..f0b17e8437 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
+<multi_floater name="floater_im_box" title="CONVERSATIONS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
+					<button name="add_btn" tool_tip="Commencer une nouvelle conversation"/>
+					<button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/>
+					<text name="stub_textbox">
+						Cette conversation s&apos;affiche dans une fenêtre distincte.   [secondlife:/// la rattacher.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 516eb41362..6d98f0a846 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="À" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] a été invité à la conversation."/>
+	<floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/>
+	<floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/>
+	<floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/>
+	<floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/>
+	<floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/>
+				<button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/>
+				<button name="close_btn" tool_tip="Mettre fin à cette conversation"/>
+				<button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="À" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 3d405f358d..3d405f358d 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_import_collada.xml b/indra/newview/skins/default/xui/fr/floater_import_collada.xml
index 03804c4bd5..03804c4bd5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/fr/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
index 7594eec5f2..9e6946ba9e 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonyme
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		appelle.
+		vous appelle.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		a rejoint un chat vocal avec conférence.
@@ -25,9 +25,9 @@
 		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</floater.string>
 	<text name="question">
-		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
+		Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle.
 	</text>
-	<button label="Accepter" label_selected="Accepter" name="Accept"/>
-	<button label="Refuser" label_selected="Refuser" name="Reject"/>
-	<button label="Lancer IM" name="Start IM"/>
+	<button label="Répondre" label_selected="Répondre" name="Accept"/>
+	<button label="Ignorer" label_selected="Ignorer" name="Reject"/>
+	<button label="Ouvrir IM à la place" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
index 9b1bdf106d..9b1bdf106d 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
deleted file mode 100644
index 200c07e522..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MON INVENTAIRE">
-	<floater.string name="Title">
-		MON INVENTAIRE
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MON INVENTAIRE (récupération de [ITEM_COUNT] articles en cours) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MON INVENTAIRE ([ITEM_COUNT] articles) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Récupéré
-	</floater.string>
-	<panel label="Panneau Inventaire" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index f2eb3cb6bc..f2eb3cb6bc 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 7567817f3a..7567817f3a 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index 02ac21bf82..02ac21bf82 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index 39a861d8bd..39a861d8bd 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
index 10fe132623..ff728e3aaa 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
@@ -7,7 +7,7 @@
 		<column label="Surface" name="area"/>
 		<column label="" name="hidden"/>
 	</scroll_list>
-	<button label="Téléporter" label_selected="Téléporter" name="Teleport" tool_tip="Téléportez-vous au milieu de ce terrain."/>
+	<button label="Téléportation" label_selected="Téléportation" name="Teleport" tool_tip="Téléportez-vous au milieu de ce terrain."/>
 	<button label="Carte" label_selected="Carte" name="Show on Map" tool_tip="Afficher ce terrain sur la carte du monde"/>
 	<text name="contrib_label">
 		Vos contributions :
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index 7647452e91..7647452e91 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index 71d2c42578..71d2c42578 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_map.xml b/indra/newview/skins/default/xui/fr/floater_map.xml
index dbd3dd9406..dbd3dd9406 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_map.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 58535eddf5..58535eddf5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_media_settings.xml b/indra/newview/skins/default/xui/fr/floater_media_settings.xml
index 27db5ea995..27db5ea995 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
index d03c4d7544..d03c4d7544 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
index b491dd6aed..b491dd6aed 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index a3b50351ae..bd3dae6599 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triangles" name="triangles" value="Triangles"/>
 				<text initial_value="Sommets" name="vertices" value="Sommets"/>
 				<text initial_value="Élevé" name="high_label" value="Élevé"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Moyen" name="medium_label" value="Moyen"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+					<item name="Use LoD above" value="Niveau de détail du dessus"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Faible" name="low_label" value="Faible"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+					<item name="Use LoD above" value="Niveau de détail du dessus"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Le plus faible" name="lowest_label" value="Le plus faible"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+					<item name="Use LoD above" value="Niveau de détail du dessus"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Génération de normales" name="gen_normals"/>
@@ -166,7 +201,7 @@
 						Passes :
 					</text>
 					<text name="Detail Scale label">
-						Échelle de détail :
+						Échelle détail :
 					</text>
 					<text name="Retain%_label">
 						Retenue :
@@ -192,7 +227,7 @@
 			</panel>
 			<panel label="Option de chargement" name="modifiers_panel">
 				<text name="scale_label">
-					Echelle (1 = pas d&apos;échelle) :
+					Échelle (1 = aucune) :
 				</text>
 				<spinner name="import_scale" value="1.0"/>
 				<text name="dimensions_label">
@@ -203,21 +238,21 @@
 				</text>
 				<check_box label="Inclure les textures" name="upload_textures"/>
 				<text name="include_label">
-					Pour les modèles d&apos;avatar uniquement :
+					Modèles d&apos;avatar uniquement :
 				</text>
-				<check_box label="Inclure la pondération de la peau :" name="upload_skin"/>
-				<check_box label="Inclure la position des articulations :" name="upload_joints"/>
+				<check_box label="Inclure pondération de la peau :" name="upload_skin"/>
+				<check_box label="Inclure position des articulations :" name="upload_joints"/>
 				<text name="pelvis_offset_label">
-					Décalage Z (élever ou abaisser l&apos;avatar) :
+					Décalage Z (élever/abaisser l&apos;avatar) :
 				</text>
 				<spinner name="pelvis_offset" value="0.0"/>
 			</panel>
 		</tab_container>
 		<panel name="weights_and_warning_panel">
-			<button label="Calculer les poids et les frais." name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
+			<button label="Calculer les poids et les frais" name="calculate_btn" tool_tip="Calculer les poids et les frais."/>
 			<button label="Annuler" name="cancel_btn"/>
 			<button label="Charger le modèle" name="ok_btn" tool_tip="Charger dans le simulateur"/>
-			<button label="Effacer les paramètres et réinitialiser le formulaire" name="reset_btn"/>
+			<button label="Effacer les paramètres / réinitialiser le formulaire" name="reset_btn"/>
 			<text name="upload_fee">
 				Frais de chargement : [FEE] L$
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml b/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
deleted file mode 100644
index 128b9d6fa4..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="ASSISTANT DE CHARGEMENT DE MODÈLE">
-	<button label="5. Chargement" name="upload_btn"/>
-	<button label="4. Vérification" name="review_btn"/>
-	<button label="3. Propriétés physiques" name="physics_btn"/>
-	<button label="2. Optimisation" name="optimize_btn"/>
-	<button label="1. Sélection du fichier" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Choisir un fichier de modèle
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Utilisateurs expérimentés : si vous êtes habitué à utiliser des outils de création de contenu en 3D, l&apos;outil de chargement avancé est mis à votre disposition.
-			</text>
-			<button label="Passer à Avancé" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Choisir un fichier de modèle à charger
-			</text>
-			<button label="Parcourir..." label_selected="Parcourir..." name="browse"/>
-			<text name="Model types">
-				Second Life prend en charge les fichiers COLLADA (.dae).
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				AVERTISSEMENT :
-			</text>
-			<text name="warning_text">
-				Vous ne pourrez pas effectuer l&apos;étape de chargement finale du modèle sur les serveurs Second Life. [secondlife:///app/floater/learn_more Découvrez comment] configurer votre compte pour le chargement de modèles de maillage.
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Optimiser le modèle
-			</text>
-		</panel>
-		<text name="optimize_description">
-			Le modèle a été optimisé en termes de performances. Vous pouvez l&apos;ajuster si vous le souhaitez.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Générer le niveau de détail : Élevé
-			</text>
-			<text name="medium_detail_text">
-				Générer le niveau de détail : Moyen
-			</text>
-			<text name="low_detail_text">
-				Générer le niveau de détail : Faible
-			</text>
-			<text name="lowest_detail_text">
-				Générer le niveau de détail : Le plus faible
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Recalcul géométrique" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Aperçu de la géométrie
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Niveau de détail élevé
-				</combo_item>
-				<combo_item name="medium">
-					Niveau de détail moyen
-				</combo_item>
-				<combo_item name="low">
-					Niveau de détail faible
-				</combo_item>
-				<combo_item name="lowest">
-					Niveau de détail le plus faible
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Ajuster les propriétés physiques
-			</text>
-		</panel>
-		<text name="physics_description">
-			Une forme va être créée pour l&apos;enveloppe externe du modèle. Ajustez le niveau de détail de la forme en fonction de l&apos;objectif souhaité pour votre modèle.
-		</text>
-		<panel name="physics_content">
-			<button label="Recalcul physique" name="recalculate_physics_btn"/>
-			<button label="Recalcul en cours..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Aperçu des propriétés physiques
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Niveau de détail à afficher en rendu d&apos;aperçu.">
-				<combo_item name="high">
-					Niveau de détail élevé
-				</combo_item>
-				<combo_item name="medium">
-					Niveau de détail moyen
-				</combo_item>
-				<combo_item name="low">
-					Niveau de détail faible
-				</combo_item>
-				<combo_item name="lowest">
-					Niveau de détail le plus faible
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				Vérification
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Impact sur la parcelle/région : équivalent à [EQUIV] prims
-			</text>
-			<text name="review_fee">
-				Votre compte sera débité de [FEE] L$ de frais de chargement.
-			</text>
-			<text name="review_confirmation">
-				En cliquant sur le bouton de chargement, vous confirmez que vous disposez des droits appropriés sur le contenu du modèle.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Chargement terminé
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Votre modèle a été chargé.
-		</text>
-		<text name="inventory_text">
-			Vous le trouverez dans le dossier Objets de votre inventaire.
-		</text>
-		<text name="charged_fee">
-			Votre compte a été débité de [FEE] L$.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Préc." name="back"/>
-	<button label="Suiv. &gt;&gt;" name="next"/>
-	<button label="Calculer les poids et les frais &gt;&gt;" name="calculate"/>
-	<button label="Calcul en cours..." name="calculating"/>
-	<button label="Charger" name="upload" tool_tip="Charger dans le simulateur."/>
-	<button label="Annuler" name="cancel"/>
-	<button label="Fermer" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Inactif
-	</string>
-	<string name="status_parse_error">
-		Problème d&apos;analyse de fichier .dae ; reportez-vous au journal pour plus de détails.
-	</string>
-	<string name="status_reading_file">
-		Chargement...
-	</string>
-	<string name="status_generating_meshes">
-		Génération des maillages...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Erreur : valeur de sommet supérieure à 65534. Opération abandonnée.
-	</string>
-	<string name="bad_element">
-		Erreur : élément non valide
-	</string>
-	<string name="high">
-		Élevé
-	</string>
-	<string name="medium">
-		Moyen
-	</string>
-	<string name="low">
-		Faible
-	</string>
-	<string name="lowest">
-		Le plus faible
-	</string>
-	<string name="mesh_status_good">
-		Bon à publier !
-	</string>
-	<string name="mesh_status_na">
-		N/A
-	</string>
-	<string name="mesh_status_none">
-		Aucun
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Un nombre différent de faces d&apos;application de texture est associé aux niveaux de détail.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Un nombre différent d&apos;instances de maillage est associé aux niveaux de détail.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		Trop de sommets pour le niveau de détail.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Niveau de détail requis manquant.
-	</string>
-	<string name="layer_all">
-		Tout
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 853af2afdf..853af2afdf 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
index f4db3201a8..f4db3201a8 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml
index 53ff58e307..53ff58e307 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/fr/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml
index d514d08081..d514d08081 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
deleted file mode 100644
index 8bbd34baae..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
-	<check_box label="Traduction du chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml
index fe4b5f9bd6..fe4b5f9bd6 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_notification.xml
+++ b/indra/newview/skins/default/xui/fr/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
index e040e948f5..e040e948f5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_object_weights.xml b/indra/newview/skins/default/xui/fr/floater_object_weights.xml
index 2667188308..2667188308 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/fr/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 4e046ff3f3..4e046ff3f3 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml
index 72018f5de5..72018f5de5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
index 089d710f17..089d710f17 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..7c9109c011
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personnages de recherche de chemin">
+	<floater.string name="messaging_get_inprogress">
+		Requête relative aux personnages de recherche de chemin en cours...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erreur lors de la requête relative aux personnages de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Aucun personnage de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personnages sélectionnés sur [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Chargement]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Inconnu]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[Groupe]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nom" name="name"/>
+			<scroll_list.columns label="Description" name="description"/>
+			<scroll_list.columns label="Propriétaire" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitude" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personnages :
+		</text>
+		<button label="Actualiser" name="refresh_objects_list"/>
+		<button label="Tout sélectionner" name="select_all_objects"/>
+		<button label="Ne rien sélectionner" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Actions sur les personnages sélectionnés :
+		</text>
+		<check_box label="Afficher la balise" name="show_beacon"/>
+		<check_box label="Afficher la capsule physique" name="show_physics_capsule"/>
+		<button label="Prendre" name="take_objects"/>
+		<button label="Prendre une copie" name="take_copy_objects"/>
+		<button label="M&apos;y téléporter" name="teleport_me_to_object" tool_tip="Activé uniquement lorsqu&apos;un personnage est sélectionné."/>
+		<button label="Renvoyer" name="return_objects"/>
+		<button label="Supprimer" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..02d969dc08
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Vue/Test de recherche de chemin">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Implémentation de la bibliothèque de recherche de chemin introuvable
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		En attente de fin de chargement de la région.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Vérification de l&apos;état du maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Téléchargement du maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Maillage de navigation modifié sur le serveur. Téléchargement du plus récent.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Le maillage de navigation le plus récent a été téléchargé.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Impossible de télécharger le maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Des modifications sont en attente concernant le maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Maillage de navigation en cours de création.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Des modifications sont en attente pour certaines régions de maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Certaines régions de maillage de navigation sont en cours de création.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Des modifications sont en attente pour certaines régions de maillage de navigation et d&apos;autres sont en cours de création.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Maillage de navigation à jour.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Implémentation de la bibliothèque de recherche de chemin introuvable
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Choisissez un point de départ et un point d&apos;arrivée.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Choisissez un point de départ.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Choisissez un point d&apos;arrivée.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Le chemin s&apos;affiche en orange.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Impossible de trouver un chemin entre les points choisis.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Erreur lors de la génération du chemin.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Vue" name="view_panel">
+			<text name="show_label">
+				Afficher :
+			</text>
+			<check_box label="Monde" name="show_world"/>
+			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
+			<check_box label="Maillage de navigation" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Où marcher est possible :
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Ne pas afficher" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Type de personnage A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Type de personnage B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Type de personnage C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Type de personnage D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Marche possible" name="show_walkables"/>
+			<check_box label="Volumes de matériau" name="show_material_volumes"/>
+			<check_box label="Obstacles statiques" name="show_static_obstacles"/>
+			<check_box label="Volumes d&apos;exclusion" name="show_exclusion_volumes"/>
+			<check_box label="Plan de l&apos;eau" name="show_water_plane"/>
+			<check_box label="Mode rayons X" name="show_xray"/>
+		</panel>
+		<panel label="Chemin test" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl-clic : sélection point de départ
+			</text>
+			<text name="shift_click_label">
+				Maj-clic : sélection point d&apos;arrivée
+			</text>
+			<text name="character_width_label">
+				Largeur du personnage
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Type de personnage
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Aucun" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Effacer chemin" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..894ec6dd9c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Groupes de liens de recherche de chemin">
+	<floater.string name="messaging_get_inprogress">
+		Requête relative aux groupes de liens de recherche de chemin en cours...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erreur lors de la requête relative aux groupes de liens de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modification des groupes de liens de recherche de chemin sélectionnés...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Erreur lors de la modification des groupes de liens de recherche de chemin sélectionnés.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Aucun groupe de liens de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] groupes de liens sélectionnés sur [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Chargement]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Inconnu]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[Groupe]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Oui
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		Non
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Inconnu
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Marche possible
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Obstacle statique
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Obstacle mobile
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volume de matériau
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volume d&apos;exclusion
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Fantôme mobile
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[Non modifiable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[Restriction]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[Concave]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[Restriction,Concave]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Choisir un usage de groupe de liens...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtrer par usage..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Marche possible" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Obstacle statique" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Obstacle mobile" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volume de matériau" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volume d&apos;exclusion" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Fantôme mobile" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Appliquer" name="apply_filters"/>
+		<button label="Effacer" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nom (prim racine)" name="name"/>
+			<scroll_list.columns label="Description (prim racine)" name="description"/>
+			<scroll_list.columns label="Propriétaire" name="owner"/>
+			<scroll_list.columns label="Scripté" name="scripted"/>
+			<scroll_list.columns label="Impact" name="land_impact"/>
+			<scroll_list.columns label="Distance" name="dist_from_you"/>
+			<scroll_list.columns label="Usage du groupe de liens" name="linkset_use"/>
+			<scroll_list.columns label="% A" name="a_percent"/>
+			<scroll_list.columns label="% B" name="b_percent"/>
+			<scroll_list.columns label="% C" name="c_percent"/>
+			<scroll_list.columns label="% D" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Groupes de liens :
+		</text>
+		<button label="Actualiser" name="refresh_objects_list"/>
+		<button label="Tout sélectionner" name="select_all_objects"/>
+		<button label="Ne rien sélectionner" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Afficher la balise" name="show_beacon"/>
+		<button label="Prendre" name="take_objects"/>
+		<button label="Prendre une copie" name="take_copy_objects"/>
+		<button label="M&apos;y téléporter" name="teleport_me_to_object"/>
+		<button label="Renvoyer" name="return_objects"/>
+		<button label="Supprimer" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Marche possible :
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Marche possible pour les personnages de type A. Exemple de type de personnage : humanoïde."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Marche possible pour les personnages de type B. Exemple de type de personnage : créature."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Marche possible pour les personnages de type C. Exemple de type de personnage : mécanique."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Marche possible pour les personnages de type D. Exemple de type de personnage : autre."/>
+		<button label="Appliquer les changements" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoïde)
+		</text>
+		<text name="suggested_use_b_label">
+			(Créature)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mécanique)
+		</text>
+		<text name="suggested_use_d_label">
+			(Autre)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 397436876d..397436876d 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 966fa3b8a6..966fa3b8a6 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_people.xml b/indra/newview/skins/default/xui/fr/floater_people.xml
index 58701c06b2..58701c06b2 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_people.xml
+++ b/indra/newview/skins/default/xui/fr/floater_people.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
index 36bec80561..36bec80561 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_picks.xml b/indra/newview/skins/default/xui/fr/floater_picks.xml
index f058ff668b..f058ff668b 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_picks.xml
+++ b/indra/newview/skins/default/xui/fr/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_places.xml b/indra/newview/skins/default/xui/fr/floater_places.xml
index 9e649aca47..9e649aca47 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_places.xml
+++ b/indra/newview/skins/default/xui/fr/floater_places.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml
index a22c7512e5..a22c7512e5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/fr/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml
deleted file mode 100644
index e65dfb09b4..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_postcard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ENVOYER LA PHOTO PAR E-MAIL">
-	<text name="to_label">
-		E-mail du destinataire :
-	</text>
-	<text name="from_label">
-		Votre e-mail :
-	</text>
-	<text name="name_label">
-		Votre nom :
-	</text>
-	<text name="subject_label">
-		Objet :
-	</text>
-	<line_editor label="Saisir ici votre objet" name="subject_form"/>
-	<text name="msg_label">
-		Message :
-	</text>
-	<text_editor name="msg_form">
-		Saisir ici votre message
-	</text_editor>
-	<text name="fine_print">
-		Si le destinataire s&apos;inscrit sur [SECOND_LIFE], vous recevrez un bonus.
-	</text>
-	<button label="Annuler" name="cancel_btn"/>
-	<button label="Envoyer" name="send_btn"/>
-	<string name="default_subject">
-		Carte postale de [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Ouvrez-moi !
-	</string>
-	<string name="upload_message">
-		Envoi en cours...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index 0f9fb1334b..0f9fb1334b 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
index 020bdf928b..020bdf928b 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index f2cb1d5e70..6488089c06 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		Description :
 	</text>
-	<button label="Exécuter dans Second Life" label_selected="Arrêter" name="Inworld" tool_tip="Lire cette animation de façon à ce que les autres la voient."/>
+	<button label="Exécuter dans SL" label_selected="Arrêter" name="Inworld" tool_tip="Lire cette animation de façon à ce que les autres la voient dans Second Life."/>
 	<button label="Exécuter localement" label_selected="Arrêter" name="Locally" tool_tip="Lire cette animation de façon à ce que vous soyez la seule personne à la voir."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index 6287f10f3e..6287f10f3e 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 5646ad45eb..5646ad45eb 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index a215f92df1..a215f92df1 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index 9fc9d14026..9fc9d14026 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
index a6e598dd2b..a6e598dd2b 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml
index d4d8652434..d4d8652434 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/fr/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml
index 1747155b60..1747155b60 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
index c2663174d4..c2663174d4 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 78c35dc303..78c35dc303 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
index e257aac6c4..e257aac6c4 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_script_limits.xml b/indra/newview/skins/default/xui/fr/floater_script_limits.xml
index cc3aaa6653..cc3aaa6653 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
index 7b6bc73677..7b6bc73677 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
index b9a8165457..b9a8165457 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml
index 09b903f41c..09b903f41c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
index 32800182ea..32800182ea 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_search.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml
index 664bc0a723..664bc0a723 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/fr/floater_select_key.xml
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 c5fb0ea0d4..c5fb0ea0d4 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index 995837e9ee..995837e9ee 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 9244051edc..9244051edc 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
index 080ade9dd4..080ade9dd4 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index 6f0fb3421f..6f0fb3421f 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml
new file mode 100755
index 0000000000..635db52ffa
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Paramètres du vérificateur orthographique">
+	<check_box label="Activer le vérificateur orthographique" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Diction. principal :
+	</text>
+	<text label="Journaux :" name="spellcheck_additional">
+		Dictionnaires supplémentaires :
+	</text>
+	<text name="spellcheck_available">
+		Disponibles
+	</text>
+	<text name="spellcheck_active">
+		Actifs
+	</text>
+	<button label="Supprimer" name="spellcheck_remove_btn"/>
+	<button label="Importer..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..c8c76c672d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Importation d&apos;un dictionnaire">
+	<button label="Parcourir" label_selected="Parcourir" name="dictionary_path_browse"/>
+	<button label="Importer" name="ok_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
index 2ce2e6dcd5..d6bd187956 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris par s" name="ktrissec"/>
 					<stat_bar label="Objets totaux" name="objs"/>
 					<stat_bar label="Nouveaux objets" name="newobjs"/>
+					<stat_bar label="Taux de réussite du cache des objets" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Taux de réussite du cache" name="texture_cache_hits"/>
+					<stat_bar label="Latence de lecture du cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Nombre" name="numimagesstat"/>
 					<stat_bar label="Nombre brut" name="numrawimagesstat"/>
 					<stat_bar label="Mém GL" name="gltexmemstat"/>
@@ -50,14 +53,20 @@
 				<stat_bar label="Objets" name="simobjects"/>
 				<stat_bar label="Objets actifs" name="simactiveobjects"/>
 				<stat_bar label="Scripts actifs" name="simactivescripts"/>
+				<stat_bar label="Scripts exécutés" name="simpctscriptsrun"/>
 				<stat_bar label="Événements de scripts" name="simscripteps"/>
+				<stat_view label="Recherche de chemin" name="simpathfinding">
+					<stat_bar label="Durée de l&apos;étape IA" name="simsimaistepmsec"/>
+					<stat_bar label="Étapes de silhouette ignorées" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personnages mis à jour" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Paquets en entrée" name="siminpps"/>
 				<stat_bar label="Paquets en sortie" name="simoutpps"/>
 				<stat_bar label="Téléchargements en attente" name="simpendingdownloads"/>
 				<stat_bar label="Chargements en attente" name="simpendinguploads"/>
 				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
 				<stat_view label="Temps (ms)" name="simperf">
-					<stat_bar label="Durée totale de l'image" name="simframemsec"/>
+					<stat_bar label="Durée totale de l&apos;image" name="simframemsec"/>
 					<stat_bar label="Durée nette" name="simnetmsec"/>
 					<stat_bar label="Durée sim (physique)" name="simsimphysicsmsec"/>
 					<stat_bar label="Durée sim (autre)" name="simsimothermsec"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_sys_well.xml b/indra/newview/skins/default/xui/fr/floater_sys_well.xml
index dbdd32974c..dbdd32974c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index c529ca2736..c529ca2736 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml
index b479d5f6d6..b479d5f6d6 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/fr/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml
index 702170ef52..702170ef52 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/fr/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 381bcceb00..eace67026c 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,24 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="CHOISIR : TEXTURE">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Cliquez pour sélectionner une image
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Choisir :
+	</floater.string>
 	<text name="Multiple">
 		Textures multiples
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventaire" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Taille : [DIMENSIONS]
 	</text>
 	<button label="Défaut" label_selected="Défaut" name="Default" width="60"/>
-	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
-	<check_box label="Afficher les dossiers" name="show_folders_check"/>
-	<search_editor label="Filtrer les textures" name="inventory search editor"/>
-	<check_box label="Appliquer maintenant" name="apply_immediate_check"/>
+	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Aperçu désactivé"/>
+	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
+	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
+	<button label="Ajouter" label_selected="Ajouter" name="l_add_btn"/>
+	<button label="Supprimer" label_selected="Supprimer" name="l_rem_btn"/>
+	<button label="Charger" label_selected="Charger" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nom" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Choisir :
-	</string>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..caae15ea17
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Outil de débogage de la récupération des textures">
+	<text name="total_num_fetched_label">
+		1, nombre total de textures récupérées : [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, nombre total de demandes de récupération : [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, nombre total de présences dans le cache : [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, nombre total de textures visibles : [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, nombre total de demandes de récupération de textures visibles : [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, nombre total de données récupérées : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, nombre total de données visibles : [SIZE1] Ko, données décodées : [SIZE2] Ko
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, nombre total de données rendues : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_cache_read_label">
+		9, durée totale des lectures du cache : [TIME] secondes
+	</text>
+	<text name="total_time_cache_write_label">
+		10, durée totale des écritures du cache : [TIME] secondes
+	</text>
+	<text name="total_time_decode_label">
+		11, durée totale des décodages : [TIME] secondes
+	</text>
+	<text name="total_time_gl_label">
+		12, durée totale de la création de textures GL : [TIME] secondes
+	</text>
+	<text name="total_time_http_label">
+		13, durée totale de la récupération HTTP : [TIME] secondes
+	</text>
+	<text name="total_time_fetch_label">
+		14, durée totale de la récupération intégrale : [TIME] secondes
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, nouvelle récupération des données visibles du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, nouvelle récupération de toutes les textures du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, nouvelle récupération des données visibles de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, nouvelle récupération de toutes les textures de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<spinner label="19, taux de texels/pixels :" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, source des textures :
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Cache + HTTP" name="0"/>
+		<radio_item label="HTTP uniquement" name="1"/>
+	</radio_group>
+	<button label="Démarrer" name="start_btn"/>
+	<button label="Réinitialiser" name="clear_btn"/>
+	<button label="Fermer" name="close_btn"/>
+	<button label="Lecture du cache" name="cacheread_btn"/>
+	<button label="Écriture du cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Décoder" name="decode_btn"/>
+	<button label="Texture GL" name="gl_btn"/>
+	<button label="Récupérer à nouveau les données visibles du cache" name="refetchviscache_btn"/>
+	<button label="Récupérer cache" name="refetchallcache_btn"/>
+	<button label="Récupérer à nouveau les données visibles de la requête HTTP" name="refetchvishttp_btn"/>
+	<button label="Récupérer HTTP" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index e21c6f4c08..421e14d51b 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -99,7 +99,7 @@
 	<button label="" label_selected="" name="ToolRing" tool_tip="Anneau"/>
 	<button label="" label_selected="" name="ToolTree" tool_tip="Arbre"/>
 	<button label="" label_selected="" name="ToolGrass" tool_tip="Herbe"/>
-	<check_box label="Maintenir l&apos;outil sélectionné" name="checkbox sticky"/>
+	<check_box label="Maintenir l&apos;outil sélect." name="checkbox sticky"/>
 	<check_box label="Copier la sélection" name="checkbox copy selection"/>
 	<check_box initial_value="true" label="Centrer" name="checkbox copy centers"/>
 	<check_box label="Pivoter" name="checkbox copy rotates"/>
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				Vous ne pouvez pas modifier ces objets
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Impossible de modifier cet objet au-delà de la frontière d&apos;une région
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Impossible de modifier ces objets au-delà de la frontière d&apos;une région
+			</panel.string>
 			<panel.string name="text modify warning">
 				Sélectionnez l&apos;objet en entier
 			</panel.string>
@@ -197,12 +203,12 @@
 				<combo_box.item label="Zoomer" name="Zoom"/>
 			</combo_box>
 			<check_box label="À vendre :" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copie" name="Copy"/>
 				<combo_box.item label="Contenus" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Prix : L$" name="Edit Cost"/>
 			<check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -238,6 +244,11 @@
 					F :
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Attributs de recherche de chemin :
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objet" name="Object">
 			<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
@@ -452,16 +463,11 @@
 				<combo_box.item label="Ventouses" name="suction"/>
 				<combo_box.item label="Tissage" name="weave"/>
 			</combo_box>
-			<check_box initial_value="false" label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/>
-			<text name="rpt">
-				Répétitions / Face
-			</text>
 			<spinner label="Horizontal (U)" name="TexScaleU"/>
 			<check_box label="Inverser" name="checkbox flip s"/>
 			<spinner label="Vertical (V)" name="TexScaleV"/>
 			<check_box label="Inverser" name="checkbox flip t"/>
 			<spinner label="Rotation˚" name="TexRot"/>
-			<spinner label="Répétitions / Mètre" name="rptctrl"/>
 			<button label="Appliquer" label_selected="Appliquer" name="button apply"/>
 			<text name="tex offset">
 				Décalage de la texture
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index 42352e7c1e..eb084d9184 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="Objets les plus utilisés">
+<floater name="top_objects" title="Objets les plus consommateurs">
 	<floater.string name="top_scripts_title">
-		Scripts principaux
+		Scripts les plus consommateurs
 	</floater.string>
 	<floater.string name="top_scripts_text">
 		[COUNT] scripts prenant un total de [TIME] ms
 	</floater.string>
 	<floater.string name="scripts_score_label">
-		Heure
-	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Heure Mono
+		Temps
 	</floater.string>
 	<floater.string name="top_colliders_title">
 		Collisions les plus consommatrices
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nom" name="name"/>
 		<scroll_list.columns label="Propriétaire" name="owner"/>
 		<scroll_list.columns label="Lieu" name="location"/>
-		<scroll_list.columns label="Heure" name="time"/>
-		<scroll_list.columns label="Heure Mono" name="mono_time"/>
+		<scroll_list.columns label="Parcelle" name="parcel"/>
+		<scroll_list.columns label="Temps" name="time"/>
 		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="Mémoire (Ko)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID de l&apos;objet :
@@ -43,11 +41,15 @@
 	<text name="obj_name_text">
 		Nom :
 	</text>
-	<button label="Filtre" name="filter_object_btn"/>
+	<button label="Filtrer" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		Propriétaire :
 	</text>
-	<button label="Filtre" name="filter_owner_btn"/>
+	<button label="Filtrer" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parcelle :
+	</text>
+	<button label="Filtrer" name="filter_parcel_btn"/>
 	<button label="Rafraîchir" name="refresh_btn"/>
 	<button label="Renvoyer" name="return_selected_btn"/>
 	<button label="Tout renvoyer" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
index 6d58cf77ca..6d58cf77ca 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_toybox.xml b/indra/newview/skins/default/xui/fr/floater_toybox.xml
index f99d3d30b5..f99d3d30b5 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/fr/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml
index c7582f110f..c7582f110f 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index 4b2be14569..4b2be14569 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..f4f452eea7
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL">
+	<slider label="Chat vocal" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
index fc4de4a5a6..fc4de4a5a6 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index 671fb5c14d..f9a76d127e 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX">
+<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
 	<string name="no_voice_effect">
 		(Aucun effet de voix)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
new file mode 100644
index 0000000000..bf91a5bb79
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE LA VOIX">
+	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_web_content.xml b/indra/newview/skins/default/xui/fr/floater_web_content.xml
index 65dfafe760..65dfafe760 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/fr/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
index 99e4954555..99e4954555 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml
index cbda4390d8..11c2e439bd 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/fr/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Définir la taille de la fenêtre :
 	</text>
 	<combo_box name="window_size_combo" tool_tip="largeur x hauteur">
-		<combo_box.item label="1 000 x 700 (défaut)" name="item0"/>
-		<combo_box.item label="1 024 x 768" name="item1"/>
-		<combo_box.item label="1 280 x 720 (720 p)" name="item2"/>
-		<combo_box.item label="1 920 x 1 080 (1 080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (par défaut)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Choisir" name="set_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index f5dab91924..f5dab91924 100644..100755
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml
index cccb45b973..cccb45b973 100644..100755
--- a/indra/newview/skins/default/xui/fr/fonts.xml
+++ b/indra/newview/skins/default/xui/fr/fonts.xml
diff --git a/indra/newview/skins/default/xui/fr/inspect_avatar.xml b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
index 553646f8e9..553646f8e9 100644..100755
--- a/indra/newview/skins/default/xui/fr/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/fr/inspect_group.xml b/indra/newview/skins/default/xui/fr/inspect_group.xml
index e8c528c1ac..e8c528c1ac 100644..100755
--- a/indra/newview/skins/default/xui/fr/inspect_group.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/fr/inspect_object.xml b/indra/newview/skins/default/xui/fr/inspect_object.xml
index b66af7a2bf..b66af7a2bf 100644..100755
--- a/indra/newview/skins/default/xui/fr/inspect_object.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
index 6d7cfadc04..6d7cfadc04 100644..100755
--- a/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/fr/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/fr/language_settings.xml b/indra/newview/skins/default/xui/fr/language_settings.xml
index fdac9d65a7..fdac9d65a7 100644..100755
--- a/indra/newview/skins/default/xui/fr/language_settings.xml
+++ b/indra/newview/skins/default/xui/fr/language_settings.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml
index 7e7993175e..7e7993175e 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
index f48513eb2b..0450be28e0 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Figer" name="Freeze..."/>
 	<menu_item_call label="Expulser" name="Eject..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<menu_item_call label="Payer" name="Pay..."/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
index 6af2064e44..f2e7928c24 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Mes groupes" name="Groups..."/>
 	<menu_item_call label="Mon profil" name="Profile..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Lâcher" name="Drop"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml
index 3bac25c79b..3bac25c79b 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
index 08d1a20361..1f5c1724f8 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Figer" name="Freeze..."/>
 	<menu_item_call label="Expulser" name="Eject..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<menu_item_call label="Payer" name="Pay..."/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
index 6310a2177a..4815ad0676 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Mes groupes" name="Groups..."/>
 	<menu_item_call label="Mon profil" name="Profile..."/>
 	<menu_item_call label="Déboguer les textures" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
deleted file mode 100644
index d0d245b286..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Bouton Parler" name="EnableVoiceChat"/>
-	<menu_item_check label="Bouton Geste" name="ShowGestureButton"/>
-	<menu_item_check label="Bouton Bouger" name="ShowMoveButton"/>
-	<menu_item_check label="Bouton Affichage" name="ShowCameraButton"/>
-	<menu_item_check label="Bouton Photo" name="ShowSnapshotButton"/>
-	<menu_item_check label="Bouton Construire" name="ShowBuildButton"/>
-	<menu_item_check label="Bouton Rechercher" name="ShowSearchButton"/>
-	<menu_item_check label="Bouton Carte" name="ShowWorldMapButton"/>
-	<menu_item_check label="Bouton Mini-carte" name="ShowMiniMapButton"/>
-	<menu_item_call label="Couper" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copier" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Coller" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Supprimer" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Tout sélectionner" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml
index a4ead48b6b..a4ead48b6b 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml
index 4b6907fcc6..4b6907fcc6 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml
index 03cc569704..03cc569704 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
index 8276d57025..fea0486d8a 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/>
-	<menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
new file mode 100644
index 0000000000..09109f4555
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
+	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
+	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
+	<menu_item_call label="Fermer la sélection" name="close_selected_conversations"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Supprimer ces amis" name="remove_friends"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="block_unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+	<menu_item_call label="Profil du groupe" name="group_profile"/>
+	<menu_item_call label="Activer le groupe" name="activate_group"/>
+	<menu_item_call label="Quitter le groupe" name="leave_group"/>
+	<context_menu label="Options du modérateur" name="Moderator Options">
+		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
+		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/>
+		<menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..4e7e84199d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Appel..." name="Call"/>
+	<menu_item_call label="Ouvrir l&apos;historique du chat..." name="Chat history"/>
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Téléporter" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="Invite"/>
+	<menu_item_call label="Carte" name="Map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..c515a8e8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par date" name="sort_by_date"/>
+	<menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/>
+	<menu_item_call label="Afficher l&apos;historique du Chat près de moi" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_edit.xml b/indra/newview/skins/default/xui/fr/menu_edit.xml
index 56669f31e1..56669f31e1 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_edit.xml
+++ b/indra/newview/skins/default/xui/fr/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_favorites.xml b/indra/newview/skins/default/xui/fr/menu_favorites.xml
index 5f1545fde7..5f1545fde7 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/fr/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
index 062dd0f005..062dd0f005 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_group_plus.xml b/indra/newview/skins/default/xui/fr/menu_group_plus.xml
index ad76f11d79..ad76f11d79 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/fr/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
index 09c9f5084a..09c9f5084a 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
new file mode 100644
index 0000000000..1ec5910c8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Historique du chat..." name="chat_history"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/>
+	<menu_item_check label="Ignorer le texte" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..03a091d1cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vue compacte" name="compact_view"/>
+	<menu_item_check label="Vue développée" name="expanded_view"/>
+	<menu_item_check label="Afficher l’heure" name="IMShowTime"/>
+	<menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml b/indra/newview/skins/default/xui/fr/menu_im_well_button.xml
deleted file mode 100644
index 8ef1529e6b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Tout fermer" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml
index 4d9a103058..4d9a103058 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
index 59f97d8b48..59f97d8b48 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
index ecc8cee413..ecc8cee413 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/fr/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
index 53f22bb44a..53f22bb44a 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
index f3b974aba5..f3b974aba5 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
index ac70df472d..ac70df472d 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml
index a9b2883cca..a9b2883cca 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 59dcff9075..627d3068c3 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="Supprimer le dossier système" name="Delete System Folder"/>
 	<menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
 	<menu_item_call label="Jouer" name="Sound Play"/>
+	<menu_item_call label="Copier la SLurl" name="url_copy"/>
 	<menu_item_call label="À propos du repère" name="About Landmark"/>
 	<menu_item_call label="Jouer dans Second Life" name="Animation Play"/>
 	<menu_item_call label="Jouer localement" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
index 1076af44d9..1076af44d9 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
index 364872c875..364872c875 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_land.xml b/indra/newview/skins/default/xui/fr/menu_land.xml
index b84daee3ae..7beaf00c58 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_land.xml
+++ b/indra/newview/skins/default/xui/fr/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Acheter un pass" name="Land Buy Pass"/>
 	<menu_item_call label="Construire" name="Create"/>
 	<menu_item_call label="Modifier le terrain" name="Edit Terrain"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_landmark.xml b/indra/newview/skins/default/xui/fr/menu_landmark.xml
index 73eaa4af7e..73eaa4af7e 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/fr/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index dc6b2793ca..7b1e106474 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Afficher les conditions d&apos;utilisation" name="TOS"/>
 		<menu_item_call label="Afficher le message critique" name="Critical"/>
 		<menu_item_call label="Test de débogage de la fenêtre flottante du contenu Web" name="Web Content Floater Debug Test"/>
-		<menu label="Définir le niveau de connexion" name="Set Logging Level"/>
+		<menu label="Définir le niveau de connexion" name="Set Logging Level">
+			<menu_item_check label="Débogage" name="Debug"/>
+			<menu_item_check label="Infos" name="Info"/>
+			<menu_item_check label="Avertissement" name="Warning"/>
+			<menu_item_check label="Erreur" name="Error"/>
+			<menu_item_check label="Aucun" name="None"/>
+		</menu>
 		<menu_item_check label="Afficher le sélecteur de grille" name="Show Grid Picker"/>
 		<menu_item_call label="Afficher la console des notifications" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
index 1941ad2cbf..1941ad2cbf 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
index b9d0a70383..b9d0a70383 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_mode_change.xml b/indra/newview/skins/default/xui/fr/menu_mode_change.xml
deleted file mode 100644
index 982a331c5b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Basique" name="BasicMode"/>
-	<menu_item_check label="Avancé" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
index af6bfcd028..af6bfcd028 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/fr/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_mute_particle.xml b/indra/newview/skins/default/xui/fr/menu_mute_particle.xml
new file mode 100644
index 0000000000..5f5e4c8b08
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_navbar.xml b/indra/newview/skins/default/xui/fr/menu_navbar.xml
index 08d810b653..08d810b653 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/fr/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
index 99e22aeff7..99e22aeff7 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
index 323bfdbf16..323bfdbf16 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/fr/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index c6db48a31c..d7b69e495a 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -10,6 +10,8 @@
 	<menu_item_call label="Me lever" name="Object Stand Up"/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
+	<menu_item_call label="Voir parmi les groupes de liens" name="show_in_linksets"/>
+	<menu_item_call label="Voir parmi les personnages" name="show_in_characters"/>
 	<context_menu label="Porter" name="Put On">
 		<menu_item_call label="Porter" name="Wear"/>
 		<menu_item_call label="Ajouter" name="Add"/>
@@ -26,4 +28,5 @@
 	<menu_item_call label="Payer" name="Pay..."/>
 	<menu_item_call label="Acheter" name="Buy..."/>
 	<menu_item_call label="Supprimer" name="Delete"/>
+	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 69f8e88a0d..7c94930160 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
 	<menu_item_call label="Ignorer..." name="Block"/>
+	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
+	<menu_item_call label="Me téléporter à l’emplacement de l&apos;objet" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index b5181f4f82..21b19eded6 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Développer tous les dossiers" name="expand"/>
+	<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
index 2a7f618e07..2a7f618e07 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_list.xml b/indra/newview/skins/default/xui/fr/menu_participant_list.xml
index f91a30f6bb..f91a30f6bb 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/fr/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
new file mode 100644
index 0000000000..1811082c84
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/>
+	<menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/>
+	<menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/>
+	<menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Préférences pour le chat..." name="chat_preferences"/>
+	<menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/>
+	<menu_item_check label="Journal des conversations..." name="Conversation"/>
+	<menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/>
+	<menu_item_check label="Paramètres de traduction" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..47589572c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Ne plus ignorer" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..79880dd16d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
+	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..13f1575090
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier par type" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..cc81172462
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par statut" name="sort_status"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
+	<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
index a6170a6c16..a6170a6c16 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
index eb51b4cf7e..8e32f065fa 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Afficher les infos" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Appel" name="Call"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Quitter" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..79ede5e22d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
index 34f949cf2c..34f949cf2c 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 26bd3978a9..6f7d02ef74 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Devenir amis" name="Add Friend"/>
-	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Carte" name="Map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Voir le profil" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
+	<menu_item_call label="Appel" name="voice_call"/>
+	<menu_item_call label="Afficher l&apos;historique du chat..." name="chat_history"/>
+	<menu_item_call label="Devenir amis" name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
+	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
+	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
+	<menu_item_call label="Carte" name="map"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
index 8400ec0a14..37abf831c2 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Devenir amis" name="Add Friends"/>
-	<menu_item_call label="Supprimer des amis" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Appeler" name="Call"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_call label="Proposer une téléportation" name="teleport"/>
+	<menu_item_call label="Devenir amis" name="add_friends"/>
+	<menu_item_call label="Supprimer des amis" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Appeler" name="call"/>
+	<menu_item_call label="Partager" name="share"/>
+	<menu_item_call label="Payer" name="pay"/>
+	<menu_item_call label="Téléporter" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..086002dce5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Trier par distance" name="sort_distance"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+	<menu_item_check label="Afficher la carte" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
index 8bb466b8d6..8bb466b8d6 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a7d698ab7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
+	<menu_item_check label="Trier par nom" name="sort_name"/>
+	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
index 93b90ae61c..93b90ae61c 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_picks.xml b/indra/newview/skins/default/xui/fr/menu_picks.xml
index 7d7174d43c..7d7174d43c 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_picks.xml
+++ b/indra/newview/skins/default/xui/fr/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
index b6cde6d6e2..b6cde6d6e2 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/fr/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_place.xml b/indra/newview/skins/default/xui/fr/menu_place.xml
index 6b0f4db752..6b0f4db752 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_place.xml
+++ b/indra/newview/skins/default/xui/fr/menu_place.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
index 92f9e7719d..92f9e7719d 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/fr/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
index 3fdf3bf3c4..3fdf3bf3c4 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/fr/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
index b48f6ea693..b48f6ea693 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/fr/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
index ddf898b791..ddf898b791 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/fr/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml
index f78db411b3..f78db411b3 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/fr/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml
index 46efa30bd6..46efa30bd6 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/fr/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml
index ddfa5c0849..ddfa5c0849 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
index 3dea662cc2..3dea662cc2 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
index fb4582dbce..fb4582dbce 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
index 369680985d..369680985d 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/fr/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
index b6f429aec9..c31b0c8556 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(inconnu)" name="Suggestion 1"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 2"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 3"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 4"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 5"/>
+	<menu_item_call label="Ajouter au dictionnaire" name="Add to Dictionary"/>
+	<menu_item_call label="Ajouter aux éléments à ignorer" name="Add to Ignore"/>
 	<menu_item_call label="Couper" name="Cut"/>
 	<menu_item_call label="Copier" name="Copy"/>
 	<menu_item_call label="Coller" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_toolbars.xml b/indra/newview/skins/default/xui/fr/menu_toolbars.xml
index f74d206d56..f74d206d56 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/fr/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml
index dc68f40fe7..dc68f40fe7 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/fr/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index 5ed627fbc3..2c7443c6ca 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
+	<menu_item_call label="Voir le profil" name="show_agent"/>
+	<menu_item_call label="Envoyer IM..." name="send_im"/>
+	<menu_item_call label="Devenir amis..." name="add_friend"/>
+	<menu_item_call label="Supprimer cet ami..." name="remove_friend"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_group.xml b/indra/newview/skins/default/xui/fr/menu_url_group.xml
index de90c3ff7e..de90c3ff7e 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_http.xml b/indra/newview/skins/default/xui/fr/menu_url_http.xml
index 5e96352999..5e96352999 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
index 8ab88b4be7..8ab88b4be7 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_map.xml b/indra/newview/skins/default/xui/fr/menu_url_map.xml
index 67e6986f5d..67e6986f5d 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index f581c3ef9d..5d745ef5f8 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
+	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
+	<menu_item_call label="Ignorer…" name="block_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
index 07b0eeca49..07b0eeca49 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
index f4b7e212ca..f4b7e212ca 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
index e44943cf15..e44943cf15 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
index a5075a2740..a5075a2740 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 3c3d4f5f69..5d0026ace0 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -8,7 +8,7 @@
 		<menu_item_call label="Nouvelle fenêtre d&apos;inventaire" name="NewInventoryWindow"/>
 		<menu_item_call label="Endroits..." name="Places"/>
 		<menu_item_call label="Favoris..." name="Picks"/>
-		<menu_item_call label="Paramètres de la caméra..." name="Camera Controls"/>
+		<menu_item_call label="Contrôles de la caméra..." name="Camera Controls"/>
 		<menu label="Déplacement" name="Movement">
 			<menu_item_call label="M&apos;asseoir" name="Sit Down Here"/>
 			<menu_item_check label="Voler" name="Fly"/>
@@ -17,8 +17,8 @@
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Statut" name="Status">
-			<menu_item_call label="Absent" name="Set Away"/>
-			<menu_item_call label="Occupé" name="Set Busy"/>
+			<menu_item_check label="Absent" name="Away"/>
+			<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Boîte d&apos;envoi vendeur..." name="MerchantOutbox"/>
@@ -28,17 +28,25 @@
 		<menu_item_call label="Préférences..." name="Preferences"/>
 		<menu_item_call label="Boutons des barres d&apos;outils..." name="Toolbars"/>
 		<menu_item_call label="Masquer tous les contrôles" name="Hide UI"/>
+		<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversations..." name="Conversations"/>
+		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
-		<menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/>
-		<menu_item_check label="Effet de voix..." name="ShowVoice"/>
+		<menu_item_check label="Journal des conversations..." name="Conversation Log..."/>
+		<menu label="Effet de voix" name="VoiceMorphing">
+			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
+			<menu_item_check label="Aperçu..." name="Preview"/>
+			<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestes..." name="Gestures"/>
-		<menu_item_call label="Amis" name="My Friends"/>
-		<menu_item_call label="Groupes" name="My Groups"/>
-		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_check label="Amis" name="My Friends"/>
+		<menu_item_check label="Groupes" name="My Groups"/>
+		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_call label="Liste des ignorés" name="Block List"/>
+		<menu_item_check label="Ne pas déranger" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Monde" name="World">
 		<menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/>
@@ -107,13 +115,13 @@
 			<menu_item_call label="Inclure la partie suivante" name="Include Next Part"/>
 			<menu_item_call label="Inclure la partie précédente" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Groupes de liens..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Point central sur la sélection" name="Focus on Selection"/>
 		<menu_item_call label="Zoomer sur la sélection" name="Zoom to Selection"/>
 		<menu label="Objet" name="Object">
 			<menu_item_call label="Acheter" name="Menu Object Buy"/>
 			<menu_item_call label="Prendre" name="Menu Object Take"/>
 			<menu_item_call label="Prendre une copie" name="Take Copy"/>
-			<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Renvoi de l&apos;objet" name="Return Object back to Owner"/>
 		</menu>
@@ -124,6 +132,12 @@
 			<menu_item_call label="Définir les scripts sur Exécution" name="Set Scripts to Running"/>
 			<menu_item_call label="Définir les scripts sur Pas d&apos;exécution" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Recherche de chemin" name="Pathfinding">
+			<menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="Options" name="Options">
 			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
 			<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
@@ -152,6 +166,13 @@
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Aide rapide..." name="How To"/>
 		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guide de l&apos;utilisateur" name="User’s guide"/>
+		<menu_item_call label="Base de connaissances" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forums de la communauté" name="Community Forums"/>
+		<menu_item_call label="Portail d&apos;assistance" name="Support portal"/>
+		<menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
@@ -171,10 +192,9 @@
 		</menu>
 		<menu label="Surbrillance et visibilité" name="Highlighting and Visibility">
 			<menu_item_check label="Balise animée" name="Cheesy Beacon"/>
-			<menu_item_check label="Cacher les particules" name="Hide Particles"/>
+			<menu_item_check label="Masquer les particules" name="Hide Particles"/>
 			<menu_item_check label="Masquer la sélection" name="Hide Selected"/>
 			<menu_item_check label="Mettre la transparence en surbrillance" name="Highlight Transparent"/>
-			<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Afficher le réticule de la vue subjective" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Types de rendu" name="Rendering Types">
@@ -227,11 +247,10 @@
 			<menu_item_check label="Console de textures" name="Texture Console"/>
 			<menu_item_check label="Console de débogage" name="Debug Console"/>
 			<menu_item_call label="Console de notifications" name="Notifications"/>
-			<menu_item_check label="Console de tailles de textures" name="Texture Size"/>
-			<menu_item_check label="Console des catégories de textures" name="Texture Category"/>
 			<menu_item_check label="Chronos" name="Fast Timers"/>
 			<menu_item_check label="Mémoire" name="Memory"/>
 			<menu_item_check label="Statistiques de la scène" name="Scene Statistics"/>
+			<menu_item_call label="Console de débogage de la récupération des textures" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Infos de région vers la console de débogage" name="Region Info to Debug Console"/>
 			<menu_item_call label="Infos de groupe vers la console de débogage" name="Group Info to Debug Console"/>
 			<menu_item_call label="Infos de capacités vers la console de débogage" name="Capabilities Info to Debug Console"/>
@@ -266,6 +285,7 @@
 			<menu_item_check label="Taux de défilement aléatoire" name="Randomize Framerate"/>
 			<menu_item_check label="Cadre lent périodique" name="Periodic Slow Frame"/>
 			<menu_item_check label="Test cadre" name="Frame Test"/>
+			<menu_item_call label="Profil du cadre" name="Frame Profile"/>
 		</menu>
 		<menu label="Métadonnées de rendu" name="Render Metadata">
 			<menu_item_check label="Cadres" name="Bounding Boxes"/>
@@ -289,14 +309,21 @@
 			<menu_item_check label="Complexité du rendu" name="rendercomplexity"/>
 			<menu_item_check label="Octets d&apos;éléments attachés" name="attachment bytes"/>
 			<menu_item_check label="Sculpture" name="Sculpt"/>
+			<menu label="Densité des textures" name="Texture Density">
+				<menu_item_check label="Aucune" name="None"/>
+				<menu_item_check label="Actuelle" name="Current"/>
+				<menu_item_check label="Souhaitée" name="Desired"/>
+				<menu_item_check label="Complète" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendu" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Tangente" name="Tangent Basis"/>
 			<menu_item_call label="Base des infos de la texture sélectionnée" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Infos sur les matériaux sélectionnés" name="Selected Material Info"/>
 			<menu_item_check label="Filaire" name="Wireframe"/>
 			<menu_item_check label="Occlusion objet-objet" name="Object-Object Occlusion"/>
-			<menu_item_check label="Éclairage et ombres" name="Lighting and Shadows"/>
+			<menu_item_check label="Modèle d&apos;éclairage avancé" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombres du soleil/de la lune/des projecteurs" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO et lissage des ombres" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Débogage GL" name="Debug GL"/>
@@ -306,8 +333,6 @@
 			<menu_item_check label="Textures d&apos;animation" name="Animation Textures"/>
 			<menu_item_check label="Désactiver les textures" name="Disable Textures"/>
 			<menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/>
-			<menu_item_check label="Audit Textures" name="Audit Textures"/>
-			<menu_item_check label="Atlas des textures (expérimental)" name="Texture Atlas"/>
 			<menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/>
 			<menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/>
 			<menu_item_check label="Objets en surbrillance avec le pointeur" name="Hover Glow Objects"/>
@@ -343,7 +368,6 @@
 			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
 			<menu_item_call label="Imprimer les infos sur l&apos;objet sélectionné" name="Print Selected Object Info"/>
 			<menu_item_call label="Imprimer les infos sur l&apos;avatar" name="Print Agent Info"/>
-			<menu_item_call label="Statistiques de mémoire" name="Memory Stats"/>
 			<menu_item_check label="Console de débogage de région" name="Region Debug Console"/>
 			<menu_item_check label="Débogage SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Débogage clics" name="Debug Clicks"/>
@@ -373,12 +397,16 @@
 				<menu_item_call label="Basculer la géométrie des personnages" name="Toggle Character Geometry"/>
 				<menu_item_call label="Test homme" name="Test Male"/>
 				<menu_item_call label="Test femme" name="Test Female"/>
-				<menu_item_call label="Activer/désactiver PG" name="Toggle PG"/>
 				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Vitesse d&apos;animation" name="Animation Speed">
+				<menu_item_call label="Toutes les animations 10 % plus rapides" name="All Animations 10 Faster"/>
+				<menu_item_call label="Toutes les animations 10 % plus lentes" name="All Animations 10 Slower"/>
+				<menu_item_call label="Réinitialiser la vitesse de toutes les animations" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
 			<menu_item_check label="Infos sur l&apos;animation" name="Animation Info"/>
-			<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
 			<menu_item_check label="Afficher la direction du regard" name="Show Look At"/>
 			<menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/>
 			<menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
index 187cb4bcd2..187cb4bcd2 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
index c3d9d908b0..c3d9d908b0 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
index 4d88445506..4d88445506 100644..100755
--- a/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/fr/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
index 322887fb76..322887fb76 100644..100755
--- a/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types.xml
diff --git a/indra/newview/skins/default/xui/fr/mime_types_linux.xml b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
index 3a7ff979ee..3a7ff979ee 100644..100755
--- a/indra/newview/skins/default/xui/fr/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/fr/mime_types_mac.xml b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
index 3a7ff979ee..3a7ff979ee 100644..100755
--- a/indra/newview/skins/default/xui/fr/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 746a4b1d55..c295a6f5a7 100644..100755
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -203,6 +209,14 @@ Ajouter ce pouvoir à « [ROLE_NAME] » ?
 Ajouter ce pouvoir à « [ROLE_NAME] » ?
 		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Vous allez expulser [AVATAR_NAME] du groupe.
+		<usetemplate ignoretext="Confirmer l&apos;expulsion d&apos;un membre du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Vous allez expulser [COUNT] membres du groupe.
+		<usetemplate ignoretext="Confirmer l&apos;expulsion de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Vous êtes sur le point d&apos;abandonner l&apos;élément joint.
 Voulez-vous vraiment continuer ?
@@ -359,13 +373,19 @@ Vous devez saisir le nom d&apos;utilisateur de votre avatar.
 
 Pour entrer dans [SECOND_LIFE], vous devez disposer d&apos;un compte. Voulez-vous en créer un maintenant ?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=fr-FR
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Saisissez soit le nom d&apos;utilisateur soit à la fois le prénom et le nom de votre avatar dans le champ Nom d&apos;utilisateur, puis connectez-vous.
 	</notification>
+	<notification name="InvalidGrid">
+		[GRID] n&apos;est pas un identifiant de grille valide.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Grille non valide spécifiée au niveau du lieu de départ.
+	</notification>
 	<notification name="DeleteClassified">
 		Supprimer l&apos;annonce [NAME] ?
 Une fois payés, les frais ne sont pas remboursables.
@@ -472,7 +492,7 @@ L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
 	</notification>
 	<notification name="StartRegionEmpty">
 		Vous n&apos;avez pas défini de région de départ.
-Veuillez saisir le nom de la région dans la case Lieu de départ, ou choisissez Dernier emplacement ou Domicile comme Lieu de départ.
+Saisissez le nom de la région voulue dans la case Lieu de départ ou choisissez Dernier emplacement ou Domicile comme lieu de départ.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -494,6 +514,33 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon matériel n&apos;est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.intel.com/p/fr_FR/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=fr
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -590,6 +637,9 @@ Vous pouvez lier un maximum de [MAX] objets.
 
 Assurez-vous que vous êtes le propriétaire de tous les objets et qu&apos;aucun d&apos;eux n&apos;est verrouillé.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Impossible de lier des objets d&apos;une région à une autre.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Impossible de lier car les objets n&apos;ont pas tous le même propriétaire.
 
@@ -970,6 +1020,41 @@ Proposer à [NAME] de devenir votre ami(e) ?
 			<button name="Cancel" text="Annuler"/>
 		</form>
 	</notification>
+	<notification label="Ajouter une liste Rechercher/Remplacer" name="AddAutoReplaceList">
+		Nom de la nouvelle liste :
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Renommer la liste Rechercher/Remplacer" name="RenameAutoReplaceList">
+		Le nom [DUPNAME] est déjà utilisé.
+    Saisissez un nouveau nom unique :
+		<form name="form">
+			<button name="ReplaceList" text="Remplacer la liste actuelle"/>
+			<button name="SetName" text="Utiliser le nouveau nom"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Le mot-clé doit être constitué d&apos;un seul mot et sa valeur de remplacement doit être renseignée.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Liste de remplacement non valide.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Spécifiez un fichier, un nom et une langue.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Le dictionnaire [DIC_NAME] ne semble pas contenir de fichier &quot;aff&quot; ; il s&apos;agit donc d&apos;un dictionnaire « secondaire ».
+Vous pouvez l&apos;utiliser comme dictionnaire supplémentaire mais pas comme dictionnaire principal.
+
+Voir https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Impossible de copier
+    [FROM_NAME]
+    vers
+    [TO_NAME]
+	</notification>
 	<notification label="Enregistrer la tenue" name="SaveOutfitAs">
 		Enregistrer ce que je porte comme nouvelle tenue :
 		<form name="form">
@@ -1029,7 +1114,7 @@ Proposer à [NAME] de devenir votre ami(e) ?
 Veuillez saisir un montant plus élevé.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Des articles liés pointent vers au moins un article sélectionné. Les liens arrêteront définitivement de fonctionner si vous supprimez cet article. Il est vivement conseillé de supprimer d&apos;abord ces liens.
+		Des liens pointent vers au moins un article sélectionné.  Les liens arrêteront définitivement de fonctionner si vous supprimez cet article.  Il est vivement conseillé de supprimer d&apos;abord ces liens.
 
 Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
@@ -1049,7 +1134,7 @@ Voulez-vous vraiment supprimer ces articles ?
 	<notification name="ConfirmObjectDeleteNoOwn">
 		Au moins un des objets que vous avez sélectionnés ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1063,23 +1148,23 @@ Au moins un des objets n&apos;est pas copiable.
 		Au moins un des objets est verrouillé.
 Au moins un des objets ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Au moins un des objets n&apos;est pas copiable.
+		Au moins un des objets n&apos;est pas reproductible.
 Au moins un des objets ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
+Voulez-vous vraiment supprimer ces articles ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
 		Au moins un des objets est verrouillé.
-Au moins un des objets n&apos;est pas copiable.
+Au moins un des objets n&apos;est pas reproductible.
 Au moins un des objets ne vous appartient pas.
 
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="annuler" yestext="OK"/>
+Voulez-vous vraiment supprimer ces articles ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Au moins un des objets est verrouillé.
@@ -1143,7 +1228,7 @@ par une carte [THIS_GPU].
 Vous avez été téléporté vers une région voisine.
 	</notification>
 	<notification name="AvatarMovedLast">
-		Votre dernière destination n&apos;est pas disponible actuellement.
+		La destination demandée n&apos;est pas disponible actuellement.
 Vous avez été téléporté vers une région voisine.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1162,8 +1247,7 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
 		L&apos;installation de [APP_NAME] est terminée.
 
 Si vous utilisez [SECOND_LIFE] pour la première fois, vous devez ouvrir un compte avant de pouvoir vous connecter.
-Retourner sur [http://join.secondlife.com secondlife.com] pour ouvrir un nouveau compte ?
-		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/>
+		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Créer un compte..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Nous avons des difficultés à vous connecter. Il y a peut-être un problème avec votre connexion Internet ou la [SECOND_LIFE_GRID].
@@ -1305,7 +1389,7 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
 Veuillez choisir un objet à vendre et réessayer.
 	</notification>
 	<notification name="FinishedRawDownload">
-		Chargement du fichier de terrain raw effectué vers :
+		Téléchargement du fichier de terrain raw effectué vers :
 [DOWNLOAD_PATH].
 	</notification>
 	<notification name="DownloadWindowsMandatory">
@@ -1401,13 +1485,43 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Informations relatives à cette mise
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Nous avons téléchargé une mise à jour logicielle requise.
-Version [VERSION]
+Version [VERSION] [Informations au sujet de cette mise à jour [INFO_URL]]
 
 [APP_NAME] doit être redémarré pour que la mise à jour soit installée.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+[Informations au sujet de cette mise à jour [INFO_URL]]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Nous avons téléchargé une mise à jour de votre installation [APP_NAME].
+Version [VERSION] 
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [[INFO_URL] pour en savoir plus sur cette mise à jour]
+		<usetemplate name="okcancelbuttons" notext="Ultérieurement..." yestext="Installer maintenant et redémarrer [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Nous avons téléchargé une mise à jour de votre installation [APP_NAME].
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
+		<usetemplate name="okcancelbuttons" notext="Ultérieurement..." yestext="Installer maintenant et redémarrer [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Nous avons téléchargé une mise à jour logicielle requise.
+Version [VERSION]
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
+
+[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		[APP_NAME] doit être redémarré pour que la mise à jour soit installée.
+Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
+consultez [Informations au sujet de cette mise à jour [INFO_URL]]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1458,6 +1572,10 @@ Version [VERSION]
 Quitter le groupe ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Impossible de quitter le groupe. Vous ne pouvez pas quitter le groupe car vous en êtes le dernier propriétaire. Vous devez d&apos;abord affecter le rôle de propriétaire à un autre membre.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Souhaitez-vous vraiment éjecter tous les résidents de la grille ?
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous les résidents"/>
@@ -1485,10 +1603,13 @@ Quitter le groupe ?
 		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Le mode Occupé est sélectionné.
-Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
-		<usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Ne pas déranger est activé.  Vous ne recevrez pas les notifications de communications entrantes.
+
+- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences &gt; Général).
+- Toutes les offres de téléportation seront refusées.
+- Les appels vocaux seront refusés.
+		<usetemplate ignoretext="J&apos;ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
@@ -1684,83 +1805,128 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
 		</url>
-		<usetemplate ignoretext="Je ne peux pas pénétrer dans cette région car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+		<usetemplate ignoretext="Passage à une autre région : la région que vous essayez de visiter comporte du contenu uniquement accessible aux adultes." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		La catégorie de contenu définie dans vos préférences ne vous permet pas de pénétrer dans cette région.
-
-Pour cela, vous devez modifier votre paramètre de catégorie de contenu. Vous pourrez alors rechercher du contenu [REGIONMATURITY] et y accéder. Pour annuler vos modifications, accédez à Moi &gt; Préférences &gt; Général.
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences ou d&apos;annuler l&apos;action. Une fois vos préférences modifiées, vous pouvez réessayer d&apos;accéder à la région.
 		<form name="form">
 			<button name="OK" text="Modifier les préférences"/>
-			<button default="true" name="Cancel" text="Fermer"/>
-			<ignore name="ignore" text="La catégorie de contenu que j&apos;ai choisie m&apos;empêche de pénétrer dans une région"/>
+			<button default="true" name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Passage à une autre région : la région que vous essayez de visiter comporte du contenu dont le niveau est exclu de vos préférences actuelles."/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Nous rencontrons des difficultés techniques au niveau de votre téléportation car vos préférences ne sont pas synchronisées avec le serveur.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
+		<url name="url">
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
+		</url>
+		<usetemplate ignoretext="Téléportation : la région que vous essayez de visiter comporte du contenu uniquement accessible aux adultes." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences afin de poursuivre la téléportation ou d&apos;annuler la téléportation.
+		<form name="form">
+			<button name="OK" text="Modifier et continuer"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Téléportation (redémarrage possible) : la région que vous essayez de visiter comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences ou d&apos;annuler la téléportation. Une fois vos préférences modifiées, vous devrez réessayer de vous téléporter.
+		<form name="form">
+			<button name="OK" text="Modifier les préférences"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Téléportation (redémarrage impossible) : la région que vous essayez de visiter comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Nous rencontrons des difficultés techniques au niveau de votre téléportation car vos préférences ne sont pas synchronisées avec le serveur.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Votre préférence de catégorie de contenu est désormais [RATING].
+		Aucune autre notification vous informant que vous allez visiter une région au contenu [RATING] ne vous sera envoyée. Vous pouvez modifier vos préférences de contenu à l&apos;avenir en accédant à Moi &gt; Préférences &gt; Général, à partir de la barre de menus.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Impossible de modifier vos préférences afin d&apos;afficher le contenu [PREFERRED_MATURITY] à l&apos;heure actuelle. Le paramètre [ACTUAL_MATURITY] a été rétabli. Vous pouvez réessayer de modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général, à partir de la barre de menus.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		Le niveau de contenu du terrain que vous essayez de revendiquer dépasse celui défini dans vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Seuls les adultes sont autorisés à revendiquer ce terrain.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
 		</url>
-		<usetemplate ignoretext="Je ne peux pas réclamer cette région car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+		<usetemplate ignoretext="Seuls les adultes sont autorisés à revendiquer ce terrain." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous autorise pas à réclamer cette région.
+		Le terrain que vous essayez de revendiquer comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Le terrain que vous essayez de revendiquer comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
-		<usetemplate ignoretext="La catégorie de contenu que j&apos;ai choisie m&apos;empêche de réclamer un terrain" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
+		Le terrain que vous essayez de revendiquer comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences, puis d&apos;essayer de revendiquer ce terrain à nouveau.
+		<form name="form">
+			<button name="OK" text="Modifier les préférences"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Le terrain que vous essayez de revendiquer comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		Le niveau de contenu du terrain que vous essayez d&apos;acheter dépasse celui défini dans vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Seuls les adultes sont autorisés à acheter ce terrain.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
 		</url>
-		<usetemplate ignoretext="Je ne peux pas acheter ce terrain car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+		<usetemplate ignoretext="Seuls les adultes sont autorisés à acheter ce terrain." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
+		Le terrain que vous essayez d&apos;acheter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Le terrain que vous essayez d&apos;acheter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous autorise pas à acheter cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
-		<usetemplate ignoretext="La catégorie de contenu que j&apos;ai choisie m&apos;empêche d&apos;acheter un terrain" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
+		Le terrain que vous essayez d&apos;acheter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences, puis d&apos;essayer d&apos;acheter ce terrain à nouveau.
+		<form name="form">
+			<button name="OK" text="Modifier les préférences"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Le terrain que vous essayez d&apos;acheter comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Vous avez sélectionné trop de prims.  Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.
@@ -1815,10 +1981,9 @@ Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
 		</form>
 	</notification>
 	<notification label="Catégorie de la région modifiée" name="RegionMaturityChange">
-		Le niveau de maturité de cette région a été mis à jour.
-Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
-
-Pour entrer dans les régions Adultes, le résident doit avoir vérifié son compte, que ce soit par vérification de l&apos;âge ou du mode de paiement.
+		Le niveau de contenu de cette région a changé.
+Il se peut que l&apos;affichage de cette modification sur la carte prenne quelque temps.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Versions de voix non compatibles" name="VoiceVersionMismatch">
 		Cette version de [APP_NAME] n&apos;est pas compatible avec la fonctionnalité de chat vocal dans cette région. Vous devez mettre à jour [APP_NAME] pour que le chat vocal fonctionne correctement.
@@ -1931,6 +2096,10 @@ Déplacer les objets de l&apos;inventaire ?
 		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée.  Tous les participants recevront les notifications de nouvelle conversation.
+		<usetemplate ignoretext="Confirmer l&apos;ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Êtes-vous certain de vouloir quitter ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2005,14 +2174,14 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
 	</notification>
-	<notification label="Réponse si occupé(e)" name="BusyModePay">
-		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
+	<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
+		Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
 
-Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
+Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/>
-			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
+			<ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/>
+			<button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2108,14 +2277,11 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		<usetemplate ignoretext="Porter automatiquement tout en modifiant mon apparence" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Vous devez avoir au moins 18 ans pour accéder au contenu et aux zones Adulte dans Second Life. Visitez la page de vérification de l&apos;âge afin de confirmer que vous avez plus de 18 ans. 
-Cette opération lancera votre navigateur Web.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Annuler" yestext="Accéder à la page de vérification de l&apos;âge"/>
+		L&apos;accès à l&apos;endroit que vous essayez de visiter est limité aux résidents de plus de 18 ans.
+		<usetemplate ignoretext="Je n&apos;ai pas l&apos;âge requis pour visiter les zones d&apos;accès limité en fonction de l&apos;âge." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		L&apos;accès à cet endroit est limité aux plus de 18 ans.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Pour pouvoir pénétrer dans cette zone, vous devez avoir enregistré vos informations de paiement.  Souhaitez-vous aller sur [SECOND_LIFE] et enregistrer vos informations de paiement ?
@@ -2150,11 +2316,8 @@ Cette opération lancera votre navigateur Web.
 	<notification name="GroupNotice">
 		Sujet : [SUBJECT], Message : [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est en ligne
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est hors ligne
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
@@ -2275,9 +2438,7 @@ Veuillez sélectionner un seul objet.
     choisir Téléportation).
 	</notification>
 	<notification name="TeleportToPerson">
-		Pour contacter un résident tel que [NAME], cliquez sur le bouton Personnes, sélectionnez le résident dans la fenêtre qui s&apos;ouvre, puis cliquez sur IM en
-    bas de la fenêtre.
-    (Vous pouvez aussi double-cliquer sur le nom du résident dans la liste ou cliquer-droit dessus et choisir IM.)
+		Pour ouvrir une conversation privée avec une autre personne, cliquez-droit sur son avatar et choisissez IM dans le menu.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Vous ne pouvez pas sélectionner de terrain en dehors des limites du serveur.
@@ -2377,6 +2538,16 @@ Vous ne pouvez pas voler ici.
 	<notification name="NoBuild">
 		La construction est interdite dans cette zone. Vous ne pouvez pas construite ou rezzer d&apos;objets ici.
 	</notification>
+	<notification name="PathfindingDirty">
+		Des modifications de recherche de chemin sont en attente concernant cette région. Si vous disposez de droits de construction, vous pouvez la figer de nouveau en cliquant sur le bouton Refiger la région.
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		La recherche de chemin dynamique n&apos;est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Une erreur est survenue. Un problème réseau ou serveur s&apos;est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Cette parcelle masque les avatars et le chat écrit des autres parcelles. Vous ne pouvez pas voir les résidents qui se trouvent en dehors, et ceux qui se trouvent en dehors ne peuvent pas vous voir. Le chat écrit habituel sur le canal 0 est également bloqué.
 	</notification>
@@ -2395,9 +2566,7 @@ Aucun script ne marche ici à part ceux du propriétaire du terrain.
 		Vous ne pouvez réclamer qu&apos;un terrain public dans la région où vous vous trouvez actuellement.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Vous devez sans doute procéder à la vérification de votre âge ou installer une version plus récente du client.
-
-Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuillez consulter les pages d&apos;aide.
+		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Vous avez été banni de cette région.
@@ -2408,11 +2577,11 @@ Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuill
 	<notification name="ImproperPaymentStatus">
 		Vous n&apos;avez pas le statut de paiement approprié pour pénétrer dans cette région.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Pour pouvoir pénétrer dans cette région, vous devez avoir procédé à la vérification de votre âge.
+	<notification name="MustGetAgeRegion">
+		Pour accéder à cette région, vous devez avoir au moins 18 ans.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Pour pouvoir pénétrer sur cette parcelle, vous devez avoir procédé à la vérification de votre âge.
+		Pour accéder à cette parcelle, vous devez avoir au moins 18 ans.
 	</notification>
 	<notification name="NoDestRegion">
 		Région de destination introuvable.
@@ -2514,12 +2683,33 @@ Veuillez réessayer dans quelques minutes.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] propose de vous téléporter à son emplacement :
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+« [MESSAGE] »
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Téléporter"/>
 			<button name="Cancel" text="Annuler"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] propose de vous téléporter à son emplacement :
+
+« [MESSAGE] »
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Cette région comporte du contenu [REGION_CONTENT_MATURITY] alors que vos préférences actuelles excluent tout contenu [REGION_CONTENT_MATURITY]. Il est possible de modifier vos préférences afin de poursuivre la téléportation ou d&apos;annuler la téléportation.
+		<form name="form">
+			<button name="Teleport" text="Modifier et continuer"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] propose de vous téléporter à son emplacement :
+
+« [MESSAGE] »
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Toutefois, cette région comporte du contenu uniquement accessible aux adultes.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Offre de téléportation envoyée à [TO_NAME]
 	</notification>
@@ -2614,16 +2804,21 @@ Acceptez-vous ?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objet nommé &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, appartenant à [NAME], aimerait :
-
-[QUESTIONS]
-Si vous n&apos;avez pas confiance en cet objet ni en son créateur, refusez cette requête.
-
-Accepter cette requête ?
+		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
+  
+N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
-			<button name="Grant" text="Accepter"/>
+			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
-			<button name="Details" text="Détails..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		Le client ne reconnaît pas le droit de script à l&apos;exécution demandé par &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, objet appartenant à [NAME], et ne peut donc pas l&apos;accorder.
+
+Pour accorder ce droit, mettez votre client à jour pour passer à la version la plus récente, à partir de [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="OK"/>
+			<button name="Mute" text="Ignorer"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2927,6 +3122,10 @@ Texture figée de [RESOLUTION] chargée pour [BODYREGION] au bout de [TIME] seco
 		([EXISTENCE] secondes d&apos;existence)
 Texture figée de [RESOLUTION] mise à jour localement pour [BODYREGION] au bout de [TIME] secondes.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Impossible d&apos;afficher un aperçu de cette texture car il s&apos;agit d&apos;une texture sans copie et/ou transfert.
+		<usetemplate ignoretext="M&apos;avertir que le mode Aperçu en direct n&apos;est pas disponible pour les textures sans copie et/ou transfert" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Voulez-vous vraiment quitter cet appel ?
 		<usetemplate ignoretext="Confirmer avant de quitter l&apos;appel" name="okcancelignore" notext="Non" yestext="Oui"/>
@@ -3098,6 +3297,62 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
 		Cette action masquera tous les boutons et articles de menu. Pour les récupérer, cliquez de nouveau sur [SHORTCUT].
 		<usetemplate ignoretext="Confirmer avant de masquer l&apos;interface" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera.
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="L&apos;indicateur Fantôme de certains groupes de liens basculera." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison des restrictions d&apos;autorisation les concernant. Ces groupes de liens seront définis sur [RESTRICTED_TYPE].
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="Certains groupes de liens sélectionnés ne peuvent pas être définis en raison des restrictions d&apos;autorisation les concernant." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison d&apos;une forme non convexe.
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="Certains groupes de liens sélectionnés ne peuvent pas être définis en raison d&apos;une forme non convexe." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera.
+
+Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison des restrictions d&apos;autorisation les concernant. Ces groupes de liens seront définis sur [RESTRICTED_TYPE].
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera et d&apos;autres ne peuvent pas être définis en raison de restrictions d&apos;autorisation sur les groupes de liens." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera.
+
+Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison d&apos;une forme non convexe.
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera et d&apos;autres ne peuvent pas être définis en raison d&apos;une forme non convexe." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison des restrictions d&apos;autorisation les concernant. Ces groupes de liens seront définis sur [RESTRICTED_TYPE].
+
+Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison d&apos;une forme non convexe. Les types d&apos;usage de ces groupes de liens ne seront pas modifiés.
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="Certains groupes de liens sélectionnés ne peuvent pas être définis en raison des restrictions d&apos;autorisation les concernant et d&apos;une forme non convexe." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera.
+
+Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison des restrictions d&apos;autorisation les concernant. Ces groupes de liens seront définis sur [RESTRICTED_TYPE].
+
+Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison d&apos;une forme non convexe. Les types d&apos;usage de ces groupes de liens ne seront pas modifiés.
+
+Voulez-vous continuer ?
+		<usetemplate ignoretext="L&apos;indicateur Fantôme de certains groupes de liens sélectionnés basculera et d&apos;autres ne peuvent pas être définis en raison de restrictions d&apos;autorisation sur les groupes de liens et d&apos;une forme non convexe." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		L&apos;objet sélectionné affecte le maillage de navigation. Si vous le modifiez en Flexibilité, il sera supprimé de ce maillage.
+		<usetemplate ignoretext="L&apos;objet sélectionné affecte le maillage de navigation. Si vous le modifiez en Flexibilité, il sera supprimé de ce maillage." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Vous semblez ne pas avoir le matériel requis pour utiliser [APP_NAME]. [APP_NAME] requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les pilotes les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d&apos;exploitation.
 
@@ -3122,4 +3377,652 @@ Sinon, consultez la carte et trouvez les &quot; infohubs &quot;.
 	<global name="You died and have been teleported to your home location">
 		Vous êtes mort et avez été téléporté à votre domicile.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Impossible de mettre à jour [FNAME] car le fichier est introuvable.
+Désactivation des mises à jour futures de ce fichier...
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[NRETRIES] tentatives d&apos;ouverture ou de décodage de [FNAME] ont échoué. Le fichier est désormais considéré comme endommagé.
+Désactivation des mises à jour futures de ce fichier...
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentative d&apos;ajout d&apos;un fichier image [FNAME] non valide ou illisible n&apos;ayant pas pu être ouvert ou décodé. Tentative annulée.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Vous allez renvoyer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
+		<usetemplate ignoretext="Voulez-vous vraiment renvoyer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
+		<usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar figé.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] vous a libéré.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar libéré.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Vous n&apos;avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Vous n&apos;êtes plus figé, vous pouvez reprendre votre vie.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Impossible de figer cet utilisateur.
+	</notification>
+	<notification name="NowOwnObject">
+		Vous êtes désormais le propriétaire de l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="CantRezOnLand">
+		Impossible de rezzer l&apos;objet à [OBJECT_POS] car le propriétaire de ce terrain de l&apos;autorise pas.  Utilisez l&apos;outil Terrain pour voir à qui appartiennent les terrains.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Impossible de rezzer l&apos;objet car il y a trop de demandes.
+	</notification>
+	<notification name="SitFailCantMove">
+		Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n&apos;est pas autorisée.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Essayez de vous rapprocher.  Impossible de vous asseoir sur l&apos;objet car
+il ne se trouve pas dans la même région que vous.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Création d&apos;un nouvel objet impossible. La région est pleine.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Vous ne pouvez pas créer d&apos;arbres ni d&apos;herbe sur un terrain qui ne vous appartient pas.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Échec de la copie car vous ne disposez pas des droits requis pour copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Échec de la copie car l&apos;objet [OBJ_NAME] ne peut pas vous être transféré.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Échec de la copie car l&apos;objet [OBJ_NAME] contribue au maillage de navigation.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Dupliquer sans objet racine sélectionné
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossible de dupliquer les objets car la région est pleine.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Création de l&apos;objet impossible car 
+la parcelle est pleine.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Échec d&apos;une tentative pour rezzer un objet.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossible de créer l&apos;article qui a provoqué des problèmes pour cette région.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Cet article d&apos;inventaire a été placé sur liste noire.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Recherche de terrain bloquée.
+Vous avez effectué trop de recherches de terrain trop rapidement.
+Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Vous êtes mort et avez été téléporté à votre domicile.
+	</notification>
+	<notification name="EjectComingSoon">
+		Votre présence ici n&apos;est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Vous ne pouvez pas pénétrer dans cette région car 
+le serveur est plein.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Le réenregistrement dans l&apos;inventaire a été désactivé.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car l&apos;objet à partir duquel il a été rezzé n&apos;existe plus.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l&apos;objet [DEST_NAME].
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossible de réenregistrer [OBJ_NAME] dans l&apos;inventaire -- cette opération a été désactivée.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car vous n&apos;avez pas le droit de copier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La suppression de l&apos;objet [OBJ_NAME] du simulateur n&apos;est pas autorisée par le système de droits.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Vous ne pouvez pas enregistrer votre sélection car l&apos;objet [OBJ_NAME] ne peut pas être copié.
+	</notification>
+	<notification name="NoModNoTaking">
+		Vous ne pouvez pas prendre votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
+	</notification>
+	<notification name="RezDestInternalError">
+		Erreur interne : type de destination inconnue.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Échec de la suppression car l&apos;objet est introuvable
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Exclusion de cet utilisateur impossible.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="HomePositionSet">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulsé.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Vous n&apos;avez pas pu réaliser l&apos;exclusion car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car il n&apos;y a pas suffisamment de ressources pour cet objet sur cette parcelle.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car l&apos;autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
+[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Vous n&apos;êtes pas autorisé à modifier cet objet.
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Impossible d&apos;activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec images-clés.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossible d&apos;activer les propriétés physiques pour l&apos;objet -- ressources de terrain insuffisantes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossible d&apos;activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Cet objet ne peut pas contenir de morceau concave car c&apos;est un fantôme qui contribue au maillage de navigation.
+	</notification>
+	<notification name="UnableAddItem">
+		Ajout de l&apos;article impossible.
+	</notification>
+	<notification name="UnableEditItem">
+		Modification impossible
+	</notification>
+	<notification name="NoPermToEdit">
+		Modification interdite.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Pas autorisé à copier cet inventaire.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossible d&apos;enregistrer dans le contenu des objets : L&apos;article n&apos;existe plus.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossible d&apos;enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l&apos;inventaire.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossible d&apos;enregistrer dans le contenu des objets : cela modifierait les droits d&apos;attache.
+	</notification>
+	<notification name="TooManyScripts">
+		Trop de scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Ajout du script impossible.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Le serveur d&apos;actifs n&apos;a pas répondu assez vite.  Objet renvoyé dans le sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Les formes physiques ne sont pas activées pour cette région.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossible de définir les propriétés physiques pour ce type d&apos;objet.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Vous devenez définir une forme pour la prim racine.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Les matériaux physiques ne sont pas activés pour cette région.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Les matériaux physiques ne peuvent être ajustés que pour les prims racines.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		La configuration de matériaux physiques sur les personnages n&apos;est pas prise en charge actuellement.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Une ou plusieurs propriétés des ressources physiques spécifiées n&apos;étaient pas valides.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Vous ne pouvez pas changer le type de raccord d&apos;un objet avec maillage.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Vous ne pouvez pas changer la forme d&apos;un objet avec maillage.
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Échec du lien -- les propriétaires sont différents
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Échec du lien car vous ne disposez pas des droits de modification.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Échec du lien -- trop de primitives
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Échec du lien -- impossible de lier pas de copie et pas de transfert
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Échec du lien - il n&apos;y a rien qui puisse être lié.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Échec du lien -- trop de personnages de recherche de chemin
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Échec du lien -- ressources de terrain insuffisantes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME].
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Vous avez été téléporté par un élément sur [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Création de l&apos;objet demandé impossible. La région est pleine.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Vous ne pouvez pas attacher plusieurs objets au même endroit.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Vous ne pouvez pas créer plusieurs objets ici.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Création de l&apos;objet demandé impossible. Objet absent de la base de données.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Création de l&apos;objet demandé impossible. Délai d&apos;attente dépassé. Veuillez réessayer.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Création de l&apos;objet demandé impossible. Veuillez réessayer.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Échec de l&apos;action « rezzer », le chargement de l&apos;objet demandé a pris trop longtemps.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Vous ne pouvez pas créer de plantes sur ce terrain.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossible de restaurer l&apos;objet. Position dans le monde introuvable.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossible de rezzer l&apos;objet car ses données de maillage ne sont pas valides.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossible de rezzer l&apos;objet car il y a déjà trop de scripts dans cette région.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à créer des objets à cet endroit.
+	</notification>
+	<notification name="CantCreateObject">
+		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Paramètres d&apos;objet non valides
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Vos privilèges d&apos;accès ne vous autorisent pas à dupliquer des objets ici.
+	</notification>
+	<notification name="CantChangeShape">
+		Vous n’êtes pas autorisé à modifier cette forme.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Vos privilèges d&apos;accès ne vous autorisent pas à revendiquer des objets ici.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Vos privilèges d&apos;accès ne vous autorisent pas à acheter des objets ici.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossible d&apos;attacher l&apos;objet car un avatar est assis dessus.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Les arbres et les plantes ne peuvent pas être portés sous forme d&apos;éléments attachés.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossible d&apos;attacher les objets appartenant au groupe.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossible d&apos;attacher les objets contribuant au maillage de navigation.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Impossible d&apos;attacher l&apos;objet car vous n&apos;avez pas le droit de le déplacer.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Ressources de script insuffisantes pour attacher cet objet.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Vous ne pouvez pas déposer d&apos;objets ici. Essayez la zone de période d&apos;essai gratuite.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l&apos;inventaire puis rezzez-les dans le monde.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		L&apos;élément n&apos;a pas pu être déposé : vous n&apos;avez pas le droit de déposer des éléments à cet endroit.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		L&apos;élément n&apos;a pas pu être déposé : ressources de terrain disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Les éléments n&apos;ont pas pu être déposés : ressources disponibles insuffisantes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Impossible de déposer l&apos;objet ici.  La parcelle est pleine.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Veuillez affiner vos paramètres de suppression.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Chargement de l&apos;actif impossible.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Impossible de trouver l&apos;utilisateur à téléporter chez lui
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		échec de la demande de type divine
+	</notification>
+	<notification name="GenericRequestFailed">
+		échec de la demande générique
+	</notification>
+	<notification name="CantUploadPostcard">
+		Chargement de la carte postale impossible.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Impossible récupérer les détails de l&apos;inventaire pour la notice au groupe.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossible d&apos;envoyer une notice au groupe -- ce n&apos;est pas autorisé.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossible d&apos;envoyer une notice au groupe - échec de la construction de l&apos;inventaire.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossible d&apos;analyser l&apos;inventaire dans la notice.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Échec du chargement du terrain.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Fichier de terrain écrit
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Fichier de terrain écrit, lancement du téléchargement...
+	</notification>
+	<notification name="TerrainBaked">
+		Terrain figé.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Vous devez mettre votre client à jour pour acheter cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Achat impossible, cette parcelle n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Achat impossible, le prix de vente ou la zone de terrain a changé.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Vous n&apos;êtes pas un acheteur autorisé pour cette parcelle.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d&apos;une autorisation d&apos;achat.
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Vous ne pouvez pas construire d&apos;objets ici car cela saturerait la parcelle.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -&gt; Signaler un bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Le terrain a été divisé.
+	</notification>
+	<notification name="PassPurchased">
+		Vous avez acheté un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Cette région n&apos;autorise pas les petites annonces.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Votre pass pour ce terrain arrive à expiration.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Il n&apos;y a pas de surface appropriée sur laquelle s&apos;asseoir, essayez un autre endroit.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Pas de place pour s&apos;asseoir ici, essayez un autre endroit.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas des droits requis.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Échec de la revendication de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Impossible de céder un terrain appartenant au groupe.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Échec de l&apos;achat de l&apos;objet car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Échec de l&apos;achat d&apos;inventaire car vous ne disposez pas de suffisamment de L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Impossible d&apos;acheter le pass actuellement.  Réessayez ultérieurement.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Création de l&apos;objet impossible car \nla parcelle est pleine.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossible de créer le repère pour l&apos;événement.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Grâce à vos pouvoirs de type divin, vous n&apos;êtes plus figé.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée.
+	</notification>
+	<notification name="ExpireExplanation">
+		Le système ne peut pas traiter votre demande actuellement. Délai d&apos;attente dépassé.
+	</notification>
+	<notification name="DieExplanation">
+		Le système ne peut pas traiter votre demande.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fonds insuffisants pour créer la primitive.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fonds insuffisants pour créer l&apos;objet.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Réinitialiser l&apos;emplacement du domicile car il n&apos;était pas légal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Cette région ne vous permet pas d&apos;y définir votre domicile.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
+	</notification>
+	<notification name="SetHomePosition">
+		Emplacement du domicile défini.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossible de dérezzer l&apos;objet à cause d&apos;un défaut d&apos;inventaire.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Création de l&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Création du dossier d&apos;inventaire demandé impossible.
+	</notification>
+	<notification name="CantCreateInventory">
+		Création de cet inventaire impossible.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Création du repère impossible.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Création de la tenue impossible. Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventaire n&apos;est pas à vendre.
+	</notification>
+	<notification name="CantFindInvItem">
+		Objet de l&apos;inventaire introuvable.
+	</notification>
+	<notification name="CantFindObject">
+		Objet introuvable.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Les transferts d&apos;argent aux objets sont actuellement désactivés dans cette région.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Impossible de savoir qui payer.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Vous ne pouvez pas donner de L$ à des objets publics.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Échec de la création d&apos;inventaire sur l&apos;objet Second Life.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Une erreur interne nous a empêchés de mettre votre client à jour correctement.  Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Impossible de créer de grandes prims qui coupent d&apos;autres joueurs.  Réessayez une fois que les autres joueurs se seront déplacés.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier.
+		<usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés.
+		<usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossible de déplacer les fichiers. Chemin précédent rétabli.
+		<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100644..100755
--- a/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/fr/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml
index 0baa8353d9..0baa8353d9 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/fr/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
index 4191ba42f9..4191ba42f9 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
index 54b8f53e59..c8fa9f340f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/>
 	<icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/>
 	<icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
index 20a355b11d..20a355b11d 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
index f54bed4fae..0e2b5a9c93 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Liste des ignorés
-	</text>
-	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
-	<button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
-	<button label="Ignorer l&apos;objet par nom" label_selected="Ignorer l&apos;objet par nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
-	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrer" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l&apos;objet sélectionné"/>
+		<menu_button name="view_btn" tool_tip="Options de tri"/>
+		<menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/>
+		<button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml
index 377f85368f..377f85368f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml
index 5e7442b877..5e7442b877 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
deleted file mode 100644
index c4537861e3..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Active/Désactive le micro"/>
-	<string name="VoiceControlBtnToolTip" value="Affiche/Masque le panneau de contrôle de la voix"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Parler" label_selected="Parler" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Bouger" name="movement_btn" tool_tip="Affiche/Masque le contrôle des déplacements"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Affichage" name="camera_btn" tool_tip="Affiche/Masque le contrôle de la caméra"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Prendre une photo"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construire" name="build_btn" tool_tip="Affiche/Masque les outils pour la construction"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Rechercher" name="search_btn" tool_tip="Affiche/Masque la recherche"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Carte" name="world_map_btn" tool_tip="Affiche/Masque la carte du monde"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini-carte" name="mini_map_btn" tool_tip="Affiche/Masque la mini-carte"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversations"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifications"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml
index 5b6d37ce00..5b6d37ce00 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_chat_header.xml b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/fr/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml
index de21996404..de21996404 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_classified_info.xml b/indra/newview/skins/default/xui/fr/panel_classified_info.xml
index c4265be877..c4265be877 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml
index 0b58a4e40b..0b58a4e40b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml
index b23cb91c6f..b23cb91c6f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml
index c1085aa461..c1085aa461 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/fr/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ebf18f6483
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(chargement)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..9c277842b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/>
+	<icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/>
+	<button name="delete_btn" tool_tip="Supprimer cette entrée"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml
index e1fa769f2f..e1fa769f2f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml
index bc0edda5b6..bc0edda5b6 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
index a8b95c66fb..a8b95c66fb 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
index 7b58f2e825..7b58f2e825 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
index 549864e237..549864e237 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
index 68a7ac54e2..68a7ac54e2 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
index 575cbabc88..575cbabc88 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
index 7e467b130c..7e467b130c 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
index 60d8e947f8..60d8e947f8 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml
index d79f7df90a..d79f7df90a 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
index 247e18da82..247e18da82 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
index 9e63c88221..9e63c88221 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
index 6a5f71a36b..6a5f71a36b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
index 9a263f6148..9a263f6148 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
index 3eb70923ef..3eb70923ef 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
index f5f2738319..f5f2738319 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
index f562d67937..f562d67937 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
index f97047ae28..f97047ae28 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
index 086542dee2..086542dee2 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
index c83ce04885..c83ce04885 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
index 689b7b81f4..689b7b81f4 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
index def158cf68..def158cf68 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/fr/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
index 3e66b3c72a..3e66b3c72a 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index a2655dcd45..a2655dcd45 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
index 047cd692e8..047cd692e8 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index 53f7ac33c2..d792439220 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Certains résidents que vous avez choisis font déjà partie du groupe et l&apos;invitation ne leur a donc pas été envoyée.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Invitations de groupe non envoyées : trop de résidents sélectionnés. Les invitations de groupe sont limitées à 100 par demande.
+	</panel.string>
 	<text name="help_text">
 		Vous pouvez inviter plusieurs résidents à la fois. Cliquez d&apos;abord sur Choisir un résident.
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 4011d1b8c7..4011d1b8c7 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
index 5fb69d1989..b1b32af7c6 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Inconnu"/>
+	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 3364dd9dbc..3364dd9dbc 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notify.xml b/indra/newview/skins/default/xui/fr/panel_group_notify.xml
index 08a49f908c..08a49f908c 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 0bd2e0bdab..0bd2e0bdab 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
index 1f2169e22c..1f2169e22c 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_instant_message.xml b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
index 305d2d853c..305d2d853c 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/fr/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
index 60507f191d..60507f191d 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml
index 7501e54f11..7501e54f11 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index e54b36644c..c8a1fe8751 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://fr.secondlife.com/registration/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=fr
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				CONNEXION
+			</text>
 			<text name="username_text">
 				Nom d&apos;utilisateur :
 			</text>
@@ -15,34 +15,32 @@
 			<text name="password_text">
 				Mot de passe :
 			</text>
-			<check_box label="Enregistrer" name="remember_check"/>
-			<button label="Connexion" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Mode :
-			</text>
-			<combo_box name="mode_combo" tool_tip="Sélectionnez un mode. Pour une exploration facile et rapide avec chat, choisissez Basique. Pour accéder à plus de fonctionnalités, choisissez Avancé.">
-				<combo_box.item label="Basique" name="Basic"/>
-				<combo_box.item label="Avancé" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Lieu de départ :
 			</text>
 			<combo_box name="start_location_combo">
 				<combo_box.item label="Dernier emplacement" name="MyLastLocation"/>
 				<combo_box.item label="Domicile" name="MyHome"/>
-				<combo_box.item label="&lt;Saisir le nom de la région&gt;" name="Typeregionname"/>
+				<combo_box.item label="&lt;Nom de la région&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				S&apos;inscrire
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Besoin d&apos;aide ?
 			</text>
 			<text name="forgot_password_text">
 				Nom d&apos;utilisateur ou mot de passe oublié ?
 			</text>
-			<text name="login_help">
-				Besoin d&apos;aide ?
+			<button label="Connexion" name="connect_btn"/>
+			<check_box label="Enregistrer" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CRÉER VOTRE COMPTE
 			</text>
+			<button label="Commencer" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
index db7d254b7a..db7d254b7a 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_me.xml b/indra/newview/skins/default/xui/fr/panel_me.xml
index 5676986228..5676986228 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_me.xml
+++ b/indra/newview/skins/default/xui/fr/panel_me.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
index e048e66810..e048e66810 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
index 8f1b436ba1..8f1b436ba1 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
index 9d070b7aff..9d070b7aff 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
index ecb1e9813a..ecb1e9813a 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
index b02e53269b..b02e53269b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
index 82cdf292ab..762dee01bb 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Cliquer ici pour chatter." name="chat_box" tool_tip="Appuyer sur Entrée pour dire, Ctrl-Entrée pour crier"/>
 	<button name="show_nearby_chat" tool_tip="Affiche/Masque le journal de chats près de vous"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 7b7b67041a..7b7b67041a 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
index 110e017050..110e017050 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml
index 6ce09cde4b..6ce09cde4b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/fr/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
index d947dbceb8..d947dbceb8 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml
index 39bc7ef8af..39bc7ef8af 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
index 1bc553c8c0..1bc553c8c0 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
index 4703559111..4703559111 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
index 416353e1d4..416353e1d4 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
index 874bab2daa..874bab2daa 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/fr/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index f035853efc..e306a00183 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -14,81 +14,56 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_filtered_friends_msg">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher].
 	</string>
-	<string name="people_filter_label" value="Filtrer les personnes"/>
-	<string name="groups_filter_label" value="Filtrer les groupes"/>
 	<string name="no_filtered_groups_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/>
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
-	<filter_editor label="Filtre" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="nearby_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
-		<panel label="MES AMIS" name="friends_panel">
+		<panel label="AMIS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="friends_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Afficher d&apos;autres options"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis."/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MES GROUPES" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
-				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
-				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
+		<panel label="GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrer les groupes" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/>
+				<menu_button name="groups_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
 			</panel>
+			<text name="groupcount">
+				Vous appartenez à [COUNT] groupes, et pouvez en rejoindre [REMAINING] autres.
+			</text>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
-				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrer les personnes" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
+				<menu_button name="recent_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
+				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
+				<dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUÉ" name="blocked_panel">
+			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_pick_info.xml b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
index 1de9b243f1..1de9b243f1 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_picks.xml b/indra/newview/skins/default/xui/fr/panel_picks.xml
index fb277f653f..fb277f653f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_picks.xml
+++ b/indra/newview/skins/default/xui/fr/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_place_profile.xml b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
index 30be838896..30be838896 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml
index 5ec48c44c7..5ec48c44c7 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_places.xml
+++ b/indra/newview/skins/default/xui/fr/panel_places.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml
index 0f8397cfb4..0f8397cfb4 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/fr/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
index 6f4e9c23f9..945a5e0272 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/fr/panel_postcard_settings.xml
@@ -9,12 +9,12 @@
 	</combo_box>
 	<layout_stack name="postcard_image_params_ls">
 		<layout_panel name="postcard_image_size_lp">
-			<spinner label="Largeur" name="postcard_snapshot_width"/>
-			<spinner label="Hauteur" name="postcard_snapshot_height"/>
+			<spinner label="Larg." name="postcard_snapshot_width"/>
+			<spinner label="Haut." name="postcard_snapshot_height"/>
 			<check_box label="Conserver les proportions" name="postcard_keep_aspect_check"/>
 		</layout_panel>
 		<layout_panel name="postcard_image_format_quality_lp">
-			<slider label="Qualité de l&apos;image" name="image_quality_slider"/>
+			<slider label="Qualité image" name="image_quality_slider"/>
 			<text name="image_quality_level">
 				([QLVL])
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
index 3f3d0f51f4..3f3d0f51f4 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
index 901a92ed1b..901a92ed1b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 76ed237451..52c6ed24b9 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<text name="font_size">
-		Taille de la police :
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Petite" name="radio" value="0"/>
-		<radio_item label="Moyenne" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
-	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
-	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
-	<check_box label="Bulles de chat" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Afficher les IM dans :
-	</text>
-	<text name="requires_restart_label">
-		(redémarrage requis)
-	</text>
-	<radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)">
-		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
-		<radio_item label="Onglets" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Activer les popups de chat entrant :
-	</text>
-	<check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message de chat de groupe."/>
-	<check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message instantané."/>
-	<spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/>
-	<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
-	<button label="Traduction automatique" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Taille de la police :
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Petite" name="Small" value="0"/>
+			<item label="Moyenne" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			IM amis :
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			IM non amis :
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			IM conférence :
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Chat de groupe :
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Chat près de moi :
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IM objet :
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
+			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Aucune action" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Écouter le son" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Écouter le son :
+		</text>
+		<check_box label="Nouvelle conversation" name="new_conversation"/>
+		<check_box label="Appel entrant" name="incoming_voice_call"/>
+		<check_box label="Offre de téléportation" name="teleport_offer"/>
+		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Effacer le journal..." name="clear_log"/>
+		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
+		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
+	</panel>
+	<button label="Traduction..." name="ok_btn"/>
+	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
+	<button label="Orthographe..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
index e50fd2b6f3..e50fd2b6f3 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 66b84af3aa..533c392d6b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="Jamais" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Réponse si occupé(e) :
+		Réponse Ne pas déranger
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index a738b2d43f..4946b09814 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
 		<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
 		<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Éclairage et ombres" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Modèle d&apos;éclairage avancé" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
 		<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
index 94d7322b22..80aed90a2d 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml
@@ -28,7 +28,7 @@
 		<combo_box.item label="Déplacement vers le clic" name="1"/>
 	</combo_box>
 	<text name="double_click_action_lbl">
-		Double-clic sur le terrain :
+		Double clic sur le terrain :
 	</text>
 	<combo_box name="double_click_action_combo">
 		<combo_box.item label="Aucune action" name="0"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
index cf1a374da6..cf1a374da6 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index 83303950dc..50f4a49bd0 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Installation automatique" name="Install_automatically"/>
 		<combo_box.item label="Téléchargement et installation manuels" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Accepte de passer aux versions avant sortie officielle" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Paramètres de proxy :
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
index 37eb6bbeb0..37eb6bbeb0 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
index ad744b7760..ad744b7760 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index a30306d116..a30306d116 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 733c3f9a22..98ae250215 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -30,11 +30,11 @@
 	<check_box label="Sur le terrain d&apos;un autre résident" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre"/>
 	<check_box label="Dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
 	<button label="Renvoyer" name="return_btn"/>
-	<button label="Afficher les collisions les plus consommatrices..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
+	<button label="Collisions les plus consommatrices" name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
 	<button label="?" left="337" name="top_colliders_help"/>
-	<button label="Afficher les objets scriptés les plus consommateurs..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
+	<button label="Scripts les plus consommateurs" name="top_scripts_btn" tool_tip="Liste des objets passant le plus de temps à exécuter des scripts" width="320"/>
 	<button label="?" left="337" name="top_scripts_help"/>
 	<button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
 	<button label="?" left="177" name="restart_help"/>
-	<button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d&apos;une heure" width="160"/>
+	<button label="Annuler le redémarrage" name="cancel_restart_btn" tool_tip="Annuler le redémarrage de la région." width="160"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_environment.xml b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
index d18503db86..085a308786 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_environment.xml
@@ -15,7 +15,7 @@
 			<combo_box.item label="-Effectuer une sélection-" name="item0"/>
 		</combo_box>
 		<text name="sky_dayc_settings_title">
-			Ciel / Cycle du jour
+			Ciel/Cycle du jour
 		</text>
 		<radio_group name="sky_dayc_settings_radio_group">
 			<radio_item label="Ciel fixe" name="my_sky_settings"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 9d97d1bf29..be89020ac7 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -21,7 +21,7 @@ domaine.
 		Conditions d&apos;accès des résidents :
 	</text>
 	<check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Pour pouvoir accéder à ce domaine, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
-	<check_box label="Âge vérifié" name="limit_age_verified" tool_tip="Pour que les résidents puissent accéder à ce domaine, leur âge doit avoir fait l&apos;objet d&apos;une vérification. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
+	<check_box label="Avoir plus de 18 ans" name="limit_age_verified" tool_tip="Pour accéder à ce domaine, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
 	<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index b5795bebe2..234d316069 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -22,7 +22,7 @@
 	<check_box label="Interdire le vol" name="block_fly_check"/>
 	<check_box label="Autoriser les dégâts" name="allow_damage_check"/>
 	<check_box label="Interdire les bousculades" name="restrict_pushobject"/>
-	<check_box label="Autoriser la revente" name="allow_land_resell_check"/>
+	<check_box label="Autoriser la revente de terrain" name="allow_land_resell_check"/>
 	<check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/>
 	<check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
 	<check_box label="Autoriser les objets de maillage" name="mesh_rez_enabled_check" tool_tip="Laisser les gens rezzer des objets de maillage dans cette région."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index d7e321d06d..97f486d3a3 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -55,8 +55,8 @@ du terrain" name="terrain_lower_spin"/>
 	<spinner label="Bas" name="height_start_spin_2"/>
 	<spinner label="Haut" name="height_range_spin_0"/>
 	<spinner label="Haut" name="height_range_spin_2"/>
-	<button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
-	<button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+	<button label="Télécharger le terrain en RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+	<button label="Charger un terrain en RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
 	<button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d&apos;élévation/abaissement"/>
 	<button label="Appliquer" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
deleted file mode 100644
index c0b667137a..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Textures du sol" name="Textures">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<text name="region_text">
-		(inconnue)
-	</text>
-	<text name="base_texture_text">
-		Textures de base (fichiers 128x128, 24 bit .tga)
-	</text>
-	<text name="height_text_lbl">
-		1 (faible)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (élevé)
-	</text>
-	<text name="detail_texture_text">
-		Textures du terrain (fichiers.tga 512 x 512, 24 bit requis)
-	</text>
-	<text name="height_text_lbl5">
-		Limites d&apos;élévation de texture
-	</text>
-	<text name="height_text_lbl6">
-		Nord-ouest
-	</text>
-	<text name="height_text_lbl7">
-		Nord-est
-	</text>
-	<text name="height_text_lbl8">
-		Sud-ouest
-	</text>
-	<text name="height_text_lbl9">
-		Sud-est
-	</text>
-	<text name="height_text_lbl10" width="460">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl11">
-		En mètres, la valeur Bas correspond à la hauteur max. de la texture n°1
-	</text>
-	<text name="height_text_lbl12">
-		et la valeur Haut correspond à la hauteur min. de la texture n°4.
-	</text>
-	<text name="height_text_lbl13">
-		Nord-est
-	</text>
-	<spinner label="Bas" name="height_start_spin_0"/>
-	<spinner label="Bas" name="height_start_spin_1"/>
-	<spinner label="Bas" name="height_start_spin_2"/>
-	<spinner label="Bas" name="height_start_spin_3"/>
-	<spinner label="Haut" name="height_range_spin_0"/>
-	<spinner label="Haut" name="height_range_spin_1"/>
-	<spinner label="Haut" name="height_range_spin_2"/>
-	<spinner label="Haut" name="height_range_spin_3"/>
-	<text name="height_text_lbl14">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl15">
-		La valeur Bas correspond à la hauteur max. de la Texture 1,
-	</text>
-	<text name="height_text_lbl16">
-		et la valeur Haut correspond à la hauteur min. de la Texture 4.
-	</text>
-	<button label="Appliquer" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_ed.xml b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
index 29fbe3c7e7..38e5cbe1f1 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Tout sélectionner" name="Select All"/>
 			<menu_item_call label="Désélectionner" name="Deselect"/>
 			<menu_item_call label="Rechercher / Remplacer..." name="Search / Replace..."/>
+			<menu_item_call label="Aller à la ligne..." name="Go to line..."/>
 		</menu>
 		<menu label="Aide" name="Help">
 			<menu_item_call label="Aide..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
index e541fae31f..e541fae31f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
index 751abd6f1d..751abd6f1d 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
index 8febdccbed..8febdccbed 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray.xml b/indra/newview/skins/default/xui/fr/panel_side_tray.xml
deleted file mode 100644
index 178ae4324b..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Activer/désactiver le panneau latéral." name="sidebar_openclose" tab_title="Activer/désactiver le panneau latéral"/>
-	<sidetray_tab description="Domicile." name="sidebar_home" tab_title="Accueil">
-		<panel label="domicile" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me" tab_title="Mon profil">
-		<panel_container name="panel_container">
-			<panel label="Moi" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant près de vous." name="sidebar_people" tab_title="Personnes">
-		<panel_container name="panel_container">
-			<panel label="Profil du groupe" name="panel_group_info_sidetray"/>
-			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trouvez de nouveaux lieux à découvrir et les lieux que vous connaissez déjà." label="Lieux" name="sidebar_places" tab_title="Endroits">
-		<panel label="Lieux" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Parcourez votre inventaire." name="sidebar_inventory" tab_title="Mon inventaire">
-		<panel label="Modifier l&apos;inventaire" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Modifiez votre apparence actuelle." name="sidebar_appearance" tab_title="Mon apparence">
-		<panel label="Changer d&apos;apparence" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
index 45efbdc980..45efbdc980 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/fr/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
index 48bcff1c09..48bcff1c09 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/fr/panel_sidetray_home_tab.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
index 4454d2475e..472c4a5e8f 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_inventory">
 	<text name="title">
-		Enregistrer dans mon inventaire
+		Enregistrer dans l&apos;inventaire
 	</text>
 	<text name="hint_lbl">
-		L&apos;enregistrement d&apos;une image dans votre inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez l&apos;un des formats carrés.
+		L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez un format carré.
 	</text>
 	<combo_box label="Résolution" name="texture_size_combo">
 		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
index 41264521fd..97dc3e7e2b 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_local.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_snapshot_local">
 	<text name="title">
-		Enregistrer sur mon ordinateur
+		Enregistrer sur l&apos;ordinateur
 	</text>
 	<combo_box label="Résolution" name="local_size_combo">
 		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
@@ -25,7 +25,7 @@
 				<combo_box.item label="JPEG" name="JPEG"/>
 				<combo_box.item label="BMP (sans perte)" name="BMP"/>
 			</combo_box>
-			<slider label="Qualité de l&apos;image" name="image_quality_slider"/>
+			<slider label="Qualité image" name="image_quality_slider"/>
 			<text name="image_quality_level">
 				([QLVL])
 			</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
index db3fcbeac9..befe1b3bc6 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
@@ -2,6 +2,6 @@
 <panel name="panel_snapshot_options">
 	<button label="Publier sur le flux de mon profil" name="save_to_profile_btn"/>
 	<button label="Envoyer par e-mail" name="save_to_email_btn"/>
-	<button label="Enregistrer dans mon inventaire ([AMOUNT] L$)" name="save_to_inventory_btn"/>
-	<button label="Enregistrer sur mon ordinateur" name="save_to_computer_btn"/>
+	<button label="Enreg. dans l&apos;inventaire ([AMOUNT] L$)" name="save_to_inventory_btn"/>
+	<button label="Enreg. sur l&apos;ordinateur" name="save_to_computer_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
index bb23b52850..82a4815144 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_postcard.xml
@@ -10,7 +10,7 @@
 		Envoi en cours...
 	</string>
 	<text name="title">
-		Envoyer par e-mail
+		E-mail
 	</text>
 	<button label="Message" name="message_btn"/>
 	<button label="Paramètres" name="settings_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
index 427ffe2113..427ffe2113 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
index 460b269f7c..460b269f7c 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml
index ee4e8a6be6..ee4e8a6be6 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/fr/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index ba36a7d299..ba36a7d299 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
index 81db7c8989..81db7c8989 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_sys_well_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
index cf1266a460..cf1266a460 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/fr/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
index 21eb7ff62c..21eb7ff62c 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
new file mode 100644
index 0000000000..c69cb61a92
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Texture" name="Texture">
+	<panel.string name="string repeats per meter">
+		Répétitions au mètre
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Répétitions par face
+	</panel.string>
+	<text name="color label">
+		Couleur
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	<text name="color trans">
+		% de transparence
+	</text>
+	<text name="glow label">
+		Rayonnement
+	</text>
+	<check_box label="Lumineux" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Matériaux" name="Materials"/>
+		<combo_box.item label="Médias" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Texture (diffuse)" name="Texture (diffuse)"/>
+		<combo_box.item label="Relief (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Brillance (spéculaire)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
+	<text name="label alphamode">
+		Mode alpha
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Aucun" name="None"/>
+		<combo_box.item label="Fusion alpha" name="Alpha blending"/>
+		<combo_box.item label="Masquage alpha" name="Alpha masking"/>
+		<combo_box.item label="Masque émissif" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Coupe du masque
+	</text>
+	<texture_picker label="Texture" name="bumpytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+	<text name="label bumpiness">
+		Relief
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Aucun" name="None"/>
+		<combo_box.item label="Luminosité" name="Brightness"/>
+		<combo_box.item label="Obscurité" name="Darkness"/>
+		<combo_box.item label="aggloméré" name="woodgrain"/>
+		<combo_box.item label="écorce" name="bark"/>
+		<combo_box.item label="briques" name="bricks"/>
+		<combo_box.item label="damier" name="checker"/>
+		<combo_box.item label="béton" name="concrete"/>
+		<combo_box.item label="carrelage" name="crustytile"/>
+		<combo_box.item label="pierre de taille" name="cutstone"/>
+		<combo_box.item label="disques" name="discs"/>
+		<combo_box.item label="gravier" name="gravel"/>
+		<combo_box.item label="boîte de Petri" name="petridish"/>
+		<combo_box.item label="lattes" name="siding"/>
+		<combo_box.item label="carreaux" name="stonetile"/>
+		<combo_box.item label="stuc" name="stucco"/>
+		<combo_box.item label="ventouses" name="suction"/>
+		<combo_box.item label="tissage" name="weave"/>
+	</combo_box>
+	<texture_picker label="Texture" name="shinytexture control" tool_tip="Cliquer pour sélectionner une image."/>
+	<text name="label shininess">
+		Brillance
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Aucune" name="None"/>
+		<combo_box.item label="Faible" name="Low"/>
+		<combo_box.item label="Moyenne" name="Medium"/>
+		<combo_box.item label="Élevée" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Lustrage
+	</text>
+	<text name="label environment">
+		Environnement
+	</text>
+	<text name="label shinycolor">
+		Couleur
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	<text name="media_info">
+		L&apos;URL du média choisi, le cas échéant, se place ici.
+	</text>
+	<button label="Choisir..." name="add_media" tool_tip="Ajouter un média"/>
+	<button label="Supprimer" name="delete_media" tool_tip="Supprimer cette texture de média"/>
+	<button label="Aligner" label_selected="Aligner le média" name="button align" tool_tip="Ajuster la texture du média (le chargement doit d’abord se terminer)"/>
+	<text name="tex gen">
+		Application
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Valeur par défaut" name="Default"/>
+		<combo_box.item label="Plan" name="Planar"/>
+	</combo_box>
+	<spinner label="Échelle horizontale" name="TexScaleU"/>
+	<spinner label="Échelle verticale" name="TexScaleV"/>
+	<spinner label="Répétitions au mètre" name="rptctrl"/>
+	<spinner label="Degrés de rotation" name="TexRot"/>
+	<spinner label="Décalage horizontal" name="TexOffsetU"/>
+	<spinner label="Décalage vertical" name="TexOffsetV"/>
+	<spinner label="Échelle horizontale" name="bumpyScaleU"/>
+	<spinner label="Échelle verticale" name="bumpyScaleV"/>
+	<spinner label="Degrés de rotation" name="bumpyRot"/>
+	<spinner label="Décalage horizontal" name="bumpyOffsetU"/>
+	<spinner label="Décalage vertical" name="bumpyOffsetV"/>
+	<spinner label="Échelle horizontale" name="shinyScaleU"/>
+	<spinner label="Échelle verticale" name="shinyScaleV"/>
+	<spinner label="Degrés de rotation" name="shinyRot"/>
+	<spinner label="Décalage horizontal" name="shinyOffsetU"/>
+	<spinner label="Décalage vertical" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Aligner les faces Plan" name="checkbox planar align" tool_tip="Aligner les textures sur toutes les faces sélectionnées avec la dernière face sélectionnée. Application de la texture Plan requise."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
index a134854706..a134854706 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..e05c93a4ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater">
+	<slider label="Principal" name="System Volume"/>
+	<slider label="Boutons" name="UI Volume"/>
+	<slider label="Ambiant" name="Wind Volume"/>
+	<slider label="Sons" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Activer les sons des gestes."/>
+	<slider label="Musique" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="Activer les flux de musique."/>
+	<slider label="Médias" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="Activer les flux de média."/>
+	<slider label="Voix" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="Activer le chat vocal."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_world_map.xml b/indra/newview/skins/default/xui/fr/panel_world_map.xml
index 972aae1fab..972aae1fab 100644..100755
--- a/indra/newview/skins/default/xui/fr/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 7187de8760..2a68ca0ddb 100644..100755
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation." name="Parcel Identity">
 		<action description="Activer Afficher le lieu dans la recherche et définir la catégorie" longdescription="Activez Afficher le lieu dans la recherche et définissez la catégorie d&apos;une parcelle dans l&apos;onglet À propos du terrain &gt; Options." name="land find places" value="17"/>
-		<action description="Modifier le nom et la description de la parcelle, ainsi que les paramètres d&apos;affichage du lieu dans la recherche" longdescription="Modifiez le nom et la description de la parcelle, ainsi que les paramètres d&apos;affichage du lieu dans la recherche. Pour ce faire, utilisez l&apos;onglet À propos du terrain &gt; Options." name="land change identity" value="18"/>
+		<action description="Changer le nom de la parcelle, la description et les paramètres de contenu modéré" longdescription="Changez le nom de la parcelle, la description et les paramètres de contenu modéré. Pour ce faire, utilisez l&apos;onglet À propos du terrain &gt; Options." name="land change identity" value="18"/>
 		<action description="Définir le lieu d&apos;arrivée et le routage des téléportations" longdescription="Définissez le lieu d&apos;arrivée des téléportations et le routage à partir du menu À propos du terrain &gt; Options." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d&apos;objets et le relief." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
index 5e1ac55a97..5e1ac55a97 100644..100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
index 1b9c832679..1b9c832679 100644..100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
index 95649d3934..e7fc7859c9 100644..100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(inconnu)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(valeur inconnue ou valeurs multiples)
+	</panel.string>
 	<panel.string name="public">
 		(public)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index bd8a39fe16..896dd932e3 100644..100755
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Vous ne pouvez pas modifier ces objets
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Impossible de modifier cet objet au-delà de la frontière d&apos;une région
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Impossible de modifier ces objets au-delà de la frontière d&apos;une région
+	</panel.string>
 	<panel.string name="text modify warning">
 		Cet objet comprend des parties liées
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 			<combo_box.item label="Ouvrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Prix : L$" name="Edit Cost"/>
 		<check_box label="Afficher avec la recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/>
+		<text name="pathfinding_attributes_label">
+			Attributs de recherche de chemin :
+		</text>
 		<text name="B:">
 			B :
 		</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 3eebed450f..78d846ff4f 100644..100755
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,10 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=fr-FR
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
@@ -448,6 +451,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="SLappAgentRequestFriend">
 		Demande d&apos;amitié
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Suppression d&apos;un ami
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Fermer (⌘W)
 	</string>
@@ -622,8 +628,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AvatarAway">
 		Absent
 	</string>
-	<string name="AvatarBusy">
-		Occupé
+	<string name="AvatarDoNotDisturb">
+		Ne pas déranger
 	</string>
 	<string name="AvatarMuted">
 		Bloqué(e)
@@ -838,6 +844,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="multiple_textures">
 		Multiples
 	</string>
+	<string name="use_texture">
+		Utiliser la texture
+	</string>
 	<string name="texture_loading">
 		Chargement...
 	</string>
@@ -859,6 +868,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ST_NO_JOINT">
 		Impossible de trouver ROOT ou JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat près de moi
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat près de moi)
+	</string>
 	<string name="whisper">
 		chuchote :
 	</string>
@@ -886,6 +901,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu le droit de : [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Si vous autorisez un accès à votre compte, vous autorisez également l&apos;objet à :
+	</string>
 	<string name="ScriptTakeMoney">
 		Débiter vos Linden dollars (L$)
 	</string>
@@ -922,6 +940,27 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="NotConnected">
 		Pas connecté(e)
 	</string>
+	<string name="AgentNameSubst">
+		(Vous)
+	</string>
+	<string name="TeleportYourAgent">
+		Vous téléporter
+	</string>
+	<string name="JoinAnExperience">
+		Rejoindre une expérience
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Supprimer les alertes lors de la gestion des listes d&apos;accès aux domaines
+	</string>
+	<string name="OverrideYourAnimations">
+		Remplacer vos animations par défaut
+	</string>
+	<string name="ScriptReturnObjects">
+		Renvoyer les objets de votre part
+	</string>
+	<string name="UnknownScriptPermission">
+		(inconnu)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1000,17 +1039,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="script_files">
 		Scripts
 	</string>
-	<string name="AvatarSetNotAway">
-		Présent
-	</string>
-	<string name="AvatarSetAway">
-		Absent
-	</string>
-	<string name="AvatarSetNotBusy">
-		Pas occupé
-	</string>
-	<string name="AvatarSetBusy">
-		Occupé
+	<string name="dictionary_files">
+		Dictionnaires
 	</string>
 	<string name="shape">
 		Silhouette
@@ -1244,7 +1274,7 @@ Veuillez réessayer de vous connecter dans une minute.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1405,6 +1435,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InvFolder favorite">
 		Mes Favoris
 	</string>
+	<string name="InvFolder Favorites">
+		Mes favoris
+	</string>
+	<string name="InvFolder favorites">
+		Mes favoris
+	</string>
 	<string name="InvFolder Current Outfit">
 		Tenue actuelle
 	</string>
@@ -1420,6 +1456,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="InvFolder Meshes">
 		Maillages
 	</string>
+	<string name="InvFolder Received Items">
+		Articles reçus
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Boîte d&apos;envoi vendeur
+	</string>
 	<string name="InvFolder Friends">
 		Amis
 	</string>
@@ -1950,6 +1992,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD en bas à droite
 	</string>
+	<string name="ATTACH_NECK">
+		Cou
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centre de l&apos;avatar
+	</string>
 	<string name="CursorPos">
 		Ligne [LINE], colonne [COLUMN]
 	</string>
@@ -1968,8 +2016,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
+	<string name="DoNotDisturbModeResponseDefault">
+		Ce résident a activé Ne pas déranger et verra votre message plus tard.
 	</string>
 	<string name="MuteByName">
 		(par nom)
@@ -2082,9 +2130,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenus
-	</string>
 	<string name="AcquiredItems">
 		Objets acquis
 	</string>
@@ -2982,6 +3027,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="Hip Width">
 		Largeur hanche
 	</string>
+	<string name="Hover">
+		Survol
+	</string>
 	<string name="In">
 		Rentré
 	</string>
@@ -3856,7 +3904,13 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Région de type Général
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatars visibles et chat autorisé en dehors de cette parcelle
+		Les avatars à l&apos;extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l&apos;intérieur.
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu&apos;elle n&apos;est pas refigée.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		La recherche de chemin dynamique n&apos;est pas activée dans cette région.
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] - Mise à jour
@@ -3927,6 +3981,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM, sous Préférences/Confidentialité.
 	</string>
+	<string name="OnlineStatus">
+		En ligne
+	</string>
+	<string name="OfflineStatus">
+		Hors ligne
+	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
@@ -3936,6 +3996,9 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Vous avez rejoint l&apos;appel
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Vous avez automatiquement refusé l&apos;appel vocal quand le mode Ne pas déranger était activé.
+	</string>
 	<string name="name_started_call">
 		[NAME] appelle.
 	</string>
@@ -3952,7 +4015,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Connexion en cours...
 	</string>
 	<string name="conference-title">
-		Conférence ad-hoc
+		Chat à plusieurs
 	</string>
 	<string name="conference-title-incoming">
 		Conférence avec [AGENT_NAME]
@@ -4509,7 +4572,7 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 		Backsp
 	</string>
 	<string name="Shift">
-		Shift
+		Maj
 	</string>
 	<string name="Ctrl">
 		Ctrl
@@ -4832,6 +4895,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversations
+	</string>
 	<string name="Command_Compass_Label">
 		Boussole
 	</string>
@@ -4887,7 +4953,7 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 		Parler
 	</string>
 	<string name="Command_View_Label">
-		Paramètres de la caméra
+		Caméra
 	</string>
 	<string name="Command_Voice_Label">
 		Paramètres vocaux
@@ -4907,6 +4973,9 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Tooltip">
 		Parler aux personnes près de vous par chat écrit
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Parler à quelqu&apos;un
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Boussole
 	</string>
@@ -5000,6 +5069,21 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Aucun
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Maillage de navigation affecté
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personnage
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Multiple)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Très faible
 	</string>
@@ -5015,4 +5099,22 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="snapshot_quality_very_high">
 		Très élevée
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Le résident ne peut pas visiter cette région.
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
+	</string>
+	<string name="loading_chat_logs">
+		Chargement...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index d0c74ff353..6065fa2966 100644..100755
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -45,6 +45,9 @@ Pour recommencer le didacticiel, accédez à Welcome Island Public.
 		<message name="no_inventory_host">
 			L&apos;inventaire est temporairement indisponible.
 		</message>
+		<message name="MustGetAgeRegion">
+			Pour accéder à cette région, vous devez avoir au moins 18 ans.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@ Pour recommencer le didacticiel, accédez à Welcome Island Public.
 		<message name="requesting">
 			Demande de téléportation en cours...
 		</message>
+		<message name="pending">
+			En attente de téléportation...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/fr/xui_version.xml
+++ b/indra/newview/skins/default/xui/fr/xui_version.xml
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 39114b7bf7..6f09eca90c 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -8,7 +8,9 @@
 		Generato con [COMPILER] versione [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Tu sei  [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(coordinate globali [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -66,27 +68,26 @@ Versione Server voice: [VOICE_VERSION]
 		</panel>
 		<panel label="Licenze" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index cfc3ad8fdb..fe3e59b0bd 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -470,7 +470,7 @@ Media:
 				Consenti l&apos;accesso solo ai Residenti che:
 			</text>
 			<check_box label="Hanno informazioni di pagamento in archivio [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Per poter visitare questo lotto i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
-			<check_box label="Hanno verificato l&apos;età [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Per poter visitare questo lotto i Residenti devono aver verificato la propria età. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
+			<check_box label="Hanno almeno 18 anni [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Per poter visitare questo lotto i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
 			<check_box label="Permetti accesso al gruppo: [GROUP]" name="GroupCheck" tool_tip="Imposta il gruppo nel pannello generale."/>
 			<check_box label="Vendi pass a:" name="PassCheck" tool_tip="Permetti in questo terreno l&apos;accesso temporaneo"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/it/floater_activeim.xml b/indra/newview/skins/default/xui/it/floater_activeim.xml
index 0c1f0448e1..0c1f0448e1 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/it/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml
index a2bce00141..a2bce00141 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
index a4319f2e77..a4319f2e77 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
deleted file mode 100644
index dc99d287b9..0000000000
--- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Impossibile inizializzare la sequenza
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Il file dell&apos;animazione è lungo [LENGTH] secondi.
-
-La lunghezza massima è [MAX_LENGTH] secondi.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Impossibile leggere il file dell&apos;animazione.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fine prematura del file.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Impossibile leggere la definizione del vincolo.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Impossibile aprire il file BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Intestazione HIERARCHY non valida.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Impossibile trovare la ROOT o JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Impossibile trovare il nome JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Impossibile trovare OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Impossibile trovare CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Impossibile ottenere un ordine di rotazione.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Rotazione dell&apos;asse non disponibile.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Impossibile trovare MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Impossibile ottenere il numero dei frame.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Impossibile ottenere il tempo del frame.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Impossibile ottenere i valori della posizione.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Impossibile ottenere i valori di rotazione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Impossibile aprire il file di traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Impossibile leggere l&apos;intestazione della traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Impossibile leggere i nomi della traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Impossibile leggere la traduzione, ignora il valore.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Impossibile leggere la traduzione del valore relativo.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Valore non trovato.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Impossibile leggere la matrice di traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Impossibile trovare il nome mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Impossibile ottenere il nome mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Impossibile ottenere il valore di priorità.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Impossibile ottenere il valore di ripetizione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossibile ottenere i valori easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Cannot get ease Out values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Impossibile ottenere il valore morph della mano.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Impossibile leggere il nome emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nome non corretto del root joint, usa &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		Nome:
-	</text>
-	<text name="description_label">
-		Descrizione:
-	</text>
-	<spinner label="Priorità" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione"/>
-	<check_box label="Ciclica" name="loop_check" tool_tip="Riproduce questa animazione in ripetizione"/>
-	<spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il punto sul quale ritorna l&apos;animazione"/>
-	<spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il punto sul quale termina l&apos;animazione"/>
-	<text name="hand_label">
-		Postura della mano
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l&apos;animazione">
-		<combo_box.item label="Stendi" name="Spread"/>
-		<combo_box.item label="Rilassato" name="Relaxed"/>
-		<combo_box.item label="Indica entrambi" name="PointBoth"/>
-		<combo_box.item label="Pugno" name="Fist"/>
-		<combo_box.item label="Sinistra rilassata" name="RelaxedLeft"/>
-		<combo_box.item label="Indica sinistra" name="PointLeft"/>
-		<combo_box.item label="Pugno con la sinistra" name="FistLeft"/>
-		<combo_box.item label="Destra rilassata" name="RelaxedRight"/>
-		<combo_box.item label="Indica destra" name="PointRight"/>
-		<combo_box.item label="Pugno destro" name="FistRight"/>
-		<combo_box.item label="Saluta a destra" name="SaluteRight"/>
-		<combo_box.item label="Battitura" name="Typing"/>
-		<combo_box.item label="Pace a destra" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Espressione
-	</text>
-	<combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l&apos;animazione">
-		<item label="(Nessuno)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Spavento" name="Afraid" value="Spavento"/>
-		<item label="Arrabbiato" name="Angry" value="Arrabbiato"/>
-		<item label="Grande sorriso" name="BigSmile" value="Grande sorriso"/>
-		<item label="Annoiato" name="Bored" value="Annoiato"/>
-		<item label="Pianto" name="Cry" value="Pianto"/>
-		<item label="Disdegno" name="Disdain" value="Disdegno"/>
-		<item label="Imbarazzato" name="Embarrassed" value="Imbarazzato"/>
-		<item label="Accigliato" name="Frown" value="Accigliato"/>
-		<item label="Bacio" name="Kiss" value="Bacio"/>
-		<item label="Risata" name="Laugh" value="Risata"/>
-		<item label="Plllppt" name="Plllppt" value="Linguaccia"/>
-		<item label="Repulsione" name="Repulsed" value="Repulsione"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Scrollata di spalle" name="Shrug" value="Scrollata di spalle"/>
-		<item label="Sorriso" name="Smile" value="Sorriso"/>
-		<item label="Stupore" name="Surprise" value="Stupore"/>
-		<item label="Occhiolino" name="Wink" value="Occhiolino"/>
-		<item label="Preoccupato" name="Worry" value="Preoccupato"/>
-	</combo_box>
-	<text name="preview_label">
-		Vedi anteprima mentre
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali.">
-		<item label="In piedi" name="Standing" value="In piedi"/>
-		<item label="Camminando" name="Walking" value="Cammina"/>
-		<item label="Seduto" name="Sitting" value="Seduto"/>
-		<item label="Volo" name="Flying" value="Volo"/>
-	</combo_box>
-	<spinner label="Avvio lento (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/>
-	<spinner label="Arresto lento (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/>
-	<button name="play_btn" tool_tip="Riproduci la tua animazione"/>
-	<button name="pause_btn" tool_tip="Metti in pausa la tua animazione"/>
-	<button label="" name="stop_btn" tool_tip="Ferma la riproduzione dell&apos;animazione"/>
-	<text name="bad_animation_text">
-		Impossibile leggere il file dell&apos;animazione.
-
-Raccomandiamo file di tipo BVH esportati da
-Poser 4.
-	</text>
-	<button label="Importa ([AMOUNT]L$)" name="ok_btn"/>
-	<button label="Annulla" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_auction.xml b/indra/newview/skins/default/xui/it/floater_auction.xml
index 4cad8b744d..4cad8b744d 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_auction.xml
+++ b/indra/newview/skins/default/xui/it/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
new file mode 100755
index 0000000000..559a42cfae
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Impostazioni sostituzione automatica">
+	<check_box label="Attiva sostituzione automatica" name="autoreplace_enable" tool_tip="Quando inserisci testo nella chat, sostituisci le parole chiave inserite con l&apos;elemento sostitutivo corrispondente."/>
+	<button label="Importa lista..." name="autoreplace_import_list" tool_tip="Carica da file una lista esportata in precedenza."/>
+	<button label="Esporta lista..." name="autoreplace_export_list" tool_tip="Salva la lista selezionata in un file per condividerla."/>
+	<button label="Nuova lista..." name="autoreplace_new_list" tool_tip="Crea una nuova lista"/>
+	<button label="Cancella lista" name="autoreplace_delete_list" tool_tip="Cancella la lista selezionata"/>
+	<button name="autoreplace_list_up" tool_tip="Aumenta la priorità di questa lista."/>
+	<button name="autoreplace_list_down" tool_tip="Diminuisci la priorità di questa lista."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Parola chiave" name="keyword"/>
+		<scroll_list.columns label="Sostituzione" name="replacement"/>
+	</scroll_list>
+	<button label="Aggiungi..." name="autoreplace_add_entry"/>
+	<button label="Rimuovi" name="autoreplace_delete_entry"/>
+	<button label="Salva elemento" name="autoreplace_save_entry" tool_tip="Salva questo elemento."/>
+	<button label="Salva modifiche" name="autoreplace_save_changes" tool_tip="Salva tutte le modifiche."/>
+	<button label="Annulla" name="autoreplace_cancel" tool_tip="Annulla tutte le modifiche."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/it/floater_avatar.xml b/indra/newview/skins/default/xui/it/floater_avatar.xml
index d7445cfb2b..d7445cfb2b 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
index 5a542d6a27..5a542d6a27 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
index b6376973cd..b6376973cd 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml
index b7ab265cc2..b7ab265cc2 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/it/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml
index 080e396642..080e396642 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/it/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
index 89f4a0cb71..399eb15802 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/it/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="MODIFICA PERMESSI DEL CONTENUTO">
+<floater name="floaterbulkperms" title="CAMBIA I PERMESSI DEL CONTENUTO">
 	<floater.string name="nothing_to_modify_text">
 		La selezione non contiene nessun contenuto modificabile.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="√ Tutti" label_selected="Tutti" name="check_all"/>
 	<button label="Cancella" label_selected="Nessuno" name="check_none"/>
 	<text name="newperms">
-		Nuovi permessi del contenuto
+		Cambia i permessi del contenuto a
 	</text>
 	<text name="GroupLabel">
 		Gruppo:
@@ -49,6 +49,7 @@
 	<check_box label="Modificare" name="next_owner_modify"/>
 	<check_box label="Copiare" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Trasferisci" name="next_owner_transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Applica" name="apply"/>
 	<button label="Annulla" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml
index ae66148659..ae66148659 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/it/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/it/floater_buy_contents.xml b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
index 84ed85e362..84ed85e362 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
index 743969f557..743969f557 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
index 4a1bf33403..4a1bf33403 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml
index 3940c43a3d..3940c43a3d 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/it/floater_buy_object.xml b/indra/newview/skins/default/xui/it/floater_buy_object.xml
index e7cbd68b38..e7cbd68b38 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
index be03857bc9..be03857bc9 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_camera.xml
+++ b/indra/newview/skins/default/xui/it/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/it/floater_chat_bar.xml b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
index 94c85b50c8..b47e32ce90 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/it/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="CHAT NEI DINTORNI">
+<floater name="nearby_chat" title="CHAT NEI DINTORNI">
 	<panel name="bottom_panel">
 		<line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per parlare, Ctrl+Invio per gridare"/>
 		<button name="show_nearby_chat" tool_tip="Mostra/Nasconde il registro della chat nei dintorni"/>
diff --git a/indra/newview/skins/default/xui/it/floater_choose_group.xml b/indra/newview/skins/default/xui/it/floater_choose_group.xml
index 00f2692295..00f2692295 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/it/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/it/floater_color_picker.xml b/indra/newview/skins/default/xui/it/floater_color_picker.xml
index 38d4a0a037..38d4a0a037 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/it/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
new file mode 100644
index 0000000000..8354824ed1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtro persone" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
new file mode 100644
index 0000000000..d0e9c8ee0e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSAZIONE:">
+	<floater.string name="Title">
+		CONVERSAZIONE: [NAME]
+	</floater.string>
+	<text name="page_label" value="Pagina"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_critical.xml b/indra/newview/skins/default/xui/it/floater_critical.xml
index 82850b0ada..82850b0ada 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_critical.xml
+++ b/indra/newview/skins/default/xui/it/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
index 71071825af..71071825af 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/it/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/it/floater_destinations.xml b/indra/newview/skins/default/xui/it/floater_destinations.xml
index 242403e431..242403e431 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/it/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/it/floater_display_name.xml b/indra/newview/skins/default/xui/it/floater_display_name.xml
index 3e0c43e741..3e0c43e741 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/it/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
index c922b2e4f7..c922b2e4f7 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/it/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
index 571027fd29..571027fd29 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/it/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
index 7bffc60ba2..7bffc60ba2 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/it/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/it/floater_environment_settings.xml b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
index f191078fad..f191078fad 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/it/floater_event.xml b/indra/newview/skins/default/xui/it/floater_event.xml
index b64f429870..b64f429870 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_event.xml
+++ b/indra/newview/skins/default/xui/it/floater_event.xml
diff --git a/indra/newview/skins/default/xui/it/floater_fast_timers.xml b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
index 52ab6b0c3d..52ab6b0c3d 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/it/floater_font_test.xml b/indra/newview/skins/default/xui/it/floater_font_test.xml
index 859c068b11..859c068b11 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/it/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/it/floater_gesture.xml b/indra/newview/skins/default/xui/it/floater_gesture.xml
index b9419ebc22..b9419ebc22 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/it/floater_god_tools.xml b/indra/newview/skins/default/xui/it/floater_god_tools.xml
index 32c79936cf..32c79936cf 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/it/floater_goto_line.xml b/indra/newview/skins/default/xui/it/floater_goto_line.xml
new file mode 100644
index 0000000000..29a4aabb99
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="PASSA ALLA RIGA">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Passa alla riga
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
index 5d3ae04a4d..edbbc354cf 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Attiva VBO:
 	</text>
 	<check_box initial_value="true" label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance.  Ma, su un vecchio hardware, spesso l&apos;implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/>
+	<text name="tc label">
+		Attiva S3TC:
+	</text>
+	<check_box initial_value="true" label="Attiva compressione texture (richiede riavvio)" name="texture compression" tool_tip="Comprime le texture nella memoria video, consentendo il caricamento di texture a risoluzione maggiore al prezzo di ua perdita di qualit&apos; del colore."/>
 	<slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. Utilizza la memoria della scheda video come impostazione predefinita. La riduzione di questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le texture poco definite."/>
 	<spinner label="Indice della distanza  della nebbia:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/it/floater_help_browser.xml b/indra/newview/skins/default/xui/it/floater_help_browser.xml
index 008643afac..008643afac 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/it/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/it/floater_how_to.xml b/indra/newview/skins/default/xui/it/floater_how_to.xml
index 8f0e210571..8f0e210571 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/it/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/it/floater_hud.xml b/indra/newview/skins/default/xui/it/floater_hud.xml
index 437d2d6496..437d2d6496 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_hud.xml
+++ b/indra/newview/skins/default/xui/it/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
index fb8e77b32f..10cf1b7f7e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAZIONI"/>
+<multi_floater name="floater_im_box" title="CONVERSAZIONI">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/>
+					<button name="add_btn" tool_tip="Avvia una nuova conversazione"/>
+					<button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/>
+					<text name="stub_textbox">
+						Questa conversazione in una finestra separata.   [secondlife:/// Ripristina conversazione.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index 3d9d17fc81..71f90accde 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="A" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/>
+	<floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/>
+	<floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/>
+	<floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/>
+	<floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l&apos;elenco dei partecipanti"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/>
+				<button name="voice_call_btn" tool_tip="Apri collegamento voce"/>
+				<button name="close_btn" tool_tip="Termina questa conversazione"/>
+				<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traduci chat" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="A" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml
index ee7be7b155..ee7be7b155 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_import_collada.xml b/indra/newview/skins/default/xui/it/floater_import_collada.xml
index eb4d0c0fdb..eb4d0c0fdb 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/it/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index a95ed44662..566920209d 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		sta chiamando.
+		ti sta chiamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha aderito ad una chiamata in chat vocale in conferenza.
@@ -25,9 +25,9 @@
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
-		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
+		Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente.
 	</text>
-	<button label="Accetta" label_selected="Accetta" name="Accept"/>
-	<button label="Rifiuta" label_selected="Rifiuta" name="Reject"/>
-	<button label="Inizia IM" name="Start IM"/>
+	<button label="Risposta" label_selected="Risposta" name="Accept"/>
+	<button label="Ignora" label_selected="Ignora" name="Reject"/>
+	<button label="Apri invece IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inspect.xml b/indra/newview/skins/default/xui/it/floater_inspect.xml
index bae993d2be..bae993d2be 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/it/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/it/floater_inventory.xml b/indra/newview/skins/default/xui/it/floater_inventory.xml
deleted file mode 100644
index 2aa6795988..0000000000
--- a/indra/newview/skins/default/xui/it/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="IL MIO INVENTARIO">
-	<floater.string name="Title">
-		IL MIO INVENTARIO
-	</floater.string>
-	<floater.string name="TitleFetching">
-		IL MIO INVENTARIO (recupero di [ITEM_COUNT] articoli...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		IL MIO INVENTARIO ([ITEM_COUNT] articoli) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Completato
-	</floater.string>
-	<panel label="Pannello dell&apos;Inventario" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
index 7ed3486b9b..7ed3486b9b 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
index cf790ee62e..cf790ee62e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/it/floater_joystick.xml b/indra/newview/skins/default/xui/it/floater_joystick.xml
index 3d60ded7ab..3d60ded7ab 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/it/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
index f7b2b1ab4a..f7b2b1ab4a 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/it/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/it/floater_land_holdings.xml b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
index 1b2f2605f7..1b2f2605f7 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/it/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
index 0bd2b02323..0bd2b02323 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/it/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
index 47fe2de051..47fe2de051 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/it/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/it/floater_map.xml b/indra/newview/skins/default/xui/it/floater_map.xml
index 5e4e4abca4..5e4e4abca4 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_map.xml
diff --git a/indra/newview/skins/default/xui/it/floater_media_browser.xml b/indra/newview/skins/default/xui/it/floater_media_browser.xml
index 0a8c0f1c41..0a8c0f1c41 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/it/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/it/floater_media_settings.xml b/indra/newview/skins/default/xui/it/floater_media_settings.xml
index d521502a4c..d521502a4c 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml
index 63074d5a4c..63074d5a4c 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/it/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
index 02f257d466..02f257d466 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
index ca36fd2def..e8df4d2d4b 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triangoli" name="triangles" value="Triangoli"/>
 				<text initial_value="Vertici" name="vertices" value="Vertici"/>
 				<text initial_value="Alto" name="high_label" value="Alto"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Medio" name="medium_label" value="Medio"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+					<item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Basso" name="low_label" value="Basso"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+					<item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Bassissimo" name="lowest_label" value="Bassissimo"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+					<item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Genera normali" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/it/floater_model_wizard.xml b/indra/newview/skins/default/xui/it/floater_model_wizard.xml
deleted file mode 100644
index ab5fdb29e4..0000000000
--- a/indra/newview/skins/default/xui/it/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="PROCEDURA GUIDATA CARICA MODELLO">
-	<button label="5. Carica sul server" name="upload_btn"/>
-	<button label="4. Rivedi" name="review_btn"/>
-	<button label="3. Fisica" name="physics_btn"/>
-	<button label="2. Ottimizza" name="optimize_btn"/>
-	<button label="1. Seleziona file" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Seleziona file modello
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Utenti avanzati: Gli utenti che hanno dimestichezza con gli strumenti di creazione 3D possono usare le opzioni di caricamento avanzate.
-			</text>
-			<button label="Passa a modalità avanzata" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Scegli il file del modello da caricare
-			</text>
-			<button label="Sfoglia..." label_selected="Sfoglia..." name="browse"/>
-			<text name="Model types">
-				Second Life supporta file COLLADA (.dae)
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				ATTENZIONE:
-			</text>
-			<text name="warning_text">
-				Non sarà possibile completare il passaggio finale per il caricamento finale di questo modello sui server di Second Life. [secondlife:///app/floater/learn_more Scopri come] impostare l&apos;account per il caricamento di modelli con reticolo.
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Ottimizza modello
-			</text>
-		</panel>
-		<text name="optimize_description">
-			Abbiamo ottimizzato il modello per migliorare le prestazioni. Se necessario, può essere regolato ulteriormente.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Genera livello di dettaglio: Alto
-			</text>
-			<text name="medium_detail_text">
-				Genera livello di dettaglio: Medio
-			</text>
-			<text name="low_detail_text">
-				Genera livello di dettaglio: Basso
-			</text>
-			<text name="lowest_detail_text">
-				Genera livello di dettaglio: Bassissimo
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Ricalcola geometria" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Anteprima geometria
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Molti dettagli
-				</combo_item>
-				<combo_item name="medium">
-					Dettagli medi
-				</combo_item>
-				<combo_item name="low">
-					Meno dettagli
-				</combo_item>
-				<combo_item name="lowest">
-					Dettaglio minimo
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Modifica fisica
-			</text>
-		</panel>
-		<text name="physics_description">
-			Verrà creata una forma per lo scafo esterno del modello. Regola il livello di dettaglio della forma in base al fine desiderato del modello.
-		</text>
-		<panel name="physics_content">
-			<button label="Ricalcola fisica" name="recalculate_physics_btn"/>
-			<button label="Ricalcolo in corso..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Anteprima fisica
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Livello di dettaglio per anteprima rendering">
-				<combo_item name="high">
-					Molti dettagli
-				</combo_item>
-				<combo_item name="medium">
-					Dettagli medi
-				</combo_item>
-				<combo_item name="low">
-					Meno dettagli
-				</combo_item>
-				<combo_item name="lowest">
-					Dettaglio minimo
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				Rivedi
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Impatto sul lotto o sulla regione: [EQUIV] prim equivalenti
-			</text>
-			<text name="review_fee">
-				All&apos;account verrà accreditata una tariffa di caricamento pari a L$ [FEE].
-			</text>
-			<text name="review_confirmation">
-				Facendo clic sul pulsante Carica, confermi di possedere i diritti relativi ai materiali contenuti nel modello.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Caricamento completato
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Il modello è stato caricato.
-		</text>
-		<text name="inventory_text">
-			Puoi trovarlo nella cartella Oggetti nel tuo inventario.
-		</text>
-		<text name="charged_fee">
-			La somma di L$ [FEE] è stata addebitata sul tuo account.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Indietro" name="back"/>
-	<button label="Avanti &gt;&gt;" name="next"/>
-	<button label="Calcolare pesi e tariffa &gt;&gt;" name="calculate"/>
-	<button label="Calcolo in corso..." name="calculating"/>
-	<button label="Carica" name="upload" tool_tip="Carica al simulatore"/>
-	<button label="Annulla" name="cancel"/>
-	<button label="Chiudi" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Pausa
-	</string>
-	<string name="status_parse_error">
-		Problema nell&apos;elaborazione DAE - vedi il registro per informazioni al riguardo.
-	</string>
-	<string name="status_reading_file">
-		Caricamento in corso...
-	</string>
-	<string name="status_generating_meshes">
-		Generazione reticoli...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Errore: numero di vertici maggiore di 65534, annullato.
-	</string>
-	<string name="bad_element">
-		Errore: elemento non valido
-	</string>
-	<string name="high">
-		Alto
-	</string>
-	<string name="medium">
-		Medio
-	</string>
-	<string name="low">
-		Basso
-	</string>
-	<string name="lowest">
-		Bassissimo
-	</string>
-	<string name="mesh_status_good">
-		Invia!
-	</string>
-	<string name="mesh_status_na">
-		N/D
-	</string>
-	<string name="mesh_status_none">
-		Nessuno
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Ai vari livelli del dettaglio corrispondono numeri diversi di faccette con texture.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Ai vari livelli del dettaglio corrispondono numeri diversi istanze di reticoli.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		Troppi vertici per il livello di dettaglio.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Livello di dettaglio minimo mancante.
-	</string>
-	<string name="layer_all">
-		Tutto
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_moveview.xml b/indra/newview/skins/default/xui/it/floater_moveview.xml
index 1237bd06a9..1237bd06a9 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/it/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_mute_object.xml b/indra/newview/skins/default/xui/it/floater_mute_object.xml
index dd1a2b67d7..dd1a2b67d7 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/it/floater_my_appearance.xml b/indra/newview/skins/default/xui/it/floater_my_appearance.xml
index 39ddd6186a..39ddd6186a 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/it/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/it/floater_my_inventory.xml b/indra/newview/skins/default/xui/it/floater_my_inventory.xml
index 0efd9f1c6d..0efd9f1c6d 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/it/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
deleted file mode 100644
index 9e81899880..0000000000
--- a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT NEI DINTORNI">
-	<check_box label="Traduci chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_object_weights.xml b/indra/newview/skins/default/xui/it/floater_object_weights.xml
index fdcb732dee..fdcb732dee 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/it/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/it/floater_openobject.xml b/indra/newview/skins/default/xui/it/floater_openobject.xml
index d8144c7cd5..d8144c7cd5 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/it/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml
index 55bb5adb1e..55bb5adb1e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/it/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml
index cdb180bacd..cdb180bacd 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..5122954edb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personaggi con pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Ricerca personaggi con pathfinding in corso...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Errore rilevato durante la ricerca di personaggi con pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nessun personaggio con pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personaggi selezionati su [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Caricamento in corso]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Sconosciuto]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[gruppo]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome" name="name"/>
+			<scroll_list.columns label="Descrizione" name="description"/>
+			<scroll_list.columns label="Proprietario" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitudine" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personaggi:
+		</text>
+		<button label="Aggiorna lista" name="refresh_objects_list"/>
+		<button label="Seleziona tutto" name="select_all_objects"/>
+		<button label="Non selezionare nessuno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Azioni per i personaggi selezionati:
+		</text>
+		<check_box label="Mostra marcatore" name="show_beacon"/>
+		<check_box label="Mostra capsula fisica" name="show_physics_capsule"/>
+		<button label="Prendi" name="take_objects"/>
+		<button label="Prendi copia" name="take_copy_objects"/>
+		<button label="Teletrasportami alla posizione" name="teleport_me_to_object" tool_tip="Attivato solo se viene selezionato un personaggio."/>
+		<button label="Restituisci" name="return_objects"/>
+		<button label="Elimina" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..77be220a2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Visualizzazione / test pathfinding">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Implementazione libreria percorsi non trovata.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Attendere il caricamento della regione.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Controllo stato navmesh
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Scaricamento navmesh in corso
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Il navmesh è stato cambiato sul server. Scaricamento del navmesh più recente in corso
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Il navmesh più recente è stato scaricato.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Navmesh non scaricato correttamente.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Il navmesh ha modifiche in sospeso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Costruzione navmesh in corso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Alcune regioni navmesh hanno modifiche in sospeso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		La costruzione di alcune regioni navmesh è in corso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Alcune regioni navmesh hanno modifiche in sospeso e in altre la costruzione è in corso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Navmesh è aggiornato.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Implementazione libreria percorsi non trovata.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Seleziona punti iniziale e finale.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Seleziona punto iniziale.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Seleziona punto finale.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Il percorso viene visualizzato con il colore arancione.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Nessun percorso trovato tra i punti selezionati.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Si è verificato un errore durante la generazione del percorso.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Visuale" name="view_panel">
+			<text name="show_label">
+				Mostra:
+			</text>
+			<check_box label="Mondo" name="show_world"/>
+			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
+			<check_box label="Navmesh" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Mostra mappa camminabilità:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Non mostrare" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Personaggio tipo A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Personaggio tipo B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Personaggio tipo C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Personaggio tipo D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Camminabili" name="show_walkables"/>
+			<check_box label="Volumi materiali" name="show_material_volumes"/>
+			<check_box label="Ostacoli statici" name="show_static_obstacles"/>
+			<check_box label="Volumi esclusioni" name="show_exclusion_volumes"/>
+			<check_box label="Piano acqua" name="show_water_plane"/>
+			<check_box label="Con vista a raggi X" name="show_xray"/>
+		</panel>
+		<panel label="Percorso test" name="test_panel">
+			<text name="ctrl_click_label">
+				Seleziona il punto iniziale premendo Ctrl e facendo clic.
+			</text>
+			<text name="shift_click_label">
+				Seleziona il punto finale premendo Maiusc e facendo clic.
+			</text>
+			<text name="character_width_label">
+				Larghezza personaggio
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Tipo personaggio
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Nessuno" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Cancella percorso" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..7edac3ff46
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Set collegati pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Ricerca set collegati pathfinding in corso...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Errore rilevato durante la ricerca di set collegati pathfinding.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modifica set collegati pathfinding selezionati in corso...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Errore rilevato durante la modifica dei set collegati pathfinding selezionati.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nessun set collegato con pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] set collegati selezionati su [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terreno]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Caricamento in corso]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Sconosciuto]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[gruppo]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Sì
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		No
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Sconosciuto
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Camminabile
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Ostacolo statico
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Ostacolo mobile
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volume materiale
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volume esclusione
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Oggetto fantasma mobile
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[non modificabile]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[limitato]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[concavo]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[limitato,concavo]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Seleziona uso set collegati...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtra in base all&apos;uso set collegati..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Camminabile" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Ostacolo statico" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Ostacolo mobile" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volume materiale" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volume esclusione" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Oggetto fantasma mobile" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Applica" name="apply_filters"/>
+		<button label="Cancella" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome (prim principale)" name="name"/>
+			<scroll_list.columns label="Descrizione (prim principale)" name="description"/>
+			<scroll_list.columns label="Proprietario" name="owner"/>
+			<scroll_list.columns label="Scriptato" name="scripted"/>
+			<scroll_list.columns label="Impatto" name="land_impact"/>
+			<scroll_list.columns label="Distanza" name="dist_from_you"/>
+			<scroll_list.columns label="Uso set collegati" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Set collegati:
+		</text>
+		<button label="Aggiorna lista" name="refresh_objects_list"/>
+		<button label="Seleziona tutto" name="select_all_objects"/>
+		<button label="Non selezionare nessuno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Mostra marcatore" name="show_beacon"/>
+		<button label="Prendi" name="take_objects"/>
+		<button label="Prendi copia" name="take_copy_objects"/>
+		<button label="Teletrasportami alla posizione" name="teleport_me_to_object"/>
+		<button label="Restituisci" name="return_objects"/>
+		<button label="Elimina" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Camminabilità:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Camminabilità per personaggi di tipo A. Umanoide è un esempio del tipo di personaggio."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Camminabilità per personaggi di tipo B. Creatura è un esempio del tipo di personaggio."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Camminabilità per personaggi di tipo C. Elemento meccanico è un esempio del tipo di personaggio."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Camminabilità per personaggi di tipo D. Altro è un esempio del tipo di personaggio."/>
+		<button label="Applica modifiche" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Umanoide)
+		</text>
+		<text name="suggested_use_b_label">
+			(Creatura)
+		</text>
+		<text name="suggested_use_c_label">
+			(Elemento meccanico)
+		</text>
+		<text name="suggested_use_d_label">
+			(Altro)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pay.xml b/indra/newview/skins/default/xui/it/floater_pay.xml
index 5753c8c765..5753c8c765 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_pay.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/it/floater_pay_object.xml b/indra/newview/skins/default/xui/it/floater_pay_object.xml
index 8805f3208e..8805f3208e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/it/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/it/floater_people.xml b/indra/newview/skins/default/xui/it/floater_people.xml
index 1acc3cbf19..1acc3cbf19 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_people.xml
+++ b/indra/newview/skins/default/xui/it/floater_people.xml
diff --git a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
index a02b3b5075..a02b3b5075 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/it/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/it/floater_picks.xml b/indra/newview/skins/default/xui/it/floater_picks.xml
index dfc539da66..dfc539da66 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_picks.xml
+++ b/indra/newview/skins/default/xui/it/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/it/floater_places.xml b/indra/newview/skins/default/xui/it/floater_places.xml
index cd46cf8b59..cd46cf8b59 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_places.xml
+++ b/indra/newview/skins/default/xui/it/floater_places.xml
diff --git a/indra/newview/skins/default/xui/it/floater_post_process.xml b/indra/newview/skins/default/xui/it/floater_post_process.xml
index 3aa8b29101..3aa8b29101 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/it/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/it/floater_postcard.xml b/indra/newview/skins/default/xui/it/floater_postcard.xml
deleted file mode 100644
index cb2916268a..0000000000
--- a/indra/newview/skins/default/xui/it/floater_postcard.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="INVIA FOTO VIA E-MAIL">
-	<text name="to_label" width="135">
-		Email del destinatario:
-	</text>
-	<line_editor left="143" name="to_form" width="127"/>
-	<text name="from_label">
-		La tua email:
-	</text>
-	<line_editor left="143" name="from_form" width="127"/>
-	<text name="name_label">
-		Il tuo nome:
-	</text>
-	<line_editor left="143" name="name_form" width="127"/>
-	<text name="subject_label">
-		Soggetto:
-	</text>
-	<line_editor left="143" name="subject_form" width="127"/>
-	<line_editor label="Scrivi il soggetto qui." name="subject_form"/>
-	<text name="msg_label">
-		Messaggio:
-	</text>
-	<text_editor name="msg_form">
-		Scrivi il messaggio qui.
-	</text_editor>
-	<text name="fine_print">
-		Se il tuo destinatario si registrerà in [SECOND_LIFE], riceverai il relativo bonus.
-	</text>
-	<button label="Annulla" name="cancel_btn"/>
-	<button label="Invia" name="send_btn"/>
-	<string name="default_subject">
-		Cartolina da [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Vieni a vedere!
-	</string>
-	<string name="upload_message">
-		Invio...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences.xml b/indra/newview/skins/default/xui/it/floater_preferences.xml
index 7a1d2966ed..7a1d2966ed 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
index 86ea8064b1..86ea8064b1 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/it/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/it/floater_preview_animation.xml b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
index ed609c70fa..ed609c70fa 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
index 2172b9848b..2172b9848b 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
index 7ec229f9d3..7ec229f9d3 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/it/floater_preview_sound.xml b/indra/newview/skins/default/xui/it/floater_preview_sound.xml
index 8eb9573e54..8eb9573e54 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml
index 5b4054514e..5b4054514e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/it/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
index 06c838a981..06c838a981 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/it/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/it/floater_publish_classified.xml b/indra/newview/skins/default/xui/it/floater_publish_classified.xml
index c371e28caa..c371e28caa 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/it/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
index 6efa10290b..6efa10290b 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/it/floater_region_info.xml b/indra/newview/skins/default/xui/it/floater_region_info.xml
index dc2c24ca56..dc2c24ca56 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/it/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/it/floater_report_abuse.xml b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
index eeba54b0ca..eeba54b0ca 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/it/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/it/floater_script_debug.xml b/indra/newview/skins/default/xui/it/floater_script_debug.xml
index 89bf80da5e..89bf80da5e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/it/floater_script_limits.xml b/indra/newview/skins/default/xui/it/floater_script_limits.xml
index 2383b85bb7..2383b85bb7 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/it/floater_script_preview.xml b/indra/newview/skins/default/xui/it/floater_script_preview.xml
index d007774f43..d007774f43 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_script_queue.xml b/indra/newview/skins/default/xui/it/floater_script_queue.xml
index f4117d30a2..f4117d30a2 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/it/floater_script_search.xml b/indra/newview/skins/default/xui/it/floater_script_search.xml
index 3d0b02877e..3d0b02877e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
index ac3dc17aa3..ac3dc17aa3 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_search.xml
+++ b/indra/newview/skins/default/xui/it/floater_search.xml
diff --git a/indra/newview/skins/default/xui/it/floater_select_key.xml b/indra/newview/skins/default/xui/it/floater_select_key.xml
index 014bc76ffb..014bc76ffb 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/it/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml
index 106ae0373c..106ae0373c 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
index 489d52d3b8..489d52d3b8 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index bff6081bdf..bff6081bdf 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/it/floater_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
index 9799b48d89..9799b48d89 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/it/floater_sound_preview.xml b/indra/newview/skins/default/xui/it/floater_sound_preview.xml
index 221e5e5b53..221e5e5b53 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck.xml b/indra/newview/skins/default/xui/it/floater_spellcheck.xml
new file mode 100755
index 0000000000..2a8557b0fc
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Impostazioni controllo ortografico">
+	<check_box label="Attiva controllo ortografico" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Dizionario principale:
+	</text>
+	<text label="Registri:" name="spellcheck_additional">
+		Dizionari aggiuntivi:
+	</text>
+	<text name="spellcheck_available">
+		Disponibile
+	</text>
+	<text name="spellcheck_active">
+		Attivato
+	</text>
+	<button label="Rimuovi" name="spellcheck_remove_btn"/>
+	<button label="Importa..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..c04fc249a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Imposta dizionario">
+	<button label="Sfoglia" label_selected="Sfoglia" name="dictionary_path_browse"/>
+	<button label="Importa" name="ok_btn"/>
+	<button label="Annulla" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
index ad6ef6b54b..825b2ce57a 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris disegnato per secondo" name="ktrissec"/>
 					<stat_bar label="Totale oggetti" name="objs"/>
 					<stat_bar label="Nuovi oggetti" name="newobjs"/>
+					<stat_bar label="Hit rate della cache per l&apos;oggetto" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Hit rate della cache" name="texture_cache_hits"/>
+					<stat_bar label="Latenza di lettura della cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Conteggio" name="numimagesstat"/>
 					<stat_bar label="Conteggio grezzo" name="numrawimagesstat"/>
 					<stat_bar label="Memoria GL" name="gltexmemstat"/>
@@ -44,6 +47,12 @@
 					<stat_bar label="Oggetti a basso LOD" name="physicslodtasks"/>
 					<stat_bar label="Memoria allocata" name="physicsmemoryallocated"/>
 				</stat_view>
+				<stat_bar label="Script eseguiti" name="simpctscriptsrun"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="Tempo passaggio AI" name="simsimaistepmsec"/>
+					<stat_bar label="Passaggi silhouette saltati" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personaggi aggiornati" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_view label="Tempo (ms)" name="simperf">
 					<stat_bar label="Tempo totale Frame" name="simframemsec"/>
 					<stat_bar label="Tempo netto" name="simnetmsec"/>
diff --git a/indra/newview/skins/default/xui/it/floater_sys_well.xml b/indra/newview/skins/default/xui/it/floater_sys_well.xml
index e1c0b89902..e1c0b89902 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/it/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml
index 15312a8959..15312a8959 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/it/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml
index b479d5f6d6..b479d5f6d6 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/it/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml
index 23da6f7588..23da6f7588 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/it/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index 7b77584ba0..27a17868a7 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="PREFERITO: TEXTURE">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Clicca per scegliere l&apos;immagine
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Scegli:
+	</floater.string>
 	<text name="Multiple">
 		Texture multiple
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventario" name="inventory" value="0"/>
+		<radio_item label="Locale" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Dimensioni: [DIMENSIONS]
 	</text>
 	<button label="Default" label_selected="Default" name="Default"/>
-	<button label="Niente" label_selected="Niente" name="None"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
-	<check_box label="Mostra cartelle" name="show_folders_check"/>
-	<search_editor label="Filtro texture" name="inventory search editor"/>
-	<check_box label="Applica adesso" name="apply_immediate_check"/>
-	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
+	<button label="Niente" label_selected="Niente" name="None"/>
+	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Anteprima disattivata"/>
+	<filter_editor label="Filtro texture" name="inventory search editor"/>
+	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
+	<button label="Aggiungi" label_selected="Aggiungi" name="l_add_btn"/>
+	<button label="Rimuovi" label_selected="Rimuovi" name="l_rem_btn"/>
+	<button label="Carica" label_selected="Carica" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nome" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Scegli:
-	</string>
+	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..49b6453319
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Debugger recupero texture">
+	<text name="total_num_fetched_label">
+		1, Numero totale di texture recuperate: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Numero totale di richieste di recupero: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Numero totale di recuperi dalla cache: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Numero totale di texture visibili: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Numero totale di richieste di fetching texture visibili: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Numero totale di fetching dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Numero totale di dati visibili: [SIZE1] KB, Dati decodificati: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Numero totale di rendering dei dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tempo totale letture cache: [TIME] secondi
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tempo totale scrittura cache: [TIME] secondi
+	</text>
+	<text name="total_time_decode_label">
+		11, Tempo totale decodifica: [TIME] secondi
+	</text>
+	<text name="total_time_gl_label">
+		12, Tempo totale creazione texture gl: [TIME] secondi
+	</text>
+	<text name="total_time_http_label">
+		13, Tempo totale fetching HTTP: [TIME] secondi
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tempo totale complessivo fetching: [TIME] secondi
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Nuovo fetching elementi visibili dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, Nuovo fetching di tutte le texture dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, Nuovo fetching elementi visibili da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, Nuovo fetching di tutte le texture da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<spinner label="19, Rapporto Texel/Pixel:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, Fonte texture:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Cache + HTTP" name="0"/>
+		<radio_item label="Solo HTTP" name="1"/>
+	</radio_group>
+	<button label="Attiva" name="start_btn"/>
+	<button label="Reimposta" name="clear_btn"/>
+	<button label="Chiudi" name="close_btn"/>
+	<button label="Lettura cache" name="cacheread_btn"/>
+	<button label="Scrittura cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodifica" name="decode_btn"/>
+	<button label="Texture GL" name="gl_btn"/>
+	<button label="Nuovo fetch visibili cache" name="refetchviscache_btn"/>
+	<button label="Nuovo fetching di tutta la cache" name="refetchallcache_btn"/>
+	<button label="Nuovo fetch visibili HTTP" name="refetchvishttp_btn"/>
+	<button label="Nuovo fetching di tutto il contenuto HTTP" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index c963ac72e6..468f284ccb 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -149,6 +149,12 @@
 			<panel.string name="text modify info 4">
 				Non puoi modificare questi oggetti
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Questo oggetto non può essere modificato attraverso il confine di una regione
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Questi oggetti non possono essere modificati attraverso il confine di una regione
+			</panel.string>
 			<panel.string name="text modify warning">
 				Devi selezionare tutto l&apos;oggetto per impostare i permessi
 			</panel.string>
@@ -204,12 +210,12 @@
 				<combo_box.item label="Ingrandisci" name="Zoom"/>
 			</combo_box>
 			<check_box label="In vendita:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copia" name="Copy"/>
 				<combo_box.item label="Contenuto" name="Contents"/>
 				<combo_box.item label="Originale" name="Original"/>
 			</combo_box>
-			<spinner label="Prezzo: L$" name="Edit Cost"/>
 			<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l&apos;oggetto sia visibile nella ricerca"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -245,6 +251,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Attributi pathfinding:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Oggetto" name="Object">
 			<check_box label="Bloccato" name="checkbox locked" tool_tip="Previene lo spostamento o la cancellazione dell&apos;oggetto. Spesso utile mentre si costruisce per evitare involontarie modifiche."/>
@@ -459,16 +470,11 @@
 				<combo_box.item label="Cerchi rialzati" name="suction"/>
 				<combo_box.item label="Trama" name="weave"/>
 			</combo_box>
-			<check_box initial_value="falso" label="Allinea facce planari" name="checkbox planar align" tool_tip="Allinea le texture su tutte le facce selezionate con l’ultima faccia selezionata. È richiesta la mappatura planare delle texture."/>
-			<text name="rpt">
-				Ripetizioni / Faccia
-			</text>
 			<spinner label="Orizzontale (U)" name="TexScaleU"/>
 			<check_box label="Inverti" name="checkbox flip s"/>
 			<spinner label="Verticale (V)" name="TexScaleV"/>
 			<check_box label="Inverti" name="checkbox flip t"/>
 			<spinner label="Rotazione˚" name="TexRot"/>
-			<spinner label="Ripetizioni / Metro" name="rptctrl"/>
 			<button label="Applica" label_selected="Applica" name="button apply"/>
 			<text name="tex offset">
 				Bilanciamento della texture
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
index 7d062db23b..d8ca7f4438 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Ora
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Ora &apos;Mono&apos;
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Oggetti con maggiori collisioni
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nome" name="name" width="84"/>
 		<scroll_list.columns label="Proprietario" name="owner" width="84"/>
 		<scroll_list.columns label="Ubicazione" name="location" width="84"/>
+		<scroll_list.columns label="Lotto" name="parcel"/>
 		<scroll_list.columns label="Ora" name="time" width="84"/>
-		<scroll_list.columns label="Ora (Mono)" name="mono_time" width="84"/>
 		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="Memoria (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID oggetto:
@@ -51,6 +49,10 @@
 	</text>
 	<line_editor font="SansSerifSmall" left="90" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn" width="150"/>
+	<text name="parcel_name_text">
+		Lotto:
+	</text>
+	<button label="Filtra" name="filter_parcel_btn"/>
 	<button label="Aggiorna" name="refresh_btn" width="150"/>
 	<button label="Restituisci selezionato" name="return_selected_btn" width="150"/>
 	<button label="Restituisci tutti" left="170" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml
index 28a2dfdda2..28a2dfdda2 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_tos.xml
+++ b/indra/newview/skins/default/xui/it/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/it/floater_toybox.xml b/indra/newview/skins/default/xui/it/floater_toybox.xml
index 269e2831d0..269e2831d0 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/it/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/it/floater_translation_settings.xml b/indra/newview/skins/default/xui/it/floater_translation_settings.xml
index a0a34da723..a0a34da723 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/it/floater_url_entry.xml b/indra/newview/skins/default/xui/it/floater_url_entry.xml
index 9ad1a0dce5..9ad1a0dce5 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/it/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..b168d067c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE">
+	<slider label="Chat vocale" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
index 77973eef1e..77973eef1e 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index c83b11f698..f102622f5d 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE">
+<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
 	<string name="no_voice_effect">
 		(Nessuna manipolazione voce)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
new file mode 100644
index 0000000000..eaeda7597f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME VOCE">
+	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_web_content.xml b/indra/newview/skins/default/xui/it/floater_web_content.xml
index 5603e85417..5603e85417 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/it/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml
index 9abc968b94..9abc968b94 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml
index 036b74b7d9..fef423aefe 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/it/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Imposta dimensione finestra:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="larghezza x altezza">
-		<combo_box.item label="1000 x 700 (default)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (predefinito)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Imposta" name="set_btn"/>
 	<button label="Annulla" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_world_map.xml b/indra/newview/skins/default/xui/it/floater_world_map.xml
index 8da17a4034..8da17a4034 100644..100755
--- a/indra/newview/skins/default/xui/it/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/it/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/it/inspect_avatar.xml b/indra/newview/skins/default/xui/it/inspect_avatar.xml
index 6f52aaef74..6f52aaef74 100644..100755
--- a/indra/newview/skins/default/xui/it/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/it/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/it/inspect_group.xml b/indra/newview/skins/default/xui/it/inspect_group.xml
index 2416f4bb12..2416f4bb12 100644..100755
--- a/indra/newview/skins/default/xui/it/inspect_group.xml
+++ b/indra/newview/skins/default/xui/it/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml
index d8ab10cfda..d8ab10cfda 100644..100755
--- a/indra/newview/skins/default/xui/it/inspect_object.xml
+++ b/indra/newview/skins/default/xui/it/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/it/inspect_remote_object.xml b/indra/newview/skins/default/xui/it/inspect_remote_object.xml
index b2d96ad757..b2d96ad757 100644..100755
--- a/indra/newview/skins/default/xui/it/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/it/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/it/language_settings.xml b/indra/newview/skins/default/xui/it/language_settings.xml
index 5f448fa828..5f448fa828 100644..100755
--- a/indra/newview/skins/default/xui/it/language_settings.xml
+++ b/indra/newview/skins/default/xui/it/language_settings.xml
diff --git a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml
index 46abd7deed..46abd7deed 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
index d4d6fd68d0..d4ce25e6a5 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Congela" name="Freeze..."/>
 	<menu_item_call label="Espelli" name="Eject..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Profilo dell&apos;oggetto" name="Object Inspect"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_self.xml b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
index 0b841d591f..b28137262f 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Lascia" name="Drop"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml
index b93b695300..b93b695300 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
index c2edc32a49..a2b864b3e1 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Congela" name="Freeze..."/>
 	<menu_item_call label="Espelli" name="Eject..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
 	<menu_item_call label="Paga" name="Pay..."/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
index a4dafd7b5f..3666571065 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="I miei gruppi" name="Groups..."/>
 	<menu_item_call label="Il mio profilo" name="Profile..."/>
 	<menu_item_call label="Debug delle texture" name="Debug..."/>
+	<menu_item_call label="Dump XML" name="Dump XML"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_bottomtray.xml b/indra/newview/skins/default/xui/it/menu_bottomtray.xml
deleted file mode 100644
index ddd6909136..0000000000
--- a/indra/newview/skins/default/xui/it/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Pulsante Parla" name="EnableVoiceChat"/>
-	<menu_item_check label="Tasto Gesture" name="ShowGestureButton"/>
-	<menu_item_check label="Tasto Movimento" name="ShowMoveButton"/>
-	<menu_item_check label="Tasto Visuale" name="ShowCameraButton"/>
-	<menu_item_check label="Tasto Foto" name="ShowSnapshotButton"/>
-	<menu_item_check label="Pulsante Costruisci" name="ShowBuildButton"/>
-	<menu_item_check label="Pulsante Cerca" name="ShowSearchButton"/>
-	<menu_item_check label="Pulsante Mappa" name="ShowWorldMapButton"/>
-	<menu_item_check label="Pulsante Mini mappa" name="ShowMiniMapButton"/>
-	<menu_item_call label="Taglia" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copia" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Incolla" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Elimina" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Seleziona tutto" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
index 699490c8f1..699490c8f1 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
index 1e3658ef45..1e3658ef45 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
index 1e16ce8ed1..1e16ce8ed1 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
index 10524ba92d..984e4a1611 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
new file mode 100644
index 0000000000..24486f2af2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
+	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
+	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
+	<menu_item_call label="Chiudi selezionato" name="close_selected_conversations"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca voce" name="block_unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+	<menu_item_call label="Profilo del gruppo" name="group_profile"/>
+	<menu_item_call label="Attiva gruppo" name="activate_group"/>
+	<menu_item_call label="Lascia il gruppo" name="leave_group"/>
+	<context_menu label="Opzioni moderatore" name="Moderator Options">
+		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
+		<menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
+		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..5686a902eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Chiamata a voce..." name="Call"/>
+	<menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/>
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="Invite"/>
+	<menu_item_call label="Mappa" name="Map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..73b05831ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
+	<menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/>
+	<menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_edit.xml b/indra/newview/skins/default/xui/it/menu_edit.xml
index ffb20a02e9..ffb20a02e9 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_edit.xml
+++ b/indra/newview/skins/default/xui/it/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/it/menu_favorites.xml b/indra/newview/skins/default/xui/it/menu_favorites.xml
index 7813ef44b5..7813ef44b5 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/it/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml
index 7cfcc6287e..7cfcc6287e 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_group_plus.xml b/indra/newview/skins/default/xui/it/menu_group_plus.xml
index 3b76fb94a9..3b76fb94a9 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/it/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
index 48f6691fd8..48f6691fd8 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/it/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
new file mode 100644
index 0000000000..1621d57e12
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Aggiungi come amico" name="Add Friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Offri teleport" name="offer_teleport"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Cronologia chat..." name="chat_history"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca voce" name="Block/Unblock"/>
+	<menu_item_check label="Blocca testo" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..350fbc5c6f
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Vista compatta" name="compact_view"/>
+	<menu_item_check label="Vista espansa" name="expanded_view"/>
+	<menu_item_check label="Mostra orario" name="IMShowTime"/>
+	<menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_well_button.xml b/indra/newview/skins/default/xui/it/menu_im_well_button.xml
deleted file mode 100644
index 9e471b771c..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Chiudi tutto" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml
index f78ed8489f..f78ed8489f 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/it/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml
index baa4e671b0..baa4e671b0 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/it/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml
index 2eacbb09ad..2eacbb09ad 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/it/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
index 1f10734c4a..1f10734c4a 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
index 4740c9bf67..4740c9bf67 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
index 4f62ccaa9c..4f62ccaa9c 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml
index 471640eff5..471640eff5 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/it/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/it/menu_inventory.xml b/indra/newview/skins/default/xui/it/menu_inventory.xml
index 4bf6be82fd..b31e35771d 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="Elimina la cartella di sistema" name="Delete System Folder"/>
 	<menu_item_call label="Inizia la conferenza chat" name="Conference Chat Folder"/>
 	<menu_item_call label="Esegui" name="Sound Play"/>
+	<menu_item_call label="Copia SLurl" name="url_copy"/>
 	<menu_item_call label="Informazioni sul punto di riferimento" name="About Landmark"/>
 	<menu_item_call label="Riproduci in Second Life" name="Animation Play"/>
 	<menu_item_call label="Esegui localmente" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_add.xml b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
index 62da61cd6b..62da61cd6b 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
index 3d64e4da4e..3d64e4da4e 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/it/menu_land.xml b/indra/newview/skins/default/xui/it/menu_land.xml
index f510078e14..816849a7b5 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_land.xml
+++ b/indra/newview/skins/default/xui/it/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Acquista Permesso" name="Land Buy Pass"/>
 	<menu_item_call label="Costruisci" name="Create"/>
 	<menu_item_call label="Modifica terreno" name="Edit Terrain"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_landmark.xml b/indra/newview/skins/default/xui/it/menu_landmark.xml
index b3cddab783..b3cddab783 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/it/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 7b060e6565..35053ec499 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -17,7 +17,13 @@
 		<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
 		<menu_item_call label="Mostra messaggio critico" name="Critical"/>
 		<menu_item_call label="Test debug finestra contenuti Web" name="Web Content Floater Debug Test"/>
-		<menu label="Imposta livello di registrazione" name="Set Logging Level"/>
+		<menu label="Imposta livello di registrazione" name="Set Logging Level">
+			<menu_item_check label="Debug" name="Debug"/>
+			<menu_item_check label="Info" name="Info"/>
+			<menu_item_check label="Attenzione" name="Warning"/>
+			<menu_item_check label="Errore" name="Error"/>
+			<menu_item_check label="Nessuno" name="None"/>
+		</menu>
 		<menu_item_check label="Mostra selettore griglia" name="Show Grid Picker"/>
 		<menu_item_call label="Mostra Console notifiche" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
index aa9e583f8e..aa9e583f8e 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/it/menu_mini_map.xml b/indra/newview/skins/default/xui/it/menu_mini_map.xml
index 561b80e046..561b80e046 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/it/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/it/menu_mode_change.xml b/indra/newview/skins/default/xui/it/menu_mode_change.xml
deleted file mode 100644
index 499dcf1873..0000000000
--- a/indra/newview/skins/default/xui/it/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Di base" name="BasicMode"/>
-	<menu_item_check label="Avanzata" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
index 5012e6450f..5012e6450f 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/it/menu_mute_particle.xml b/indra/newview/skins/default/xui/it/menu_mute_particle.xml
new file mode 100644
index 0000000000..7eb4b09495
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_navbar.xml b/indra/newview/skins/default/xui/it/menu_navbar.xml
index e42d913a6f..e42d913a6f 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/it/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml
index 719a6d3261..719a6d3261 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
index 8c82e30f0e..8c82e30f0e 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/it/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index a172cf3b26..9bcc0879d2 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -10,6 +10,8 @@
 	<menu_item_call label="Alzati" name="Object Stand Up"/>
 	<menu_item_call label="Profilo dell&apos;oggetto" name="Object Inspect"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
+	<menu_item_call label="Mostra nei set collegati" name="show_in_linksets"/>
+	<menu_item_call label="Mostra nei personaggi" name="show_in_characters"/>
 	<context_menu label="Metti" name="Put On">
 		<menu_item_call label="Indossa" name="Wear"/>
 		<menu_item_call label="Aggiungi" name="Add"/>
@@ -26,4 +28,5 @@
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Acquista" name="Buy..."/>
 	<menu_item_call label="Elimina" name="Delete"/>
+	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 0f347b1a90..9623775af4 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
 	<menu_item_call label="Blocca..." name="Block"/>
+	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
+	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 09fc867d7c..3ac0c5ce69 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Nuovi capelli" name="New Hair"/>
 		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Apri tutte le cartelle" name="expand"/>
+	<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
index 8166cf20ed..8166cf20ed 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/it/menu_participant_list.xml b/indra/newview/skins/default/xui/it/menu_participant_list.xml
index 1b057c4077..1b057c4077 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/it/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml
new file mode 100644
index 0000000000..c87cda57bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferenze chat..." name="chat_preferences"/>
+	<menu_item_call label="Preferenze privacy..." name="privacy_preferences"/>
+	<menu_item_check label="Registro conversazioni..." name="Conversation"/>
+	<menu_item_check label="Traduci chat vicina" name="Translate_chat"/>
+	<menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..e9955923b2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Sblocca" name="unblock"/>
+	<menu_item_call label="Profilo..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..cbcf084b86
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..fc80c73ae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Ordina in base al tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
new file mode 100644
index 0000000000..972e359cfe
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
+	<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
index 3a799f44eb..3a799f44eb 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
index 30a97a1c72..8ca7537ee0 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Mostra informazioni" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Chiamata a voce" name="Call"/>
 	<menu_item_call label="Attiva" name="Activate"/>
 	<menu_item_call label="Chiudi" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
new file mode 100644
index 0000000000..56b9abbd3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
index d31ddaf1aa..d31ddaf1aa 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index a974bd181d..1c09b1cfe2 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Aggiungi amico" name="Add Friend"/>
-	<menu_item_call label="Rimuovi amico" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Mappa" name="Map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Vedi profilo" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
+	<menu_item_call label="Chiamata a voce" name="voice_call"/>
+	<menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/>
+	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
+	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
+	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
+	<menu_item_call label="Zoom avanti" name="zoom_in"/>
+	<menu_item_call label="Mappa" name="map"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
index e0b9ceb63d..b9ce70167f 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Aggiungi amici" name="Add Friends"/>
-	<menu_item_call label="Rimuovi amici" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Chiama" name="Call"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
+	<menu_item_call label="Aggiungi amici" name="add_friends"/>
+	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Chiama" name="call"/>
+	<menu_item_call label="Condividi" name="share"/>
+	<menu_item_call label="Paga" name="pay"/>
+	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..223d88fee1
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+	<menu_item_check label="Mostra mappa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
index 2b5c235706..2b5c235706 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
new file mode 100644
index 0000000000..fc6213bd08
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
+	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
+	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
index 7fccd1621a..7fccd1621a 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/it/menu_picks.xml b/indra/newview/skins/default/xui/it/menu_picks.xml
index 000d219ed0..000d219ed0 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_picks.xml
+++ b/indra/newview/skins/default/xui/it/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/it/menu_picks_plus.xml b/indra/newview/skins/default/xui/it/menu_picks_plus.xml
index 7fbd5abd57..7fbd5abd57 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/it/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/it/menu_place.xml b/indra/newview/skins/default/xui/it/menu_place.xml
index 5381a4effa..5381a4effa 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_place.xml
+++ b/indra/newview/skins/default/xui/it/menu_place.xml
diff --git a/indra/newview/skins/default/xui/it/menu_place_add_button.xml b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
index 0e783c0000..0e783c0000 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/it/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
index 23757d47e0..23757d47e0 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/it/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
index a458b1a768..a458b1a768 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/it/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml
index 56b695c597..56b695c597 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/it/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/it/menu_save_outfit.xml b/indra/newview/skins/default/xui/it/menu_save_outfit.xml
index 4882a8ac64..4882a8ac64 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/it/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml
index 604f754ba8..604f754ba8 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/it/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/it/menu_slurl.xml b/indra/newview/skins/default/xui/it/menu_slurl.xml
index be83133efc..be83133efc 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/it/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml
index 409a62c31b..409a62c31b 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
index 81053fbd65..81053fbd65 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml
index c221f141a6..c221f141a6 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/it/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml
index 4636ce9929..5b61da914e 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/it/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(sconosciuto)" name="Suggestion 1"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 2"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 3"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 4"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 5"/>
+	<menu_item_call label="Aggiungi al dizionario" name="Add to Dictionary"/>
+	<menu_item_call label="Aggiungi per ignorare" name="Add to Ignore"/>
 	<menu_item_call label="Taglia" name="Cut"/>
 	<menu_item_call label="Copia" name="Copy"/>
 	<menu_item_call label="Incolla" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/it/menu_toolbars.xml b/indra/newview/skins/default/xui/it/menu_toolbars.xml
index 604ca763d1..604ca763d1 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/it/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/it/menu_topinfobar.xml b/indra/newview/skins/default/xui/it/menu_topinfobar.xml
index 0beb9314de..0beb9314de 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/it/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index 37755d5749..e5c20fb9e9 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra profilo residente" name="show_agent"/>
+	<menu_item_call label="Vedi profilo" name="show_agent"/>
+	<menu_item_call label="Manda IM..." name="send_im"/>
+	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
+	<menu_item_call label="Togli amicizia..." name="remove_friend"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_group.xml b/indra/newview/skins/default/xui/it/menu_url_group.xml
index d9a792ebdf..d9a792ebdf 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_http.xml b/indra/newview/skins/default/xui/it/menu_url_http.xml
index e0153d9169..e0153d9169 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_inventory.xml b/indra/newview/skins/default/xui/it/menu_url_inventory.xml
index a45a6bbc10..a45a6bbc10 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_map.xml b/indra/newview/skins/default/xui/it/menu_url_map.xml
index cb7935b3ed..cb7935b3ed 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 763e65f17c..116b652172 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostra informazioni oggetto" name="show_object"/>
+	<menu_item_call label="Profilo oggetto..." name="show_object"/>
+	<menu_item_call label="Blocca..." name="block_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_url_parcel.xml b/indra/newview/skins/default/xui/it/menu_url_parcel.xml
index a032c33585..a032c33585 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_slapp.xml b/indra/newview/skins/default/xui/it/menu_url_slapp.xml
index b368aa9141..b368aa9141 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_slurl.xml b/indra/newview/skins/default/xui/it/menu_url_slurl.xml
index 355c7dbed9..355c7dbed9 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/it/menu_url_teleport.xml b/indra/newview/skins/default/xui/it/menu_url_teleport.xml
index c129e61f25..c129e61f25 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 99b7e3c4e6..52247d6c9c 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Stato" name="Status">
-			<menu_item_call label="Assente" name="Set Away"/>
-			<menu_item_call label="Non disponibile" name="Set Busy"/>
+			<menu_item_check label="Assente" name="Away"/>
+			<menu_item_check label="Non disturbare" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Acquista L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/>
@@ -28,17 +28,25 @@
 		<menu_item_call label="Preferenze..." name="Preferences"/>
 		<menu_item_call label="Pulsanti barra strumenti..." name="Toolbars"/>
 		<menu_item_call label="Nascondi tutti i controlli" name="Hide UI"/>
+		<menu_item_check label="Mostra elementi HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
-		<menu_item_check label="Chat..." name="Nearby Chat"/>
+		<menu_item_check label="Conversazioni..." name="Conversations"/>
+		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
-		<menu_item_check label="Impostazioni voce..." name="Nearby Voice"/>
-		<menu_item_check label="Manipolazione voce..." name="ShowVoice"/>
+		<menu_item_check label="Registro conversazioni..." name="Conversation Log..."/>
+		<menu label="Manipolazione voce" name="VoiceMorphing">
+			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
+			<menu_item_check label="Anteprima..." name="Preview"/>
+			<menu_item_call label="Abbonati..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gesture..." name="Gestures"/>
-		<menu_item_call label="Amici" name="My Friends"/>
-		<menu_item_call label="Gruppi" name="My Groups"/>
-		<menu_item_call label="Persone vicine" name="Active Speakers"/>
+		<menu_item_check label="Amici" name="My Friends"/>
+		<menu_item_check label="Gruppi" name="My Groups"/>
+		<menu_item_check label="Persone vicine" name="Active Speakers"/>
+		<menu_item_call label="Blocca lista" name="Block List"/>
+		<menu_item_check label="Non disturbare" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Mondo" name="World">
 		<menu_item_call label="Crea punto di riferimento per questo luogo" name="Create Landmark Here"/>
@@ -107,13 +115,13 @@
 			<menu_item_call label="Includi parte successiva" name="Include Next Part"/>
 			<menu_item_call label="Includi parte precedente" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Set collegati..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Ingrandisci selezione" name="Focus on Selection"/>
 		<menu_item_call label="Zoom sulla selezione" name="Zoom to Selection"/>
 		<menu label="Oggetto" name="Object">
 			<menu_item_call label="Acquista" name="Menu Object Buy"/>
 			<menu_item_call label="Prendi" name="Menu Object Take"/>
 			<menu_item_call label="Prendi copia" name="Take Copy"/>
-			<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/>
 		</menu>
@@ -124,6 +132,12 @@
 			<menu_item_call label="Imposta gli script come in esecuzione" name="Set Scripts to Running"/>
 			<menu_item_call label="Imposta script come non in esecuzione" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="Opzioni" name="Options">
 			<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
 			<menu_item_check label="Seleziona solo i miei oggetti" name="Select Only My Objects"/>
@@ -152,6 +166,13 @@
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Istruzioni..." name="How To"/>
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
+		<menu_item_call label="Guida dell&apos;utente" name="User’s guide"/>
+		<menu_item_call label="Base di conoscenza" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forum della comunità" name="Community Forums"/>
+		<menu_item_call label="Portale assistenza" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
 		<menu_item_call label="Segnala abuso" name="Report Abuse"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
@@ -174,7 +195,6 @@
 			<menu_item_check label="Nascondi particelle" name="Hide Particles"/>
 			<menu_item_check label="Nascondi selezionati" name="Hide Selected"/>
 			<menu_item_check label="Evidenzia trasparenza" name="Highlight Transparent"/>
-			<menu_item_check label="Mostra elementi HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Mostra mirino visuale soggettiva" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Modalità di rendering" name="Rendering Types">
@@ -226,11 +246,10 @@
 			<menu_item_check label="Console texture" name="Texture Console"/>
 			<menu_item_check label="Console di Debug" name="Debug Console"/>
 			<menu_item_call label="Console notifiche" name="Notifications"/>
-			<menu_item_check label="Console dimensioni texture" name="Texture Size"/>
-			<menu_item_check label="Console categoria texture" name="Texture Category"/>
 			<menu_item_check label="Timer veloci" name="Fast Timers"/>
 			<menu_item_check label="Memoria" name="Memory"/>
 			<menu_item_check label="Statistiche scena" name="Scene Statistics"/>
+			<menu_item_call label="Console di debug recupero texture" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Informazioni regione sulla console di debug" name="Region Info to Debug Console"/>
 			<menu_item_check label="Fotocamera" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
@@ -260,6 +279,7 @@
 			<menu_item_check label="Spostamento fotocamera" name="Camera Offset"/>
 			<menu_item_check label="Veloc. di visualizzazione casuale" name="Randomize Framerate"/>
 			<menu_item_check label="Test frame" name="Frame Test"/>
+			<menu_item_call label="Profilo frame" name="Frame Profile"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
 			<menu_item_check label="Normali" name="Normals"/>
@@ -271,18 +291,24 @@
 			<menu_item_check label="Complessità rendering" name="rendercomplexity"/>
 			<menu_item_check label="Byte collegamento" name="attachment bytes"/>
 			<menu_item_check label="Scolpisci" name="Sculpt"/>
+			<menu label="Densità texture" name="Texture Density">
+				<menu_item_check label="Nessuna" name="None"/>
+				<menu_item_check label="Attuale" name="Current"/>
+				<menu_item_check label="Desiderata" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
+			<menu_item_call label="Info materiale selezionato" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Luci e ombre" name="Lighting and Shadows"/>
+			<menu_item_check label="Modello illuminazione avanzato" name="Advanced Lighting Model"/>
 			<menu_item_check label="Ombra dal sole, dalla luna e dai proiettori" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e ombre fluide" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Maschera alfa automatica (differita)" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="Maschera alfa automatica (non differita)" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Texture delle animazioni" name="Animation Textures"/>
 			<menu_item_check label="Disabilita texture" name="Disable Textures"/>
-			<menu_item_check label="Atlante tessitura (sperimentale)" name="Texture Atlas"/>
 			<menu_item_check label="Rendering delle luci unite" name="Render Attached Lights"/>
 			<menu_item_check label="Rendering particelle unite" name="Render Attached Particles"/>
 			<menu_item_check label="Gli oggetti brillano quando sono sotto il cursore" name="Hover Glow Objects"/>
@@ -301,7 +327,6 @@
 			<menu_item_call label="Test browser multimedia" name="Web Browser Test"/>
 			<menu_item_call label="Browser contenuto Web" name="Web Content Browser"/>
 			<menu_item_call label="Stampa informazioni oggetto selezionato" name="Print Selected Object Info"/>
-			<menu_item_call label="Statistiche memoria" name="Memory Stats"/>
 			<menu_item_check label="Console di debug regione" name="Region Debug Console"/>
 			<menu_item_check label="Debug clic" name="Debug Clicks"/>
 			<menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/>
@@ -325,9 +350,14 @@
 				<menu_item_call label="Alterna la geometria dei personaggi" name="Toggle Character Geometry"/>
 				<menu_item_check label="Consenti selezione avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocità animazione" name="Animation Speed">
+				<menu_item_call label="Accelera tutte le animazioni del 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="Rallenta tutte le animazioni del 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="Ripristina la velocità di tutte le animazioni" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Forza i parametri sui valori predefiniti" name="Force Params to Default"/>
 			<menu_item_check label="Informazioni sull&apos;animazione" name="Animation Info"/>
-			<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
 			<menu_item_check label="Disabilita livello di dettaglio" name="Disable LOD"/>
 			<menu_item_check label="Mostra schemi collisione" name="Show Collision Skeleton"/>
 			<menu_item_check label="Mostra bersaglio" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
index c9a02d8a86..c9a02d8a86 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/it/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
index de25f88aca..de25f88aca 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
index 4a5366091f..4a5366091f 100644..100755
--- a/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/it/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/it/mime_types.xml b/indra/newview/skins/default/xui/it/mime_types.xml
index 5eda7a5752..5eda7a5752 100644..100755
--- a/indra/newview/skins/default/xui/it/mime_types.xml
+++ b/indra/newview/skins/default/xui/it/mime_types.xml
diff --git a/indra/newview/skins/default/xui/it/mime_types_linux.xml b/indra/newview/skins/default/xui/it/mime_types_linux.xml
index 3bc30b507a..3bc30b507a 100644..100755
--- a/indra/newview/skins/default/xui/it/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/it/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/it/mime_types_mac.xml b/indra/newview/skins/default/xui/it/mime_types_mac.xml
index 3bc30b507a..3bc30b507a 100644..100755
--- a/indra/newview/skins/default/xui/it/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/it/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 0e6fee60d1..96b8c96595 100644..100755
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -204,6 +210,14 @@ Aggiungi questo potere a &apos;[ROLE_NAME]&apos;?
 Aggiungi questo potere a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="No" yestext="Si"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Stai per espellere [AVATAR_NAME] dal gruppo.
+		<usetemplate ignoretext="Conferma l&apos;espulsione di un partecipante dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Stai per espellere [COUNT] membri dal gruppo.
+		<usetemplate ignoretext="Conferma l&apos;espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Stai per abbandonare il tuo accessorio.
     Vuoi continuare?
@@ -360,13 +374,19 @@ Inserisci il Nome utente del tuo avatar.
 
 Devi avere un account per entrare in [SECOND_LIFE]. Vuoi crearne uno adesso?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=it-IT
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Immetti il nome utente oppure sia il nome che il cognome del tuo avatar nel campo del nome utente, quindi effettua nuovamente l&apos;accesso.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; non è un identificatore di griglia valido.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		La tua posizione iniziale non ha specificato una griglia valida.
+	</notification>
 	<notification name="DeleteClassified">
 		Cancella annuncio &apos;[NAME]&apos;?
 Non ci sono rimborsi per la tariffa pagata.
@@ -492,6 +512,33 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="L&apos;hardware di questo computer non è compatibile" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.intel.com/p/it_IT/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://support.amd.com/it/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.nvidia.it/Download/index.aspx?lang=it
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -589,6 +636,9 @@ Puoi unire al massimo [MAX] oggetti.
 
 Accertati che nessuno sia bloccato e che li possiedi tutti.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Gli oggetti non possono essere collegati attraverso i confini.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Impossibile unire perche non tutti gli oggetti hanno lo stesso proprietario.
 
@@ -968,6 +1018,41 @@ Offri l&apos;amicizia a [NAME]?
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
+	<notification label="Aggiungi lista di sostituzione automatica" name="AddAutoReplaceList">
+		Nome per la nuova lista:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Rinomina lista di sostituzione automatica" name="RenameAutoReplaceList">
+		Il nome &apos;[DUPNAME]&apos; è già in uso
+    Inserisci un nuovo nome univoco:
+		<form name="form">
+			<button name="ReplaceList" text="Sostituisci lista corrente"/>
+			<button name="SetName" text="Usa nuovo nome"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		La parola chiave deve essere una sola parola e la sostituzione non può essere vuota.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		L&apos;elenco di sostituzione non è valido.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Devi specificare un file, un nome e una lingua.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Sembra che il dizionario [DIC_NAME] non includa un file &quot;aff&quot;; ciò indica che di tratta di un dizionario &quot;secondario&quot;.
+Può essere usato come dizionario aggiuntivo, ma non come dizionario principale.
+
+Vedi https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Copia non eseguita da
+    [FROM_NAME]
+    a
+    [TO_NAME]
+	</notification>
 	<notification label="Salva vestiario" name="SaveOutfitAs">
 		Salva gli abiti che indosso come nuovo vestiario:
 		<form name="form">
@@ -1033,7 +1118,7 @@ su TUTTI I TERRENI di questa sim?
 Introduci un prezzo più alto.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Almeno uno degli oggetti selezionati è collegato tramite link ad altri oggetti.  Se elimini l&apos;oggetto, i relativi link non funzioneranno più.  Pertanto si consiglia vivamente di eliminare prima i link.
+		Almeno uno degli oggetti è collegato tramite link ad altri oggetti.  Se elimini l&apos;oggetto, i relativi link non funzioneranno più.  Si consiglia vivamente di eliminare prima i link.
 
 Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
@@ -1051,9 +1136,9 @@ Confermi di voler cancellare questi elementi?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		Non possiedi neanche uno degli oggetti selezionati.
+		Non possiedi almeno uno degli oggetti selezionati.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1065,24 +1150,24 @@ Confermi di voler cancellare questi elementi?
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
 		Almeno un oggetto è bloccato.
-Non possiedi neanche un oggetto.
+Non possiedi almeno uno degli oggetti.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Cancella" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Almeno un oggetto non è copiabile.
-Non possiedi neanche un oggetto.
+		Almeno un oggetto non può essere copiato.
+Non possiedi almeno uno degli oggetti.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
 		Almeno un oggetto è bloccato.
-Almeno un oggetto è non copiabile.
-Non possiedi neanche un oggetto.
+Almeno un oggetto non può essere copiato.
+Non possiedi almeno uno degli oggetti.
 
-Confermi di voler cancellare questi elementi?
+Sei sicuro di volere eliminare gli oggetti?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
@@ -1148,7 +1233,7 @@ a &apos;[THIS_GPU]&apos;
 Sei stato trasferito in una regione vicina.
 	</notification>
 	<notification name="AvatarMovedLast">
-		La tua ultima posizione non è al momento disponibile.
+		La posizione richiesta non è al momento disponibile.
 Sei stato trasferito in una regione vicina.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1167,8 +1252,7 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno
 		L&apos;installazione di [APP_NAME] è terminata.
 
 Se questa è la prima volta che usi [SECOND_LIFE], devi creare un account prima che tu possa effettuare l&apos;accesso.
-Vuoi tornare a [http://join.secondlife.com secondlife.com] per creare un nuovo account?
-		<usetemplate name="okcancelbuttons" notext="Continua" yestext="Nuovo Account..."/>
+		<usetemplate name="okcancelbuttons" notext="Continua" yestext="Crea account..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Ci sono problemi di connessione. È possibile che ci siano problemi con la tua connessione Internet oppure sulla [SECOND_LIFE_GRID].
@@ -1405,13 +1489,43 @@ Versione [VERSION] [[RELEASE_NOTES_FULL_URL] Informazioni su questo aggiornament
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		È stato scaricato un aggiornamento obbligatorio del software.
-Versione [VERSION]
+Versione [VERSION] [[INFO_URL] Informazioni su questo aggiornamento]
 
 Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+[[INFO_URL] Informazioni su questo aggiornamento]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		È stato scaricato un aggiornamento dell&apos;installazione di [APP_NAME].
+Versione [VERSION] 
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] per informazioni su queesto aggiornamento]
+		<usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		È stato scaricato un aggiornamento dell&apos;installazione di [APP_NAME].
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
+		<usetemplate name="okcancelbuttons" notext="Più tardi..." yestext="Installa ora e riavvia [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		È stato scaricato un aggiornamento obbligatorio del software.
+Versione [VERSION]
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
+
+Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
+Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
+vedi [[INFO_URL] Informazioni su questo aggiornamento]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1462,6 +1576,10 @@ Per installare l&apos;aggiornamento è necessario riavviare [APP_NAME].
 Lasciare il gruppo?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Impossibile abbandonare il gruppo. Non puoi abbandonare il gruppo perché sei l&apos;ultimo proprietario del gruppo. Devi prima assegnare a un altro membro il ruolo di proprietario.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Vuoi veramente espellere tutti i residenti dalla griglia?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli tutti i residenti"/>
@@ -1490,10 +1608,13 @@ Vuoi cancellare quell&apos;elemento?
 		Impossibile offrire l&apos;amicizia in questo momento. Riprova fra poco.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		È stata impostata la modalità Non disponibile.
-La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino.
-		<usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Non disturbare è attivo.  Non riceverai la notifica delle comunicazioni in arrivo.
+
+- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze &gt; Generali).
+- Le offerte di teleport verranno rifiutate.
+- Le chiamate voce verranno rifiutate.
+		<usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l&apos;offerta.
@@ -1689,83 +1810,128 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Non sei ammesso in questa regione a causa della tua categoria di accesso. Questo può risultare da una mancanza di informazioni necessarie per convalidare la tua età.
-
-Verifica di avere installato l&apos;ultima versione del programma e vai alla Knowledge Base per ulteriori informazioni su come accedere nelle zone con tale categoria di accesso.
+		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Non sei ammesso in questa regione a causa della tua categoria d&apos;accesso. 
-
-Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di accesso?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Non posso entrare in questa regione a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/>
+		<usetemplate ignoretext="Attraversamento regione: la regione che cerchi di visitare include contenuti accessibili solo ad adulti." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Non sei ammesso in questa regione a causa della tua categoria d&apos;accesso.
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Non ti è consentito entrare in quella regione a causa della categoria di accesso impostata nelle preferenze.
-
-Per entrare nella regione, dovrai modificare la tua categoria di accesso. Ciò ti consentirà inoltre di effettuare ricerche di contenuti di categoria [REGIONMATURITY]. Per annullare le modifiche in un secondo momento, vai a Io &gt; Preferenze &gt; Generali.
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le tue preferenze o annullare. Dopo aver modificato le preferenze, prova nuovamente ad entrare nella regione.
 		<form name="form">
-			<button name="OK" text="Cambia preferenza"/>
-			<button default="true" name="Cancel" text="Chiudi"/>
-			<ignore name="ignore" text="La categoria di accesso impostata mi impedisce di entrare in una regione"/>
+			<button name="OK" text="Modifica preferenze"/>
+			<button default="true" name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Attraversamento regione: La regione che cerchi di visitare include contenuti esclusi nelle preferenze."/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Si è verificato un problema con il teleport a causa di un errore di sincronizzazione delle preferenze con il server.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Teleport: la regione che cerchi di visitare include contenuti accessibili solo ad adulti." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le preferenze e continuare con il teleport oppure annullarlo.
+		<form name="form">
+			<button name="OK" text="Modifica e continua"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Teleport (riavviabile): La regione che cerchi di visitare include contenuti esclusi nelle preferenze."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le tue preferenze o annullare il teleport. Dopo aver modificato le preferenze, prova nuovamente a teletrasportarti nella regione.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Teleport (non riavviabile): La regione che cerchi di visitare include contenuti esclusi nelle preferenze."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Si è verificato un problema con il teleport a causa di un errore di sincronizzazione delle preferenze con il server.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		La tua categoria di accesso attuale è [RATING].
+		Non riceverai più notifiche se stai per visitare una regione con contenuti [RATING].   In futuro potrai modificare le preferenze relative ai contenuti selezionando Io &gt; Preferenze &gt; Generale nella barra del menu.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Non è stato possibile modificare le preferenze per visualizzare contenuti [PREFERRED_MATURITY].  le preferenze sono state ripristinate per consentire la visualizzazione di contenuti [ACTUAL_MATURITY].  Puoi cercare di modificare nuovamente le preferenze selezionando Io &gt; Preferenze &gt; Generale nella barra del menu.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Non puoi prendere possesso di questo terreno a causa della tua categoria di accesso. Questo può essere dovuto ad una mancanza di informazioni valide che confermino la tua età.
-
-Verifica di avere installato l&apos;ultima versione del programma e vai alla Knowledge Base per informazioni sull&apos;accesso ad aree con queste categorie di accesso.
+		Il terreno che desideri richiedere ha una categoria di accesso maggiore di quella indicata nelle preferenze.   Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Non puoi prendere possesso di questa terra a causa delle preferenze sulle categorie di accesso. 
-
-Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di accesso?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Solo gli adulti possono richiedere questo terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Non posso richiedere questo terreno a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/>
+		<usetemplate ignoretext="Solo gli adulti possono richiedere questo terreno." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Non puoi prendere possesso di questa terra a causa della tua categoria di accesso.
+		Il terreno che desideri richiedere include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Il terreno che cerchi di richiedere include contenuti [REGIONMATURITY], accessibili solo ad adulti.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Non puoi richiedere questo terreno a causa della tua categoria di accesso.
-
-Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io &gt; Preferenze &gt; Generale.
-		<usetemplate ignoretext="Le mie preferenze di categoria di accesso mi impediscono di richiedere terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/>
+		Il terreno che desideri richiedere include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le preferenze e quindi cercare di richiedere nuovamente il terreno.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Il terreno che cerchi di richiedere include contenuti esclusi nelle preferenze."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Non puoi acquistare questo terreno a causa della tua categoria di accesso. Questo può essere dovuto ad una mancanza di informazioni valide che confermino la tua età.
-
-Verifica di avere installato l&apos;ultima versione del programma e vai alla Knowledge Base per informazioni sull&apos;accesso ad aree con queste categorie di accesso.
+		Il terreno che desideri acquistare ha una categoria di accesso maggiore di quella indicata nelle preferenze.   Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Non puoi acquistare questo terreno a causa della tua categoria di accesso. 
-
-Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di accesso?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Solo gli adulti possono acquistare questo terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Non posso acquistare questo terreno a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/>
+		<usetemplate ignoretext="Solo gli adulti possono acquistare questo terreno." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Non puoi acquistare questa land a causa della tua categoria di accesso.
+		Il terreno che cerchi di acquistare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Il terreno che cerchi di acquistare include contenuti [REGIONMATURITY], accessibili solo ad adulti.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Non puoi acquistare questo terreno a causa della tua categoria di accesso.
-
-Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io &gt; Preferenze &gt; Generale.
-		<usetemplate ignoretext="Le mie Preferenze di accesso mi impediscono di acquistare terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/>
+		Il terreno che cerchi di acquistare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le preferenze e quindi cercare di acquistare nuovamente il terreno.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Il terreno che cerchi di acquistare include contenuti esclusi nelle preferenze."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Hai selezionato troppi prim.  Seleziona non più di [MAX_PRIM_COUNT] prim e riprova
@@ -1820,10 +1986,9 @@ Pubblica questo annuncio adesso per [AMOUNT]L$?
 		</form>
 	</notification>
 	<notification label="Cambiato il contenuto Moderato" name="RegionMaturityChange">
-		La classificazione di questa regione è stata aggiornata.
-Un periodo di tempo è necessario prima che la modifica venga integrata nella mappa.
-
-Per accedere a regioni per adulti, i residenti devono avere un Account verificato, mediante verifica dell&apos;età oppure mediante verifica della modalità di pagamento.
+		La classificazione di questa regione è stata modificata.
+Prima che questa modifica venga integrata nella mappa potrebbe essere necessario un po&apos; di tempo.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Versione voice non compatibile" name="VoiceVersionMismatch">
 		Questa versione di [APP_NAME] non è compatibile con la funzionalità di chat vocale in questa regione. Affinché la chat vocale funzioni correttamente, dovrai aggiornare [APP_NAME].
@@ -1937,6 +2102,10 @@ Trasferisci gli elementi nell&apos;inventario?
 		Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account?
 		<usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione.  Tutti i partecipanti riceveranno notifiche per la nuova conversazione.
+		<usetemplate ignoretext="Conferma l&apos;aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Confermi di voler uscire?
 		<usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/>
@@ -2011,14 +2180,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 			<button ignore="Never Replace" name="No" text="Annulla"/>
 		</form>
 	</notification>
-	<notification label="Avviso di &apos;Occupato&apos;" name="BusyModePay">
-		Sei in modalità &apos;Occupato&apos;, ciò significa che non riceverai ciò che attendi per questo pagamento.
+	<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
+		Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
 
-Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
+Vuoi disattivare la modalità Non disturbare prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="OK"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Abbandona"/>
+			<ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/>
+			<button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/>
+			<button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2114,14 +2283,11 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 		<usetemplate ignoretext="Indossare gli abiti che creo mentre modifico il mio aspetto" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Per accedere ai contenuti e alle aree per adulti in Second Life devi avere almeno 18 anni. Visita la pagina di verifica dell&apos;età per confermare di avere almeno 18 anni. 
-Verrà avviato il browser Web.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="Annulla" yestext="Passa alla verifica dell&apos;età"/>
+		Il luogo che desideri visitare è limitato a persone di almeno 18 anni di età.
+		<usetemplate ignoretext="Non ho l&apos;età necessaria per visitare aree limitate." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Posizione limitata a persone maggiori di 18 anni di età.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Per poter visitare questa zona devi avere devi aver fornito informazioni di pagamento a Linden Lab.  Vuoi andare sul sito di [SECOND_LIFE] ed impostarle?
@@ -2156,11 +2322,8 @@ Verrà avviato il browser Web.
 	<notification name="GroupNotice">
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
@@ -2280,9 +2443,7 @@ Seleziona solo un oggetto.
     scegliere Teleport.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Per contattare Residenti come &apos;[NAME]&apos;, clicca sul pulsante &quot;Persone&quot;, seleziona un Residente nel pannello che viene aperto, quindi clicca su &apos;IM&apos; in
-    basso nel pannello.
-    (Puoi anche fare doppio clic sul nome nell&apos;elenco oppure fare clic con il pulsante destro del mouse e selezionare &apos;IM&apos;).
+		Per avviare una conversazione privata con un&apos;altra persona, fai clic con il tasto destro sull&apos;avatar e seleziona &apos;IM&apos; dal menu.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Non è possibile selezionare il terreno attraverso i confini del server.
@@ -2382,6 +2543,16 @@ Qui non puoi volare.
 	<notification name="NoBuild">
 		In questa zona è proibita la costruzione. Qui non puoi costruire né rezzare oggetti.
 	</notification>
+	<notification name="PathfindingDirty">
+		La regione ha modifiche di pathfinding in sospeso.  Se hai le autorizzazioni necessarie per la costruzione puoi eseguire il rebake facendo clic sul pulsante “Rebake regione”.
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		Il pathfinding dinamico non è attivato in questa regione.  Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Si è verificato un errore.  Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione.  A volte il problema viene risolto uscendo ed eseguendo nuovamente l&apos;accesso.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		In questo lotto non si possono vedere avatar e chat di testo presenti in altri lotti.   Non puoi vedere altri residenti fuori dal lotto e loro non possono vederti.  Viene bloccata anche la normale chat di testo sul canale 0.
 	</notification>
@@ -2400,9 +2571,7 @@ Qui funzionano soltanto gli script del proprietario del terreno.
 		Puoi solo richiedere terreni pubblici nella regione in cui sei posizionato.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Non puoi entrare in quella regione a causa della tua categoria di accesso. Può essere necessario validare l&apos;età e/o installare l&apos;ultima versione del programma.
-
-Visita la Knowledge Base per informazioni sull&apos;accesso alle aree con queste categorie di accesso.
+		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Tu hai l&apos;accesso bloccato a questa regione.
@@ -2413,8 +2582,11 @@ Visita la Knowledge Base per informazioni sull&apos;accesso alle aree con queste
 	<notification name="ImproperPaymentStatus">
 		Non hai una impostazioni di pagamento corrette per entrare in questa regione.
 	</notification>
+	<notification name="MustGetAgeRegion">
+		Per poter entrare in questa regione devi avere almeno 18 anni.
+	</notification>
 	<notification name="MustGetAgeParcel">
-		Devi essere di età verificata per entrare in questa terra.
+		Per poter entrare in questo lotto devi avere almeno 18 anni.
 	</notification>
 	<notification name="NoDestRegion">
 		Non è stata trovata nessuna regione di destinazione.
@@ -2516,12 +2688,33 @@ Riprova tra qualche istante.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teleport"/>
 			<button name="Cancel" text="Cancella"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Questa regione include contenuti [REGION_CONTENT_MATURITY], ma le tue preferenze attuali escludono i contenuti  [REGION_CONTENT_MATURITY].  Puoi modificare le preferenze e continuare con il teleport oppure annullarlo.
+		<form name="form">
+			<button name="Teleport" text="Modifica e continua"/>
+			<button name="Cancel" text="Annulla"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Questa regione include però contenuti accessibili solo agli adulti.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Offerta di Teleport inviata a [TO_NAME]
 	</notification>
@@ -2616,16 +2809,21 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un oggetto di nome &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, posseduto da  &apos;[NAME]&apos; vorrebbe:
-
-[QUESTIONS]
-Se non ti fidi di questo oggetto e del suo ideatore, dovresti rifiutare la richiesta.
-
-Concedi questa richiesta?
+		Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+  
+Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
-			<button name="Grant" text="Accetta"/>
+			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
-			<button name="Details" text="Dettagli..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		L&apos;autorizzazione per script runtime richiesta da &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, un oggetto di proprietà di &apos;[NAME]&apos;, non è stata riconosciuta nel viewer e non può essere concessa.
+
+Per concedere questa autorizzazione è necessario che il viewer venga aggiornato alla versione più recente da [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="Ok"/>
+			<button name="Mute" text="Blocca"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2929,6 +3127,10 @@ Hai caricato una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; do
 		( In esistenza da [EXISTENCE] secondi)
 Hai aggiornato localmente una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; dopo [TIME] secondi.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Non possiamo mostrare un&apos;anteprima di questa texture perché non ne è consentita la copia e/o il trasferimento.
+		<usetemplate ignoretext="Avvisami se la modalità Anteprima dal vivo non è disponibile per texture per cui non è consentita la copia e/o il trasferimento." name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Sei sicuro di volere uscire dalla chiamata?
 		<usetemplate ignoretext="Conferma prima di uscire dalla chiamata" name="okcancelignore" notext="No" yestext="Sì"/>
@@ -3100,6 +3302,62 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
 		Questa azione cancellerà tutte le voci di menu e i pulsanti. Per visualizzarli nuovamente cliccare ancora [SHORTCUT].
 		<usetemplate ignoretext="Conferma prima di nascondere l&apos;interfaccia" name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		L&apos;indicatore oggetto fantasma di alcuni set collegati verrà commutato.
+
+Vuoi continuare?
+		<usetemplate ignoretext="L&apos;indicatore oggetto fantasma di alcuni set collegati verrà commutato." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Alcuni set collegati selezionati non possono essere impostati su &apos;[REQUESTED_TYPE]&apos; a causa di limitazioni nelle autorizzazioni per i set collegati.  Questi set collegati verranno invece impostati su &apos;[RESTRICTED_TYPE]&apos;.
+
+Vuoi continuare?
+		<usetemplate ignoretext="Alcuni set collegati selezionati non possono essere impostati a causa di limitazioni nelle autorizzazioni per i set collegati." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Alcuni set collegati selezionati non possono essere impostati a &apos;[REQUESTED_TYPE]&apos; perché la forma è non-convessa.
+
+Vuoi continuare?
+		<usetemplate ignoretext="Alcuni set collegati selezionati non possono essere impostati perché la forma è non-convessa." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		L&apos;indicatore oggetto fantasma di alcuni set collegati verrà commutato.
+
+Alcuni set collegati selezionati non possono essere impostati su &apos;[REQUESTED_TYPE]&apos; a causa di limitazioni nelle autorizzazioni per i set collegati.  Questi set collegati verranno invece impostati su &apos;[RESTRICTED_TYPE]&apos;.
+
+Vuoi continuare?
+		<usetemplate ignoretext="L&apos;indicatore oggetto fantasma per alcuni set collegati selezionati verrà commutato, mentre quello degli altri non può essere impostato a causa di limitazioni nelle autorizzazioni per i set collegati." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		L&apos;indicatore oggetto fantasma di alcuni set collegati verrà commutato.
+
+Alcuni set collegati selezionati non possono essere impostati a &apos;[REQUESTED_TYPE]&apos; perché la forma è non-convessa.
+
+Vuoi continuare?
+		<usetemplate ignoretext="L&apos;indicatore oggetto fantasma per alcuni set collegati selezionati verrà commutato, mentre quello degli altri non può essere impostato perché la forma è non-convessa." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Alcuni set collegati selezionati non possono essere impostati su &apos;[REQUESTED_TYPE]&apos; a causa di limitazioni nelle autorizzazioni per i set collegati.  Questi set collegati verranno invece impostati su &apos;[RESTRICTED_TYPE]&apos;.
+
+Alcuni set collegati selezionati non possono essere impostati a &apos;[REQUESTED_TYPE]&apos; perché la forma è non-convessa. Il tipo di utilizzo di questi set collegati non cambierà.
+
+Vuoi continuare?
+		<usetemplate ignoretext="Alcuni set collegati selezionati non possono essere impostati a causa delle limitazioni nelle autorizzazioni per il set collegato e perché la forma è non-convessa." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		L&apos;indicatore oggetto fantasma di alcuni set collegati verrà commutato.
+
+Alcuni set collegati selezionati non possono essere impostati su &apos;[REQUESTED_TYPE]&apos; a causa di limitazioni nelle autorizzazioni per i set collegati.  Questi set collegati verranno invece impostati su &apos;[RESTRICTED_TYPE]&apos;.
+
+Alcuni set collegati selezionati non possono essere impostati a &apos;[REQUESTED_TYPE]&apos; perché la forma è non-convessa. Il tipo di utilizzo di questi set collegati non cambierà.
+
+Vuoi continuare?
+		<usetemplate ignoretext="L&apos;indicatore oggetto fantasma per alcuni set collegati selezionati verrà commutato, mentre quello degli altri non può essere impostato a causa delle limitazioni nelle autorizzazioni per il set collegato e perché la forma è non-convessa." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		L&apos;oggetto selezionato influenza il navmesh.  Se lo si trasforma in un percorso flessibile verrà rimosso dal navmesh.
+		<usetemplate ignoretext="L&apos;oggetto selezionato influenza il navmesh.  Se lo si trasforma in un percorso flessibile verrà rimosso dal navmesh." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Non sembra che tu abbia i requisiti hardware adeguati per [APP_NAME]. [APP_NAME] richiede una scheda grafica OpenGL con supporto multitexture. Se ne hai una in dotazione, accertati di avere i driver, i service pack e i patch più recenti per la scheda grafica e per il sistema operativo.
 
@@ -3124,4 +3382,653 @@ In alternativa, puoi guardare sulla mappa e trovare luoghi segnalati come &quot;
 	<global name="You died and have been teleported to your home location">
 		Sei deceduto e sei stato teleportato a casa tua.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] non è stato aggiornato perché il file non è stato più trovato.
+Gli aggiornamenti futuri per questo file sono disattivati.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] non è stato aperto o decodificato dopo [NRETRIES] tentativi, viene considerato danneggiato.
+Gli aggiornamenti futuri per questo file sono disattivati.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentativo di aggiungere un file immagine [FNAME] non valido o non leggibile che non è stato possibile aprire o decodificare.
+Tentativo annullato.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Stai per restituire [NUM_ITEMS] elementi.  Vuoi continuare?
+		<usetemplate ignoretext="Sei sicuro di volere restituire più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
+		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelato.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] ti ha scongelato.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar scongelato.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		La congelazione non ha avuto successo perché non hai le autorizzazioni dell&apos;amministratore per quel lotto.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Non sei più congelato, puoi continuare.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Non puoi congelare quell&apos;utente.
+	</notification>
+	<notification name="NowOwnObject">
+		Sei ora il proprietario dell&apos;oggetto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Non puoi rezzare l&apos;oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno.  Usa lo strumento terreno per visualizzare a chi appartiene il terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Oggetto non razzato perché ci sono troppe richieste.
+	</notification>
+	<notification name="SitFailCantMove">
+		Non puoi sederti perché al momento non puoi muoverti.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Non puoi sederti perché non ti è consentito entrare in quel terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Proba ad avvicinarti.  Non puoi sederti su un oggetto perché
+non è nella stessa regione in cui ti trovi.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Impossibile creare il nuovo oggetto. La regione è piena.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Non puoi creare alberi ed erba su terreni che non sono di tua proprietà.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Copia non riuscita perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; non può essere trasferito a te.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; contribuisce al navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicato senza oggetto principale selezionato.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Impossibile duplicare gli oggetti perché la regione è piena.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Impossibile creare l&apos;oggetto perché 
+il lotto è pieno.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Tentativo di rezzare un oggetto non riuscito.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Impossibile creare un oggetto che ha causato problemi in questa regione.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		L&apos;oggetto dell&apos;inventario è stato aggiunto alla blacklist.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Ricerca terreno bloccata.
+Hai eseguito troppe ricerche terreno in un breve tempo.
+Riprova tra un minuto.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Sei deceduto e sei stato teleportato alla tua posizione iniziale
+	</notification>
+	<notification name="EjectComingSoon">
+		Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Non puoi entrare in questa regione perché 
+il server è pieno.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Opzione Salva nell&apos;inventario disattivata
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché l&apos;oggetto da cui è stato razzato non esiste più.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Impossibile riportare &apos;[OBJ_NAME]&apos; nell&apos;inventario -- questa operazione è stata disattivata.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Non puoi copiare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		La rimozione dell&apos;oggetto &apos;[OBJ_NAME]&apos; dal simulatore non è consentita dal sistema delle autorizzazioni.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Non puoi salvare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Non puoi salvare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere copiato.
+	</notification>
+	<notification name="NoModNoTaking">
+		Non puoi prendere l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Errore interno: Tipo di destinazione sconosciuto.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Cancellazione non riuscita perché l&apos;oggetto non è stato trovato.
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Non puoi espellere quell&apos;utente.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="HomePositionSet">
+		Posizione di base impostata.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar espulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		L&apos;espulsione non ha avuto successo perché non hai l&apos;autorizzazione dell&apos;amministratore del lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l&apos;oggetto su questo lotto.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché nell&apos;altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
+[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Non hai l&apos;autorizzazione necessaria per modificare questa immagine
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Impossibile attivare la fisica per oggetti keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Impossibile attivare la fisica per l&apos;oggetto -- risorse di terreno insufficienti.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Aggiunta elemento non riuscita
+	</notification>
+	<notification name="UnableEditItem">
+		Impossibile modificare questo elemento.
+	</notification>
+	<notification name="NoPermToEdit">
+		Non sei autorizzato a modificare questo elemento.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Non ti è permesso copiare quell&apos;inventario.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Impossibile salvare i contenuti dell&apos;oggetto: L&apos;elemento non esiste più.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Impossibile salvare i contenuti dell&apos;oggetto: Nell&apos;inventario esiste già un elemento con quel nome.
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Impossibile salvare i contenuti dell&apos;oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
+	</notification>
+	<notification name="TooManyScripts">
+		Troppi script.
+	</notification>
+	<notification name="UnableAddScript">
+		Aggiunta script non riuscita.
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Il server degli asset non ha inviato una risposta entro il tempo massimo.  Oggetto restituito al sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		In questa regione non sono attivate le forme per la fisica.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Impossibile impostare le proprietà della fisica per quel tipo di oggetto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		impossibile impostare un prim principale senza forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		In questa regione non sono attivati i materiali per la fisica.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		I materiali per la fisica possono essere modificati solo i prim principali.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		L&apos;impostazione dei materiali per la fisica nei caratteri non è ancora supportata.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Almeno una delle proprietà dei materiali per la fisica non è valida.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Non puoi alterare il tipo di punto di un oggetto con reticolo
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Non puoi alterare la forma di un oggetto con reticolo
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Non puoi entrare in questa regione perché è piena.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Collegamento non riuscito -- i proprietari non corrispondono
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Collegamento non riuscito -- troppe primitive.
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Collegamento non riuscito -- niente di collegabile.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Collegamento non riuscito -- troppi personaggi con pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Collegamento non riuscito -- risorse terreno non sufficienti
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		L&apos;oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Sei stato teleportato nella posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos; del lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Sei stato teleportato nella tua posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di un utente sconosciuto.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Impossibile creare l&apos;oggetto richiesto. La regione è piena.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Non puoi collegare più oggetti a un singolo luogo.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Non puoi creare oggetti multipli in questa posizione.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Impossibile creare l&apos;oggetto richiesto. L&apos;oggetto non è presente nel database.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Impossibile creare l&apos;oggetto richiesto. Tempo scaduto per la richiesta. Riprova.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Impossibile creare l&apos;oggetto richiesto. Riprova.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Rezzing non riuscito. Il caricamento dell&apos;oggetto richiesto è durato troppo a lungo.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Non puoi creare piante su questo terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Impossibile ripristinare l&apos;oggetto. Nessuna posizione trovata nel mondo virtuale.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Impossibile rezzare l&apos;oggetto perché i dati del reticolo non sono validi.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Impossibile rezzare l&apos;oggetto perché ci sono già troppi script in questa regione.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione.
+	</notification>
+	<notification name="CantCreateObject">
+		Al momento non ti è consentito creare oggetti.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parametri oggetto non validi
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione.
+	</notification>
+	<notification name="CantChangeShape">
+		Non ti è consentito modificare questa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Assegnazione non riuscita perché non hai l&apos;autorizzazione necessaria per assegnare oggetti per il tuo gruppo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Impossibile collegare l&apos;oggetto perché un avatar è seduto sopra.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Alberi ed erba non possono essere indossati come collegati.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Impossibile collegare oggetti di proprietà di un gruppo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Non puoi collegare oggetti che non sono di tua proprietà.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Impossibile collegare oggetti che contribuiscono a navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		L&apos;oggetto non può essere collegato perché non sei autorizzato a muoverlo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Risorse di script non sufficienti per collegare l&apos;oggetto.
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Non puoi lasciare elementi collegati con reticolo. Separa nell&apos;inventario e quindi rezza nel mondo virtuale.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Impossibile rimuovere l&apos;elemento collegato: non hai l&apos;autorizzazione necessaria per rimuoverlo qui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Impossibile rimuovere l&apos;elemento collegato: risorse terreno disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Non puoi lasciare l&apos;oggetto qui.  Il lotto è pieno.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Limita i parametri per la cancellazione.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Impossibile caricare l&apos;asset.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Utente da teleportare alla posizione iniziale non trovato
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		richiesta superpoteri non riuscita
+	</notification>
+	<notification name="GenericRequestFailed">
+		richiesta generica non riuscita
+	</notification>
+	<notification name="CantUploadPostcard">
+		Impossibile caricare la cartolina.  Riprova più tardi.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		I dettagli dell&apos;inventario per la notifica di gruppo non sono stati trovati.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Impossibile inviare la notifica di gruppo -- non consentita.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Impossibile inviare la notifica di gruppo -- impossibile costruire l&apos;inventario.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Impossibile analizzare l&apos;inventario nella notifica.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Caricamento terreno non riuscito.
+	</notification>
+	<notification name="TerrainFileWritten">
+		File terreno scritto.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		File terreno generato, avvio del download...
+	</notification>
+	<notification name="TerrainBaked">
+		Baking terreno completata.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Devi aggiornare il Viewer per poter acquistare questo lotto.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Impossibile acquistare, questo lotto non è in vendita.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Impossibile acquistare. Il prezzo o l&apos;area del terreno sono stati cambiati.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Non sei l&apos;acquirente autorizzato di questo lotto.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Non puoi acquistare questo lotto perché è in attesa di autorizzazione all&apos;acquisto
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		hai selezionato terreni con proprietari diversi. Seleziona un&apos;area più piccola e riprova.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Non sono stati selezionati abbastanza lotti affittati da collegare.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -&gt; Segnala bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Impossibile suddividere il terreno. È stato selezionato l&apos;intero lotto.\nProva a selezionare un pezzo di terreno più piccolo.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Il terreno è stato diviso.
+	</notification>
+	<notification name="PassPurchased">
+		Hai acquistato un pass.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Nella regione non sono permessi gli annunci pubblicitari.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Il tuo pass per questo terreno è quasi scaduto.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Nessuna superficie adatta a sedersi, prova un altro luogo.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Non c&apos;è posto per sedersi, prova un altro luogo.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai l&apos;autorizzazione necessaria.
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		La richiesta dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Non puoi assegnare terreno di proprietà di un gruppo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		L&apos;acquisto dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		L&apos;acquisto dell&apos;inventario non ha avuto successo perché non hai L$ sufficienti.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Non hai abbastanza L$ per acquistare un pass per questo terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Al momento non puoi acquistare un pass.  Riprova più tardi.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Impossibile creare l&apos;oggetto perché il lotto è pieno.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Impossibile creare il punto di riferimento per l&apos;evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		I tuoi superpoteri hanno interrotto la congelazione.
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Richiesta di poteri speciali non riuscita. La richiesta è stata registrata.
+	</notification>
+	<notification name="ExpireExplanation">
+		Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta.
+	</notification>
+	<notification name="DieExplanation">
+		Il sistema non è in grado di elaborare la tua richiesta.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Denaro insufficiente per creare una primitiva.
+	</notification>
+	<notification name="RezObjectFailure">
+		Denaro insufficiente per creare un oggetto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Posizione iniziale ripristinata perché non era valida.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Questa regione non ti consente di impostare qui la tua posizione iniziale.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
+	</notification>
+	<notification name="SetHomePosition">
+		Posizione di base impostata.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Impossibile derazzare l&apos;oggetto a causa di un errore nell&apos;inventario.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Impossibile creare l&apos;inventario richiesto.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Impossibile creare la cartella dell&apos;inventario richiesta.
+	</notification>
+	<notification name="CantCreateInventory">
+		Impossibile creare quell&apos;inventario.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Impossibile creare il punto di riferimento.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Il vestiario non può essere creato in questo momento. Riprova tra un minuto.
+	</notification>
+	<notification name="InventoryNotForSale">
+		L&apos;inventario non è in vendita.
+	</notification>
+	<notification name="CantFindInvItem">
+		Impossibile trovare l&apos;elemento nell&apos;inventario.
+	</notification>
+	<notification name="CantFindObject">
+		Impossibile trovare l&apos;oggetto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Non si capisce chi deve essere pagato.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Non puoi dare L$ a oggetti pubblici.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Creazione inventario non riuscito per un oggetto nel mondo virtuale.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Un errore interno ha impedito l&apos;aggiornamento del Viewer.  Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Non puoi creare prim grandi che intersecano altri giocatori.  Riprova quando gli altri giocatori si sono spostati.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file.
+		<usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L&apos;elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati.
+		<usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Impossibile spostare i file. Il percorso precedente è stato ripristinato.
+		<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100644..100755
--- a/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/it/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/it/panel_active_object_row.xml b/indra/newview/skins/default/xui/it/panel_active_object_row.xml
index b8cca6f01a..b8cca6f01a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/it/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
index be001d09f8..be001d09f8 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/it/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index ede19b9e5a..cfceb5b982 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
 	<icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
index 610f561a65..7ca2d3b57b 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Blocca lista
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
-	<button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/>
-	<button label="Blocca l&apos;oggetto per nome..." label_selected="Blocca l&apos;oggetto per nome..." name="Block object by name..."/>
-	<button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtro" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/>
+		<menu_button name="view_btn" tool_tip="Opzioni Ordina"/>
+		<menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/>
+		<button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
index b44c4c29e6..b44c4c29e6 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
index 8fc23d34f1..8fc23d34f1 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray.xml b/indra/newview/skins/default/xui/it/panel_bottomtray.xml
deleted file mode 100644
index 3d12473c87..0000000000
--- a/indra/newview/skins/default/xui/it/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Accende o spegne il microfono"/>
-	<string name="VoiceControlBtnToolTip" value="Mostra o nasconde il pannello di regolazione voce"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Parla" label_selected="Parla" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra o nasconde le gesture"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Sposta" name="movement_btn" tool_tip="Mostra o nasconde i comandi del movimento"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Visuale" name="camera_btn" tool_tip="Mostra o nasconde le regolazioni della visuale"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Scatta una foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Costruisci" name="build_btn" tool_tip="Mostra o nasconde gli strumenti di costruzione"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Cerca" name="search_btn" tool_tip="Mostra o nasconde la ricerca"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Mappa" name="world_map_btn" tool_tip="Mostra o nasconde la mappa del mondo"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini mappa" name="mini_map_btn" tool_tip="Mostra o nasconde la mini mappa"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversazioni"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifiche"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml
index ff576c7dd2..ff576c7dd2 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/it/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml
index 66bf3f140f..66bf3f140f 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/it/panel_classified_info.xml b/indra/newview/skins/default/xui/it/panel_classified_info.xml
index a7cf51c4b9..a7cf51c4b9 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/it/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
index e9d9795b3a..e9d9795b3a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
index 7667e95663..7667e95663 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
index d914a5740f..d914a5740f 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/it/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..ca6b65300a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(caricamento in corso)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..624eaa639c
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/>
+	<icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/>
+	<button name="delete_btn" tool_tip="Elimina questo elemento"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
index cbcaa0689a..cbcaa0689a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
index eb3af5f2a5..eb3af5f2a5 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
index 6daa0cf8fd..6daa0cf8fd 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_classified.xml b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
index ad827696ff..ad827696ff 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml
index 9f31bb7dc7..9f31bb7dc7 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
index 366a82f7aa..366a82f7aa 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_hair.xml b/indra/newview/skins/default/xui/it/panel_edit_hair.xml
index 50e2e7e4b3..50e2e7e4b3 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
index 337720d068..337720d068 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pants.xml b/indra/newview/skins/default/xui/it/panel_edit_pants.xml
index 21b5b7c026..21b5b7c026 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_physics.xml b/indra/newview/skins/default/xui/it/panel_edit_physics.xml
index 669a2c0eab..669a2c0eab 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_pick.xml b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
index 145b8cf4e3..145b8cf4e3 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_profile.xml b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
index 545e96a8f1..545e96a8f1 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shape.xml b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
index fd6a7af69c..fd6a7af69c 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
index 1777c0147f..1777c0147f 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
index c79408b94a..c79408b94a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skin.xml b/indra/newview/skins/default/xui/it/panel_edit_skin.xml
index 466eff2708..466eff2708 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
index 87cdd16676..87cdd16676 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml
index f61a72ed76..f61a72ed76 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
index d76fb62c53..d76fb62c53 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
index 924344e3c0..924344e3c0 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
index 2f22c03294..2f22c03294 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
index e54dc26d05..e54dc26d05 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
index 2d17e4a0cd..2d17e4a0cd 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index 49baa73811..49baa73811 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
index 34ee3c2dca..34ee3c2dca 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
index e3cb3c1092..1b57eba3f0 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Alcuni dei residenti selezionati sono già nel gruppo, pertanto l&apos;invito non verrà loro spedito.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Invito di gruppo non inviato: troppi residenti selezionati Gli inviti di gruppo possono essere inviati a un massimo di 100 persone per ciascuna richiesta.
+	</panel.string>
 	<text name="help_text">
 		Puoi selezionare più residenti da invitare nel tuo gruppo. Per iniziare, clicca su Apri il selettore di residenti.
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
index 27675a18f5..27675a18f5 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
index 7cdc4c7ff6..72e644008c 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Sconosciuto"/>
+	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml
index 524f7d2822..524f7d2822 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_notify.xml b/indra/newview/skins/default/xui/it/panel_group_notify.xml
index 91a41353a5..91a41353a5 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/it/panel_group_roles.xml b/indra/newview/skins/default/xui/it/panel_group_roles.xml
index 478b35e628..478b35e628 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
index 76b28eab24..76b28eab24 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/it/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/it/panel_inventory_item.xml b/indra/newview/skins/default/xui/it/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/it/panel_landmark_info.xml b/indra/newview/skins/default/xui/it/panel_landmark_info.xml
index b4c5ab01bc..b4c5ab01bc 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/it/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/it/panel_landmarks.xml b/indra/newview/skins/default/xui/it/panel_landmarks.xml
index 5617105c31..5617105c31 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/it/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/it/panel_login.xml b/indra/newview/skins/default/xui/it/panel_login.xml
index f88230ed11..2afde40940 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_login.xml
+++ b/indra/newview/skins/default/xui/it/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=it
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				ACCEDI
+			</text>
 			<text name="username_text">
 				Nome utente:
 			</text>
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				Password:
 			</text>
-			<check_box label="Ricorda password" name="remember_check"/>
-			<button label="Accedi" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Modalità:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Seleziona la modalità. Seleziona Di base per esplorare facilmente e rapidamente e per la chat. Seleziona Avanzata per accedere ad altre funzionalità.">
-				<combo_box.item label="Di base" name="Basic"/>
-				<combo_box.item label="Avanzate" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Inizia da:
 			</text>
@@ -33,16 +26,21 @@
 				<combo_box.item label="&lt;Scrivi nome regione&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Iscriviti
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Ti serve aiuto con la fase di accesso?
 			</text>
 			<text name="forgot_password_text">
 				Hai dimenticato il nome utente o la password?
 			</text>
-			<text name="login_help">
-				Ti serve aiuto con la fase di accesso?
+			<button label="Accedi" name="connect_btn"/>
+			<check_box label="Ricorda password" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CREA IL TUO ACCOUNT
 			</text>
+			<button label="Inizia adesso" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
index 446b51ffa3..446b51ffa3 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/panel_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml
index a134f6f1de..a134f6f1de 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_me.xml
+++ b/indra/newview/skins/default/xui/it/panel_me.xml
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
index f11b2415ee..f11b2415ee 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml
index 0f0f1c9fe4..0f0f1c9fe4 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/it/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml
index 785cd048a1..785cd048a1 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
index 0299e2a532..0299e2a532 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
index d46a15c735..d46a15c735 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
index 6317d3192e..1fef88870a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<string name="min_width">
 		192
 	</string>
diff --git a/indra/newview/skins/default/xui/it/panel_nearby_media.xml b/indra/newview/skins/default/xui/it/panel_nearby_media.xml
index 03421456f9..03421456f9 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/it/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
index ef27262010..ef27262010 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/it/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/it/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
index af5e05336e..af5e05336e 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
index 446c211b1c..446c211b1c 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
index c7821bc363..c7821bc363 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
index 9e1a45b129..9e1a45b129 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_list.xml b/indra/newview/skins/default/xui/it/panel_outfits_list.xml
index d0c275e29f..d0c275e29f 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
index 3bbf2446f5..3bbf2446f5 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/it/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index f903ae6e2c..2f40d4bdc4 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -14,81 +14,56 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_filtered_friends_msg">
 		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
-	<string name="people_filter_label" value="Filtro persone"/>
-	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtro persone" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
-		<panel label="I MIEI AMICI" name="friends_panel">
+		<panel label="AMICI" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtro persone" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="I MIEI GRUPPI" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
-				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
+		<panel label="GRUPPI" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtro gruppi" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/>
+				<menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
+				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
 			</panel>
+			<text name="groupcount">
+				Fai parte di [COUNT] gruppi e puoi iscriverti a [REMAINING] altri.
+			</text>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
-				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtro persone" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
+				<menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
+				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
 			</panel>
 		</panel>
+		<panel label="BLOCCATO" name="blocked_panel">
+			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_pick_info.xml b/indra/newview/skins/default/xui/it/panel_pick_info.xml
index ca9959a581..ca9959a581 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/it/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/it/panel_picks.xml b/indra/newview/skins/default/xui/it/panel_picks.xml
index 3faf28a948..3faf28a948 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_picks.xml
+++ b/indra/newview/skins/default/xui/it/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml
index 890dfc2458..890dfc2458 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/it/panel_places.xml b/indra/newview/skins/default/xui/it/panel_places.xml
index 69995fb5de..69995fb5de 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_places.xml
+++ b/indra/newview/skins/default/xui/it/panel_places.xml
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_message.xml b/indra/newview/skins/default/xui/it/panel_postcard_message.xml
index c720f4822d..c720f4822d 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/it/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
index 6a586c4415..6a586c4415 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/it/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
index 224780f234..224780f234 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
index fd1fd57761..fd1fd57761 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index 7f5992b584..09d7c96370 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<text name="font_size">
-		Dimensioni caratteri:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Piccola" name="radio" value="0"/>
-		<radio_item label="Media" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
-	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
-	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
-	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostra gli IM in:
-	</text>
-	<text name="requires_restart_label">
-		(richiede il riavvio)
-	</text>
-	<radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)">
-		<radio_item label="Finestre separate" name="radio" value="0"/>
-		<radio_item label="Schede" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Attiva popup per chat in arrivo:
-	</text>
-	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
-	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
-	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
-	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
-	<button label="Impostazioni traduzione chat" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Simula la battitura tasti quando sei in chat" name="play_typing_animation"/>
+		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Dimensioni carattere:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Piccolo" name="Small" value="0"/>
+			<item label="Medio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			IM degli amici:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			IM non di amici:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			IM conferenza:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Chat di gruppo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Chat nei dintorni:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IM di oggetti:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
+			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
+			<item label="Nessuna azione" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Riproduci suono" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Riproduci suono:
+		</text>
+		<check_box label="Nuova conversazione" name="new_conversation"/>
+		<check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/>
+		<check_box label="Offerta di Teleport" name="teleport_offer"/>
+		<check_box label="Offerta inventario" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Cancella registro..." name="clear_log"/>
+		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
+		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
+	</panel>
+	<button label="Traduzione..." name="ok_btn"/>
+	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
+	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
index 016970d9a3..016970d9a3 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 90a833471c..45cc06c2ea 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="mai" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Risposta in modalità occupato:
+		Risposta Non disturbare:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 1f2b97af45..2978c48db6 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -25,12 +25,12 @@
 		<text name="ShadersText">
 			Effetti grafici:
 		</text>
-		<check_box initial_value="vero" label="Acqua trasparente" name="TransparentWater"/>
+		<check_box initial_value="true" label="Acqua trasparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Piccoli rilievi e scintillii" name="BumpShiny"/>
 		<check_box initial_value="true" label="Luci locali" name="LocalLights"/>
 		<check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
 		<check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Luci e ombre" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
 		<check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
index 8d172bb8bb..8d172bb8bb 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
index 41e7a59139..41e7a59139 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index 0189d47f45..fcc9661d03 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -21,7 +21,7 @@
 	<check_box initial_value="true" label="Abilita plugin" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Abilita Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="falso" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
+	<check_box initial_value="false" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Aggiornamenti software:
 	</text>
@@ -29,6 +29,7 @@
 		<combo_box.item label="Installa automaticamente" name="Install_automatically"/>
 		<combo_box.item label="Scarica e installa manualmente gli aggiornamenti" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Disponibile agli aggiornamenti con versioni non rilasciate" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Impostazioni proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
index d00512aaf7..d00512aaf7 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
index 4620d72977..4620d72977 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
index 0d3117ca7a..0d3117ca7a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
index 45b3a016f4..aba60d03aa 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="297" name="top_scripts_help"/>
 	<button label="Riavvia la regione" name="restart_btn" tool_tip="Dai 2 minuti di tempo massimo e fai riavviare la regione"/>
 	<button label="?" name="restart_help"/>
-	<button label="Ritarda il riavvio" name="cancel_restart_btn" tool_tip="Ritarda il riavvio della regione di un&apos;ora"/>
+	<button label="Annulla riavvio" name="cancel_restart_btn" tool_tip="Annulla riavvio regione"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_environment.xml b/indra/newview/skins/default/xui/it/panel_region_environment.xml
index 81bc8253f4..81bc8253f4 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
index da6b6b277f..98d9b86cfc 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml
@@ -26,7 +26,7 @@
 		Consenti l&apos;accesso solo ai Residenti che:
 	</text>
 	<check_box label="Hanno memorizzato le informazioni per l&apos;addebito" name="limit_payment" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
-	<check_box label="Hanno verificato l&apos;età" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono aver verificato la propria età. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
+	<check_box label="Hanno almeno 18 anni" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
 	<check_box label="Permetti la chat voice" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permetti teleport diretto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/it/panel_region_general.xml b/indra/newview/skins/default/xui/it/panel_region_general.xml
index c550e005ae..c550e005ae 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index c61ac3ecce..c61ac3ecce 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml
deleted file mode 100644
index 1337ed18ca..0000000000
--- a/indra/newview/skins/default/xui/it/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texture del terreno" name="Textures">
-	<text name="region_text_lbl">
-		Regione:
-	</text>
-	<text name="region_text">
-		sconosciuto
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texture del terreno (è necessario siano 512x512, 24 bit .tga files)
-	</text>
-	<text name="height_text_lbl">
-		1 (Bassa)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Alta)
-	</text>
-	<text name="height_text_lbl5">
-		Range di elevazione della texture
-	</text>
-	<text name="height_text_lbl6">
-		Nordovest
-	</text>
-	<text name="height_text_lbl7">
-		Nordest
-	</text>
-	<text name="height_text_lbl8">
-		Sudovest
-	</text>
-	<text name="height_text_lbl9">
-		Sudest
-	</text>
-	<spinner label="Bassa" name="height_start_spin_0"/>
-	<spinner label="Bassa" name="height_start_spin_1"/>
-	<spinner label="Bassa" name="height_start_spin_2"/>
-	<spinner label="Bassa" name="height_start_spin_3"/>
-	<spinner label="Alta" name="height_range_spin_0"/>
-	<spinner label="Alta" name="height_range_spin_1"/>
-	<spinner label="Alta" name="height_range_spin_2"/>
-	<spinner label="Alta" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Questi valori indicano la gamma di miscele per le texture di cui sopra.
-	</text>
-	<text name="height_text_lbl11">
-		Misurato in metri, il valore BASSO è la MASSIMA altezza della texture n. 1, e il valore ALTO è l&apos;altezza MINIMA della texture n. 4.
-	</text>
-	<text name="height_text_lbl12">
-		Texture #1, e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
-	</text>
-	<button label="Applica" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_script_ed.xml b/indra/newview/skins/default/xui/it/panel_script_ed.xml
index d7ee8230b3..feee8b1927 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/it/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Seleziona tutto" name="Select All"/>
 			<menu_item_call label="Deseleziona" name="Deselect"/>
 			<menu_item_call label="Cerca / Sostituisci..." name="Search / Replace..."/>
+			<menu_item_call label="Passa alla riga..." name="Go to line..."/>
 		</menu>
 		<menu label="Guida" name="Help">
 			<menu_item_call label="Aiuto..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml
index 98096a391a..98096a391a 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/it/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml
index df7b0eae1c..df7b0eae1c 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/it/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml
index b5f8c8d6f0..b5f8c8d6f0 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/it/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/it/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/it/panel_side_tray.xml b/indra/newview/skins/default/xui/it/panel_side_tray.xml
deleted file mode 100644
index e0143088a5..0000000000
--- a/indra/newview/skins/default/xui/it/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Apri/chiudi la barra laterale." name="sidebar_openclose" tab_title="Apri/chiudi la barra laterale"/>
-	<sidetray_tab description="Casa." name="sidebar_home" tab_title="Home">
-		<panel label="casa" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Modifica il tuo profilo pubblico e i preferiti." name="sidebar_me" tab_title="Il mio profilo">
-		<panel_container name="panel_container">
-			<panel label="Io" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trova amici, contatti e persone nelle vicinanze." name="sidebar_people" tab_title="Persone">
-		<panel_container name="panel_container">
-			<panel label="Profilo del gruppo" name="panel_group_info_sidetray"/>
-			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trova luoghi dove andare e luoghi già visitati." label="Luoghi" name="sidebar_places" tab_title="Luoghi">
-		<panel label="Luoghi" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Sfoglia il tuo inventario." name="sidebar_inventory" tab_title="Il mio inventario">
-		<panel label="Modifica inventario" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Cambia il tuo aspetto ed il tuo look attuale." name="sidebar_appearance" tab_title="Il mio aspetto">
-		<panel label="Modifica aspetto fisico" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml
index 3c7874e093..3c7874e093 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/it/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
index c9245029b7..c9245029b7 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
index 4b725b68f9..4b725b68f9 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
index f2d42c5197..f2d42c5197 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
index 3703b97e6c..3703b97e6c 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
index 2cdbf97049..2cdbf97049 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/it/panel_sound_devices.xml b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
index b1934fd515..b1934fd515 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/it/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml
index e4ff7019ec..e4ff7019ec 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/it/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml
index 0aaf89d8c8..0aaf89d8c8 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history.xml b/indra/newview/skins/default/xui/it/panel_teleport_history.xml
index f4fa59babe..f4fa59babe 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/it/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
index 2ba4baacaf..2ba4baacaf 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
new file mode 100644
index 0000000000..36ad2980cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Texture" name="Texture">
+	<panel.string name="string repeats per meter">
+		Ripetizioni al metro
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Ripetizioni per faccia
+	</panel.string>
+	<text name="color label">
+		Colore
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+	<text name="color trans">
+		Trasparenza %
+	</text>
+	<text name="glow label">
+		Bagliore
+	</text>
+	<check_box label="Luminosità massima" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Materiali" name="Materials"/>
+		<combo_box.item label="Multimedia" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Texture (diffusa)" name="Texture (diffuse)"/>
+		<combo_box.item label="Irregolarità (normale)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Lucentezza (speculare)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere una fotografia"/>
+	<text name="label alphamode">
+		Modalità Alfa
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Nessuno" name="None"/>
+		<combo_box.item label="Miscelazione Alfa" name="Alpha blending"/>
+		<combo_box.item label="Mascheratura Alfa" name="Alpha masking"/>
+		<combo_box.item label="Mascheratura emissiva" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Limite mascheratura
+	</text>
+	<texture_picker label="Texture" name="bumpytexture control" tool_tip="Clicca per scegliere una fotografia"/>
+	<text name="label bumpiness">
+		Irregolarità
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Nessuno" name="None"/>
+		<combo_box.item label="Luminosità" name="Brightness"/>
+		<combo_box.item label="Oscurità" name="Darkness"/>
+		<combo_box.item label="venatura" name="woodgrain"/>
+		<combo_box.item label="corteccia" name="bark"/>
+		<combo_box.item label="mattoni" name="bricks"/>
+		<combo_box.item label="scacchiera" name="checker"/>
+		<combo_box.item label="cemento" name="concrete"/>
+		<combo_box.item label="incrostatura" name="crustytile"/>
+		<combo_box.item label="gemma" name="cutstone"/>
+		<combo_box.item label="dischi" name="discs"/>
+		<combo_box.item label="ciottoli" name="gravel"/>
+		<combo_box.item label="batteri" name="petridish"/>
+		<combo_box.item label="rivestimento" name="siding"/>
+		<combo_box.item label="lastricato" name="stonetile"/>
+		<combo_box.item label="stucco" name="stucco"/>
+		<combo_box.item label="suzione" name="suction"/>
+		<combo_box.item label="trama" name="weave"/>
+	</combo_box>
+	<texture_picker label="Texture" name="shinytexture control" tool_tip="Clicca per scegliere una fotografia"/>
+	<text name="label shininess">
+		Lucentezza
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Nessuna" name="None"/>
+		<combo_box.item label="Bassa" name="Low"/>
+		<combo_box.item label="Media" name="Medium"/>
+		<combo_box.item label="Alta" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Patinatura
+	</text>
+	<text name="label environment">
+		Ambiente
+	</text>
+	<text name="label shinycolor">
+		Colore
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Clicca per aprire il selettore dei colori"/>
+	<text name="media_info">
+		L&apos;URL dell&apos;eventuale elemento multimediale selezionato va qui
+	</text>
+	<button label="Scegli..." name="add_media" tool_tip="Aggiungi elemento multimediale"/>
+	<button label="Rimuovi" name="delete_media" tool_tip="Cancella questa texture dell&apos;elemento multimediale"/>
+	<button label="Alllinea" label_selected="Allinea elmento multimediale" name="button align" tool_tip="Allinea texture dell&apos;elemento multimediale (il caricamento deve prima essere completato)"/>
+	<text name="tex gen">
+		Mappatura
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Predefinita" name="Default"/>
+		<combo_box.item label="Planare" name="Planar"/>
+	</combo_box>
+	<spinner label="Scala orizzontale" name="TexScaleU"/>
+	<spinner label="Scala veritcale" name="TexScaleV"/>
+	<spinner label="Ripetizioni al metro" name="rptctrl"/>
+	<spinner label="Gradi di rotazione" name="TexRot"/>
+	<spinner label="Spostamento orizzontale" name="TexOffsetU"/>
+	<spinner label="Spostamento verticale" name="TexOffsetV"/>
+	<spinner label="Scala orizzontale" name="bumpyScaleU"/>
+	<spinner label="Scala veritcale" name="bumpyScaleV"/>
+	<spinner label="Gradi di rotazione" name="bumpyRot"/>
+	<spinner label="Spostamento orizzontale" name="bumpyOffsetU"/>
+	<spinner label="Spostamento verticale" name="bumpyOffsetV"/>
+	<spinner label="Scala orizzontale" name="shinyScaleU"/>
+	<spinner label="Scala veritcale" name="shinyScaleV"/>
+	<spinner label="Gradi di rotazione" name="shinyRot"/>
+	<spinner label="Spostamento orizzontale" name="shinyOffsetU"/>
+	<spinner label="Spostamento verticale" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Allinea facce planari" name="checkbox planar align" tool_tip="Allinea le texture su tutte le facce selezionate con l’ultima faccia selezionata. È richiesta la mappatura planare delle texture."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
index b43f766e5e..b43f766e5e 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..bc17fc0c89
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_volume_pulldown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater" width="220">
+	<button left="197" name="prefs_btn"/>
+	<slider label="Principale" label_width="60" name="System Volume" width="160"/>
+	<slider label="Pulsanti" label_width="60" name="UI Volume" width="160"/>
+	<slider label="Ambiente" label_width="60" name="Wind Volume" width="160"/>
+	<slider label="Suoni" label_width="60" name="SFX Volume" width="160"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Attiva suoni dai gesti"/>
+	<slider label="Musica" label_width="60" name="Music Volume" width="160"/>
+	<check_box name="enable_music" tool_tip="Attiva streaming musica"/>
+	<slider label="Multimedia" label_width="60" name="Media Volume" width="160"/>
+	<check_box name="enable_media" tool_tip="Attiva streaming multimediale"/>
+	<slider label="Voce" label_width="60" name="Voice Volume" width="160"/>
+	<check_box name="enable_voice_check" tool_tip="Attiva chat vocale"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_world_map.xml b/indra/newview/skins/default/xui/it/panel_world_map.xml
index 642af75028..642af75028 100644..100755
--- a/indra/newview/skins/default/xui/it/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/it/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml
index 300e6cf721..3ccb674ed0 100644..100755
--- a/indra/newview/skins/default/xui/it/role_actions.xml
+++ b/indra/newview/skins/default/xui/it/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Queste abilità permettono di cambiare il nome del lotto, le impostazioni di pubblicazione, la visibilità negli elenchi e il punto di arrivo, nonché opzioni di indirizzamento del Teleport." name="Parcel Identity">
 		<action description="Premi Mostra luogo nella ricerca e seleziona una categoria" longdescription="Premi Mostra luogo nella ricerca e seleziona una categoria di lotto in Informazioni sul terreno &gt; scheda Opzioni." name="land find places" value="17"/>
-		<action description="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca" longdescription="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca. Ciò viene fatto in Informazioni sul terreno &gt; scheda Opzioni." name="land change identity" value="18"/>
+		<action description="Cambia il nome, la descrizione e le impostazioni &apos;Contenuto Moderato&apos; per il lotto" longdescription="Cambia il nome, la descrizione e le impostazioni &apos;Contenuto Moderato&apos; per il lotto. Ciò viene fatto in Informazioni sul terreno &gt; scheda Opzioni." name="land change identity" value="18"/>
 		<action description="Impostare il punto di arrivo e l&apos;indirizzamento del Teleport" longdescription="In un lotto di proprietà di un gruppo, i membri con questo ruolo e abilità possono impostare un punto di arrivo per i teleport entranti e impostare anche l&apos;indirizzamento del teleport per ulteriore precisione. Viene fatto in Informazioni sul terreno &gt; Opzioni." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Queste abilità hanno poteri relativi alle opzioni dei lotti, come la creazione di oggetti, la modifica del terreno e le impostazioni per la musica e gli elementi multimediali." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
index 220a6f84af..220a6f84af 100644..100755
--- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
index 5ac0961bd7..5ac0961bd7 100644..100755
--- a/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
index 900a65956b..2b3ea0fb83 100644..100755
--- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(sconosciuto)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(sconosciuto / multiplo)
+	</panel.string>
 	<panel.string name="public">
 		(pubblico)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index cfabdc81b0..5f912dd126 100644..100755
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Non puoi modificare questi oggetti
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Questo oggetto non può essere modificato attraverso il confine di una regione
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Questi oggetti non possono essere modificati attraverso il confine di una regione
+	</panel.string>
 	<panel.string name="text modify warning">
 		Questo oggetto ha parti collegate
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Acquista oggetto" name="Buyobject"/>
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
+			<combo_box.item label="Ingrandisci" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Prezzo: L$" name="Edit Cost"/>
 		<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti alle persone di vedere questo oggetto nei risultati della ricerca"/>
+		<text name="pathfinding_attributes_label">
+			Attributi pathfinding:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 8529fadd7d..60ed2b0929 100644..100755
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,10 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=it-IT
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download.
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
@@ -445,6 +448,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="SLappAgentRequestFriend">
 		Richiesta di amicizia
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Rimozione amico
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Chiudi (⌘W)
 	</string>
@@ -616,8 +622,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AvatarAway">
 		Assente
 	</string>
-	<string name="AvatarBusy">
-		Occupato
+	<string name="AvatarDoNotDisturb">
+		Non disturbare
 	</string>
 	<string name="AvatarMuted">
 		Mutato
@@ -832,6 +838,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="multiple_textures">
 		Multiple
 	</string>
+	<string name="use_texture">
+		Usa texture
+	</string>
 	<string name="texture_loading">
 		Caricamento in corso...
 	</string>
@@ -853,6 +862,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ST_NO_JOINT">
 		Impossibile trovare ROOT o JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Chat nei dintorni
+	</string>
+	<string name="NearbyChatLabel">
+		(Chat nei dintorni)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -880,6 +895,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ScriptQuestionCautionChatDenied">
 		A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Se consenti l&apos;accesso al tuo account, consentirai anche all&apos;oggetto di:
+	</string>
 	<string name="ScriptTakeMoney">
 		Prendere dollari Linden (L$) da te
 	</string>
@@ -913,6 +931,27 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
+	<string name="AgentNameSubst">
+		(Tu)
+	</string>
+	<string name="TeleportYourAgent">
+		Teleportarti
+	</string>
+	<string name="JoinAnExperience">
+		Partecipa a un&apos;esperienza
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Omette gli avvisi durante la gestione degli elenchi di accesso alle proprietà immobiliari
+	</string>
+	<string name="OverrideYourAnimations">
+		Sostituisce le animazioni predefinite
+	</string>
+	<string name="ScriptReturnObjects">
+		Restituisce oggetti per conto tuo
+	</string>
+	<string name="UnknownScriptPermission">
+		(sconosciuto)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generale
 	</string>
@@ -991,17 +1030,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="script_files">
 		Script
 	</string>
-	<string name="AvatarSetNotAway">
-		Imposta come non assente
-	</string>
-	<string name="AvatarSetAway">
-		Imposta come assente
-	</string>
-	<string name="AvatarSetNotBusy">
-		Imposta come non occupato
-	</string>
-	<string name="AvatarSetBusy">
-		Imposta come occupato
+	<string name="dictionary_files">
+		Dizionari
 	</string>
 	<string name="shape">
 		Figura corporea
@@ -1235,7 +1265,7 @@ Prova ad accedere nuovamente tra un minuto.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1390,6 +1420,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="InvFolder favorite">
 		I miei preferiti
 	</string>
+	<string name="InvFolder Favorites">
+		I miei preferiti
+	</string>
+	<string name="InvFolder favorites">
+		I miei preferiti
+	</string>
 	<string name="InvFolder Current Outfit">
 		Abbigliamento attuale
 	</string>
@@ -1405,6 +1441,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="InvFolder Meshes">
 		Reticoli
 	</string>
+	<string name="InvFolder Received Items">
+		Oggetti ricevuti
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Casella venditore in uscita
+	</string>
 	<string name="InvFolder Friends">
 		Amici
 	</string>
@@ -1935,6 +1977,12 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD basso a destra
 	</string>
+	<string name="ATTACH_NECK">
+		Collo
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centro avatar
+	</string>
 	<string name="CursorPos">
 		Riga [LINE], Colonna [COLUMN]
 	</string>
@@ -1947,8 +1995,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="PanelContentsNewScript">
 		Nuovo script
 	</string>
-	<string name="BusyModeResponseDefault">
-		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
+	<string name="DoNotDisturbModeResponseDefault">
+		Questo residente ha attivato la modalità &apos;Non disturbare&apos; e vedrà il tuo messaggio più tardi.
 	</string>
 	<string name="MuteByName">
 		(In base al nome)
@@ -2061,9 +2109,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Contenuto
-	</string>
 	<string name="AcquiredItems">
 		Oggetti acquisiti
 	</string>
@@ -2925,6 +2970,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="Hip Width">
 		Larghezza bacino
 	</string>
+	<string name="Hover">
+		Muovi sopra
+	</string>
 	<string name="In">
 		Dentro
 	</string>
@@ -3778,7 +3826,13 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Regione generale
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visibili e chat consentita fuori di questo lotto
+		Gli avatar in questo lotto non possono essere visti o sentiti da avatar all&apos;esterno del lotto
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Il pathfinding dinamico non è attivato in questa regione.
 	</string>
 	<string name="UpdaterWindowTitle">
 		Aggiornamento [APP_NAME]
@@ -3849,6 +3903,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Per vedere questo messaggio, devi deselezionare &apos;Solo amici e gruppi possono chiamarmi o mandarmi IM&apos; in Preferenze/Privacy.
 	</string>
+	<string name="OnlineStatus">
+		Online
+	</string>
+	<string name="OfflineStatus">
+		Offline
+	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
@@ -3858,6 +3918,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Ti sei collegato alla chiamata in voce
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità &apos;Non disturbare&apos;.
+	</string>
 	<string name="name_started_call">
 		[NAME] ha iniziato una chiamata vocale
 	</string>
@@ -3870,6 +3933,9 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Chiusa la chiamata
 	</string>
+	<string name="conference-title">
+		Chat con più persone
+	</string>
 	<string name="conference-title-incoming">
 		Chiamata in conferenza con [AGENT_NAME]
 	</string>
@@ -4742,6 +4808,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversazioni
+	</string>
 	<string name="Command_Compass_Label">
 		Bussola
 	</string>
@@ -4817,6 +4886,9 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Tooltip">
 		Chatta con persone vicine usando il testo
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversa con chiunque
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bussola
 	</string>
@@ -4910,6 +4982,21 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Normal">
 		Normale
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Nessuno
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Influenza il navmesh
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personaggio
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Multiple)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Molto basso
 	</string>
@@ -4925,4 +5012,22 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="snapshot_quality_very_high">
 		Molto alto
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Il Residente non può visitare questa regione.
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
+	</string>
+	<string name="loading_chat_logs">
+		Caricamento in corso...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index f485212290..bd967ebcc4 100644..100755
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -43,6 +43,9 @@ Per ripetere l&apos;esercitazione, visita &apos;Welcome Island Public&apos;.
 		<message name="no_inventory_host">
 			L&apos;inventario è temporaneamente inaccessibile.
 		</message>
+		<message name="MustGetAgeRegion">
+			Per poter entrare in questa regione devi avere almeno 18 anni.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -78,5 +81,8 @@ Per ripetere l&apos;esercitazione, visita &apos;Welcome Island Public&apos;.
 		<message name="requesting">
 			Avvio teletrasporto....
 		</message>
+		<message name="pending">
+			Teleport in sospeso...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 3c7a210a22..63a4e69c10 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -8,7 +8,9 @@
 		コンパイラー [COMPILER] [COMPILER_VERSION] バージョン
 	</floater.string>
 	<floater.string name="AboutPosition">
-		あなたの現在地は、[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
+		あなたの現在地は、[POSITION_LOCAL_0,number,1]、[POSITION_LOCAL_1,number,1]、[POSITION_LOCAL_2,number,1] の [REGION] です。位置は &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; です。（[HOSTIP]）
+SLURL:&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(グローバル座標 [POSITION_0,number,1]、[POSITION_1,number,1]、[POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -66,27 +68,26 @@ Qt Webkit バージョン： [QT_WEBKIT_VERSION]
 		</panel>
 		<panel label="ライセンス" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+APR Copyright (C) 2011 The Apache Software Foundation
+Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
 DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
 GL Copyright (C) 1999-2004 Brian Paul.
 GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
 google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-PCRE Copyright (c) 1997-2008 University of Cambridge
+ogg/vorbis Copyright (C) 2002, Xiphophorus
+OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+PCRE Copyright (c) 1997-2012 University of Cambridge
 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-google-perftools Copyright (c) 2005, Google Inc.
+zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
 Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
 
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 7c87bad5a3..3b4b5ed070 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -464,7 +464,7 @@
 				次の住人にのみアクセスを許可：
 			</text>
 			<check_box label="支払情情報が登録されている [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="支払情報が登録されていないと、この区画にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-			<check_box label="年齢確認が済んでいる [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、年齢確認を済ませる必要があります。詳細については、[SUPPORT_SITE] をご覧ください。"/>
+			<check_box label="18 才以上です [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
 			<check_box label="グループのアクセスを許可：[GROUP]" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
 			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/ja/floater_activeim.xml b/indra/newview/skins/default/xui/ja/floater_activeim.xml
index 1c743e1fd2..1c743e1fd2 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/ja/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
index 2bada303ae..2bada303ae 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
index f74bab3598..f74bab3598 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
deleted file mode 100644
index 548d24097f..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		モーションを初期化できませんでした
-	</floater.string>
-	<floater.string name="anim_too_long">
-		アニメーションファイルの長さは[LENGTH]秒です。
-
-アニメーションの最大の長さは[MAX_LENGTH]秒です。
-	</floater.string>
-	<floater.string name="failed_file_read">
-		アニメーションファイルを読み取れません。
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		不完全なファイル。
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		制約定義を読みとれません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		無効な HIERARCHY ヘッダーです。.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		ROOT または JOINT が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		JOINT ネームを取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		OFFSET が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		CHANNELS が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		回転順序を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		回転軸を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		MOTION が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		フレーム数を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		フレームタイムを取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		ポジション値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		回転値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Mergechild 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Mergeparent 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		プロパティ値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		ループ値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		easeln 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		easeOut 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Hand morph 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		エモート名を読みとれません。
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		ルートジョイント名が無効です。「hip」を使用してください。
-	</floater.string>
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<spinner label="優先順位" name="priority" tool_tip="このアニメーションがどのアニメーションを上書きするかを決めます"/>
-	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生します"/>
-	<spinner label="イン(％)" label_width="45" left="60" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" width="100"/>
-	<spinner label="アウト(％)" label_width="50" left="170" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" width="100"/>
-	<text name="hand_label">
-		手の動き
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
-		<combo_box.item label="広げる" name="Spread"/>
-		<combo_box.item label="リラックス" name="Relaxed"/>
-		<combo_box.item label="指を指す・両手" name="PointBoth"/>
-		<combo_box.item label="拳" name="Fist"/>
-		<combo_box.item label="リラックス・左" name="RelaxedLeft"/>
-		<combo_box.item label="指を指す・左" name="PointLeft"/>
-		<combo_box.item label="拳を上げる・左" name="FistLeft"/>
-		<combo_box.item label="リラックス・右" name="RelaxedRight"/>
-		<combo_box.item label="指を指す・右" name="PointRight"/>
-		<combo_box.item label="拳を上げる・右" name="FistRight"/>
-		<combo_box.item label="敬礼・右" name="SaluteRight"/>
-		<combo_box.item label="タイピング" name="Typing"/>
-		<combo_box.item label="ピース・右" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		表現
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
-		<item label="（なし）" name="[None]" value=""/>
-		<item label="アーーーーー" name="Aaaaah" value="アーーーーー"/>
-		<item label="恐れる" name="Afraid" value="恐れる"/>
-		<item label="怒る" name="Angry" value="怒る"/>
-		<item label="満面の笑み" name="BigSmile" value="満面の笑み"/>
-		<item label="退屈" name="Bored" value="退屈"/>
-		<item label="泣く" name="Cry" value="泣く"/>
-		<item label="侮辱" name="Disdain" value="侮辱"/>
-		<item label="恥ずかしがる" name="Embarrassed" value="恥ずかしがる"/>
-		<item label="しかめっ面" name="Frown" value="しかめっ面"/>
-		<item label="キス" name="Kiss" value="キス"/>
-		<item label="笑う" name="Laugh" value="笑う"/>
-		<item label="Plllppt" name="Plllppt" value="Plllppt"/>
-		<item label="嫌悪感" name="Repulsed" value="嫌悪感"/>
-		<item label="悲しい" name="Sad" value="悲しい"/>
-		<item label="肩をすくめる" name="Shrug" value="肩をすくめる"/>
-		<item label="微笑む" name="Smile" value="微笑む"/>
-		<item label="驚く" name="Surprise" value="驚く"/>
-		<item label="ウィンク" name="Wink" value="ウィンク"/>
-		<item label="心配する" name="Worry" value="心配する"/>
-	</combo_box>
-	<text name="preview_label">
-		同時進行行動
-	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="アバターが普通の行動をするときのアニメーションの動きをテストするためにこれを使います。">
-		<item label="立つ" name="Standing" value="立つ"/>
-		<item label="歩く" name="Walking" value="歩く"/>
-		<item label="座る" name="Sitting" value="座る"/>
-		<item label="飛ぶ" name="Flying" value="飛ぶ"/>
-	</combo_box>
-	<spinner label="イーズイン(秒)" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
-	<spinner label="イーズアウト(秒)" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
-	<button label="" name="play_btn" tool_tip="アニメーションを再生する"/>
-	<button name="pause_btn" tool_tip="アニメーションを一時停止する"/>
-	<button label="" name="stop_btn" tool_tip="アニメーションの再生を停止"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		アニメーションファイルを読み込めません。
- 
- Poser 4からエクスポートされたBVHファイルを推奨します。
-	</text>
-	<button label="アップロードL$[AMOUNT]" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_auction.xml b/indra/newview/skins/default/xui/ja/floater_auction.xml
index e9aa287f2c..e9aa287f2c 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ja/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
new file mode 100755
index 0000000000..21abf59160
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="自動置換設定">
+	<check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます"/>
+	<button label="リストをインポート..." name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。"/>
+	<button label="リストをエクスポート..." name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。"/>
+	<button label="新規リスト..." name="autoreplace_new_list" tool_tip="新規リストを作成します。"/>
+	<button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。"/>
+	<button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。"/>
+	<button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。"/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="キーワード" name="keyword"/>
+		<scroll_list.columns label="置換" name="replacement"/>
+	</scroll_list>
+	<button label="追加..." name="autoreplace_add_entry"/>
+	<button label="削除" name="autoreplace_delete_entry"/>
+	<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
+	<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
+	<button label="取り消し" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar.xml b/indra/newview/skins/default/xui/ja/floater_avatar.xml
index d289580506..d289580506 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
index 4bd6b4e053..4bd6b4e053 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 5c23b77498..5c23b77498 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index a55698e3d0..a55698e3d0 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_build_options.xml b/indra/newview/skins/default/xui/ja/floater_build_options.xml
index 6865409e7a..6865409e7a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
index d8d0164618..1b5a745cc4 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="中身の権限の編集">
+<floater name="floaterbulkperms" title="コンテンツ権限を調整">
 	<floater.string name="nothing_to_modify_text">
 		選択した中に編集できないものが含まれています
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="すべてに √" label_selected="全て" name="check_all"/>
 	<button label="クリア" label_selected="なし" name="check_none"/>
 	<text name="newperms">
-		新しい中身の権限
+		コンテンツ権限を以下に調整
 	</text>
 	<text name="GroupLabel">
 		グループ：
@@ -49,6 +49,7 @@
 	<check_box label="修正" name="next_owner_modify"/>
 	<check_box label="コピー" name="next_owner_copy"/>
 	<check_box initial_value="true" label="再販・プレゼント" name="next_owner_transfer" tool_tip="次の所有者はこのオブジェクトを他人にあげたり再販することができます"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="適用" name="apply"/>
 	<button label="キャンセル" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index fd12a9e69a..fd12a9e69a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
index 7e4932c78f..7e4932c78f 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index a472f163e3..a472f163e3 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
index 37fd6826e5..37fd6826e5 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 34f9d38de1..34f9d38de1 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_object.xml b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
index ce269df6da..ce269df6da 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index 982e5ce42b..982e5ce42b 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
index 11f223ade6..9f5df6fb85 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="近くのチャット">
+<floater name="nearby_chat" title="近くのチャット">
 	<panel name="bottom_panel">
 		<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して話し、Ctrl + Enter キーで叫びます。"/>
 		<button name="show_nearby_chat" tool_tip="近くのチャットログを表示／非表示"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 7d91cb69ed..7d91cb69ed 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ja/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_color_picker.xml b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
index dc87d27a15..dc87d27a15 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ja/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
new file mode 100644
index 0000000000..98b1a59a0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="会話ログ">
+	<panel name="buttons_panel">
+		<filter_editor label="人をフィルター" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ea0b23de48
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="会話:">
+	<floater.string name="Title">
+		会話:[NAME]
+	</floater.string>
+	<text name="page_label" value="ページ"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_critical.xml b/indra/newview/skins/default/xui/ja/floater_critical.xml
index f69c24622a..f69c24622a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ja/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
index eb39d1b336..eb39d1b336 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_destinations.xml b/indra/newview/skins/default/xui/ja/floater_destinations.xml
index b7f6ad4d4e..b7f6ad4d4e 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ja/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_display_name.xml b/indra/newview/skins/default/xui/ja/floater_display_name.xml
index cc71b1cd9f..cc71b1cd9f 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/ja/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
index fd601672b6..fd601672b6 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
index 68d0c70baa..68d0c70baa 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
index eddfbd4298..eddfbd4298 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
index 0e3803119f..0e3803119f 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_event.xml b/indra/newview/skins/default/xui/ja/floater_event.xml
index ca50ba8ef8..ca50ba8ef8 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_event.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
index 5f538ecdb0..5f538ecdb0 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_font_test.xml b/indra/newview/skins/default/xui/ja/floater_font_test.xml
index b853f395dd..b853f395dd 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/ja/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_gesture.xml b/indra/newview/skins/default/xui/ja/floater_gesture.xml
index 1ed5ad31db..1ed5ad31db 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 9e5d473db7..9e5d473db7 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_goto_line.xml b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
new file mode 100644
index 0000000000..5f2717ace5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="行に移動">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		行に移動
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 1b6558a9eb..c8b8e918e0 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		VBO を有効化：
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。"/>
+	<text name="tc label">
+		S3TC を有効にする：
+	</text>
+	<check_box initial_value="true" label="テクスチャ圧縮を有効にする（再起動が必要）" name="texture compression" tool_tip="ビデオメモリ内でテクスチャを圧縮することにより、色の質を多少犠牲にしながら、より高解像度のテクスチャを読み込めるようにします。"/>
 	<slider label="テクスチャメモリ（MB）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。 ビデオカードのメモリに既定。 数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
 	<spinner label="フォグの距離比率：" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_help_browser.xml b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
index 15200d7ef7..15200d7ef7 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml
index 4cebe27226..4cebe27226 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/ja/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index e3841c2cd9..e3841c2cd9 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index 06b65e27f0..a155efdc1e 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="会話"/>
+<multi_floater name="floater_im_box" title="会話">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
+					<button name="add_btn" tool_tip="新しい会話を開始"/>
+					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
+					<text name="stub_textbox">
+						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index dfa1c85ca2..7ed46f7f01 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="宛先" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
+	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
+	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
+	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
+	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
+				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
+				<button name="close_btn" tool_tip="この会話を終了する"/>
+				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="宛先" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index 1ffc27fd70..1ffc27fd70 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_import_collada.xml b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
index 65edafb169..65edafb169 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/ja/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index f152fcd738..308f6f9a3d 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		匿名ユーザー
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		がコールしています。
+		からコールを受けています。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		がコンファレンスチャットで、ボイスチャットに参加しました。
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
+		コールに応答すると、現在のボイスチャットから切断されます。
 	</text>
-	<button label="はい" label_selected="はい" name="Accept"/>
-	<button label="いいえ" label_selected="いいえ" name="Reject"/>
-	<button label="IM" name="Start IM"/>
+	<button label="取る" label_selected="取る" name="Accept"/>
+	<button label="無視" label_selected="無視" name="Reject"/>
+	<button label="代わりに IM を開く" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index b3825c0b7f..b3825c0b7f 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory.xml b/indra/newview/skins/default/xui/ja/floater_inventory.xml
deleted file mode 100644
index b113fde94a..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="持ち物">
-	<floater.string name="Title">
-		持ち物
-	</floater.string>
-	<floater.string name="TitleFetching">
-		持ち物 （ [ITEM_COUNT]  アイテムを取得中...） [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		持ち物 （ [ITEM_COUNT]  アイテム） [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		取得済
-	</floater.string>
-	<panel label="持ち物パネル" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index c01c46211e..c01c46211e 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index af96edda79..af96edda79 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index daa480ef5a..daa480ef5a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index e3546cd837..e3546cd837 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index aca916f22f..aca916f22f 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index 5a155c9f12..5a155c9f12 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 5773752788..5773752788 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_map.xml b/indra/newview/skins/default/xui/ja/floater_map.xml
index 1122203446..1122203446 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_map.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index c4731b73a3..c4731b73a3 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_media_settings.xml b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
index 46ac1a8dfd..46ac1a8dfd 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index f48bb94e32..f48bb94e32 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
index c59a3dc0ab..c59a3dc0ab 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index c9ff0e29cb..942cc91317 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="三角形" name="triangles" value="三角形"/>
 				<text initial_value="頂点" name="vertices" value="頂点"/>
 				<text initial_value="高" name="high_label" value="高"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="中" name="medium_label" value="中"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+					<item name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="低" name="low_label" value="低"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+					<item name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="最低" name="lowest_label" value="最低"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+					<item name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="ノーマルの作成" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml b/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
deleted file mode 100644
index 746bd8553c..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="モデルウィザードをアップロード">
-	<button label="5. アップロード" name="upload_btn"/>
-	<button label="4. 確認" name="review_btn"/>
-	<button label="3. 物理効果" name="physics_btn"/>
-	<button label="2. 最適化" name="optimize_btn"/>
-	<button label="1. ファイルを選択" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				モデルファイルを選択
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				上級ユーザーの場合：3D コンテンツ制作ツールの使用に慣れている方は、高度なアップローダーもお試しください。
-			</text>
-			<button label="アドバンスモードに切り替える" name="switch_to_advanced"/>
-			<text name="Cache location">
-				アップロードするモデルファイルを選択
-			</text>
-			<button label="参照..." label_selected="参照..." name="browse"/>
-			<text name="Model types">
-				Second Life は COLLADA (.dae) ファイルをサポートします。
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				警告：
-			</text>
-			<text name="warning_text">
-				このモデルを Second Life サーバーにアップロードするための最終手順を実行できません。[secondlife:///app/floater/learn_more こちらを参照して]、メッシュモデルをアップロードできるようにアカウントを設定してください。
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				モデルを最適化
-			</text>
-		</panel>
-		<text name="optimize_description">
-			モデルはパフォーマンスを重視して最適化されています。必要に応じて調整してください。
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				次の描画詳細度を作成：高
-			</text>
-			<text name="medium_detail_text">
-				次の描画詳細度を作成：中
-			</text>
-			<text name="low_detail_text">
-				次の描画詳細度を作成：低
-			</text>
-			<text name="lowest_detail_text">
-				次の描画詳細度を作成：最低
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="ジオメトリを再計算" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				ジオメトリのプレビュー
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="プレビュー表示の LOD 設定">
-				<combo_item name="high">
-					高い詳細度
-				</combo_item>
-				<combo_item name="medium">
-					中の詳細度
-				</combo_item>
-				<combo_item name="low">
-					低い詳細度
-				</combo_item>
-				<combo_item name="lowest">
-					最低の詳細度
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				物理作用の調整
-			</text>
-		</panel>
-		<text name="physics_description">
-			モデルの外殻構造のシェイプは弊社が作成します。モデルの目的に応じてシェイプの詳細度を調整してください。
-		</text>
-		<panel name="physics_content">
-			<button label="物理作用を再計算" name="recalculate_physics_btn"/>
-			<button label="再計算中..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				物理作用のプレビュー
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="プレビュー表示の LOD 設定">
-				<combo_item name="high">
-					高い詳細度
-				</combo_item>
-				<combo_item name="medium">
-					中の詳細度
-				</combo_item>
-				<combo_item name="low">
-					低い詳細度
-				</combo_item>
-				<combo_item name="lowest">
-					最低の詳細度
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				確認
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				区画/リージョンへの負荷：[EQUIV] プリム換算値
-			</text>
-			<text name="review_fee">
-				L$ [FEE] のアップロード料金があなたのアカウントに請求されます。
-			</text>
-			<text name="review_confirmation">
-				アップロードボタンをクリックすることにより、モデルに含まれるマテリアルの所有権や使用許可の所持を認めたことになります。
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				アップロード完了
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			モデルがアップロードされました。
-		</text>
-		<text name="inventory_text">
-			それはインベントリの「オブジェクト」フォルダにあります。
-		</text>
-		<text name="charged_fee">
-			あなたのアカウントに L$ [FEE] が請求されました。
-		</text>
-	</panel>
-	<button label="&lt;&lt; 戻る" name="back"/>
-	<button label="次へ&gt;&gt;" name="next"/>
-	<button label="ウェイトと料金の計算 &gt;&gt;" name="calculate"/>
-	<button label="計算中..." name="calculating"/>
-	<button label="アップロード" name="upload" tool_tip="シミュレーターにアップロード"/>
-	<button label="取り消し" name="cancel"/>
-	<button label="閉じる" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		待機状態
-	</string>
-	<string name="status_parse_error">
-		Dae に問題が見つかりました - 詳細についてはログをご参照ください。
-	</string>
-	<string name="status_reading_file">
-		ローディング...
-	</string>
-	<string name="status_generating_meshes">
-		メッシュを作成中
-	</string>
-	<string name="status_vertex_number_overflow">
-		エラー：頂点の数が65534を超過したので中止されました。
-	</string>
-	<string name="bad_element">
-		エラー：要素が無効です
-	</string>
-	<string name="high">
-		高
-	</string>
-	<string name="medium">
-		中
-	</string>
-	<string name="low">
-		低
-	</string>
-	<string name="lowest">
-		最低
-	</string>
-	<string name="mesh_status_good">
-		発送
-	</string>
-	<string name="mesh_status_na">
-		該当なし
-	</string>
-	<string name="mesh_status_none">
-		なし
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		テクスチャ編集可能な面の数は描画詳細度に応じて異なります。
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		メッシュインスタンスの数は描画詳細度に応じて異なります。
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		描画詳細度に対して頂点の数が多すぎます。
-	</string>
-	<string name="mesh_status_missing_lod">
-		必要な描画詳細度が見つかりません。
-	</string>
-	<string name="layer_all">
-		全て
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_moveview.xml b/indra/newview/skins/default/xui/ja/floater_moveview.xml
index aed3b78a14..aed3b78a14 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index 04ffd5254d..04ffd5254d 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
index c9a0ecefd7..c9a0ecefd7 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
index d708fc3dec..d708fc3dec 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
deleted file mode 100644
index bcddcc6907..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="近くのチャット">
-	<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_notification.xml b/indra/newview/skins/default/xui/ja/floater_notification.xml
index 0f37b30f52..0f37b30f52 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_notification.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
index c9d9ea7acb..c9d9ea7acb 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_object_weights.xml b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
index d727a268fb..d727a268fb 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/ja/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_openobject.xml b/indra/newview/skins/default/xui/ja/floater_openobject.xml
index af02ffedda..af02ffedda 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ja/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
index 70555e6ded..70555e6ded 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
index f1a05e0eec..f1a05e0eec 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..ada96b5b62
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="パスファインディングキャラクター">
+	<floater.string name="messaging_get_inprogress">
+		パスファインディングキャラクターを照会中...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		パスファインディングキャラクターの照会中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		パスファインディングキャラクターがありません。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_TOTAL] キャラクター中 [NUM_SELECTED] キャラクターが選択されました。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[group]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名前" name="name"/>
+			<scroll_list.columns label="説明" name="description"/>
+			<scroll_list.columns label="所有者" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="高度" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			キャラクター:
+		</text>
+		<button label="リストを更新" name="refresh_objects_list"/>
+		<button label="すべて選択" name="select_all_objects"/>
+		<button label="何も選択しない" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			選択したキャラクターに対するアクション:
+		</text>
+		<check_box label="ビーコンを表示" name="show_beacon"/>
+		<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
+		<button label="取る" name="take_objects"/>
+		<button label="コピーを取る" name="take_copy_objects"/>
+		<button label="私をそこにテレポートする" name="teleport_me_to_object" tool_tip="1 つのキャラクターが選択された場合にのみ有効です。"/>
+		<button label="返却" name="return_objects"/>
+		<button label="削除" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..ec107f3e6b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="パスファインディングの表示/テスト">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		パスファインディングライブラリの実装が見つかりません。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		地域（リージョン）の読み込みを待機しています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		ナビメッシュのステータスを確認しています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		ナビメッシュをダウンロードしています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		最新のナビメッシュがダウンロードされました。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		ナビメッシュを正しくダウンロードできません。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		ナビメッシュに保留中の変更があります。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		ナビメッシュを作成しています。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		ナビメッシュの一部の地域（リージョン）に保留中の変更があります。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		一部のナビメッシュ地域（リージョン）を構築しています。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		ナビメッシュの一部の地域（リージョン）に保留中の変更があり、その他の地域（リージョン）は構築中です。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		ナビメッシュは最新です。
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		パスファインディングライブラリの実装が見つかりません。
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		開始点と終了点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		開始点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		終了点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		パスはオレンジ色で表示されています。
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		選択した 2 点間のパスが見つかりません。
+	</floater.string>
+	<floater.string name="pathing_error">
+		パスの生成中にエラーが発生しました。
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="表示" name="view_panel">
+			<text name="show_label">
+				表示：
+			</text>
+			<check_box label="世界" name="show_world"/>
+			<check_box label="可動物のみ" name="show_world_movables_only"/>
+			<check_box label="ナビメッシュ" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				歩行可能マップを表示:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="表示しない" name="show_heatmap_mode_none"/>
+				<combo_box.item label="キャラクター タイプ A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="キャラクター タイプ B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="キャラクター タイプ C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="キャラクター タイプ D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="歩行可能" name="show_walkables"/>
+			<check_box label="素材ボリューム" name="show_material_volumes"/>
+			<check_box label="静的障害物" name="show_static_obstacles"/>
+			<check_box label="除外ボリューム" name="show_exclusion_volumes"/>
+			<check_box label="水上飛行機" name="show_water_plane"/>
+			<check_box label="X 線表示による" name="show_xray"/>
+		</panel>
+		<panel label="パスをテスト" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl キーを押しながらクリックして、開始点を選択します。
+			</text>
+			<text name="shift_click_label">
+				Shift キーを押しながらクリックして、終了点を選択します。
+			</text>
+			<text name="character_width_label">
+				キャラクターの幅
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				キャラクタータイプ
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="なし" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="パスをクリア" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..4441d5e738
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="パスファインディングリンクセット">
+	<floater.string name="messaging_get_inprogress">
+		パスファインディングリンクセットを照会中...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		パスファインディングリンクセットの照会中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		選択したパスファインディングリンクセットを修正中...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		選択したパスファインディングリンクセットの修正中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		パスファインディングリンクセットがありません。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_TOTAL] リンクセット中 [NUM_SELECTED] リンクセットが選択されました。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[group]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		はい
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		いいえ
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		不明
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		歩行可能
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		静的障害物
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		可動障害物
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		素材ボリューム
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		除外ボリューム
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		可動ボリューム
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[unmodifiable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restricted]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[concave]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restricted,concave]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		リンクセットの用途を選択...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="リンクセットの用途でフィルター..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="適用" name="apply_filters"/>
+		<button label="クリア" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名前（ルートプリム）" name="name"/>
+			<scroll_list.columns label="説明（ルートプリム）" name="description"/>
+			<scroll_list.columns label="所有者" name="owner"/>
+			<scroll_list.columns label="スクリプト" name="scripted"/>
+			<scroll_list.columns label="負荷" name="land_impact"/>
+			<scroll_list.columns label="距離" name="dist_from_you"/>
+			<scroll_list.columns label="リンクセットの用途" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			リンクセット:
+		</text>
+		<button label="リスト更新" name="refresh_objects_list"/>
+		<button label="すべて選択" name="select_all_objects"/>
+		<button label="何も選択しない" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="ビーコンを表示" name="show_beacon"/>
+		<button label="取る" name="take_objects"/>
+		<button label="コピーを取る" name="take_copy_objects"/>
+		<button label="私をそこにテレポートする" name="teleport_me_to_object"/>
+		<button label="返却" name="return_objects"/>
+		<button label="削除" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			歩行可能性:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="タイプ A のキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。"/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="タイプ B のキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。"/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="タイプ C のキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。"/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="タイプ D のキャラクターの歩行可能性。キャラクタータイプの例はその他です。"/>
+		<button label="変更を適用" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(ヒューマノイド)
+		</text>
+		<text name="suggested_use_b_label">
+			(クリーチャー)
+		</text>
+		<text name="suggested_use_c_label">
+			(メカニカル)
+		</text>
+		<text name="suggested_use_d_label">
+			(その他)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pay.xml b/indra/newview/skins/default/xui/ja/floater_pay.xml
index 17965fb60a..17965fb60a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_pay_object.xml b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
index 637ad496ef..637ad496ef 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_people.xml b/indra/newview/skins/default/xui/ja/floater_people.xml
index b180658ab7..b180658ab7 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_people.xml
+++ b/indra/newview/skins/default/xui/ja/floater_people.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
index 98cda25a81..98cda25a81 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_picks.xml b/indra/newview/skins/default/xui/ja/floater_picks.xml
index 359585eb86..359585eb86 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_picks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_places.xml b/indra/newview/skins/default/xui/ja/floater_places.xml
index 0d167444db..0d167444db 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_places.xml
+++ b/indra/newview/skins/default/xui/ja/floater_places.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 7c4d9c78ee..7c4d9c78ee 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml
deleted file mode 100644
index 9d9b59fa51..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="スナップショットをEメールで送信">
-	<text name="to_label">
-		受信先のEメール：
-	</text>
-	<line_editor left="145" name="to_form" width="125"/>
-	<text name="from_label">
-		あなたのEメール：
-	</text>
-	<line_editor left="145" name="from_form" width="125"/>
-	<text name="name_label">
-		あなたの名前：
-	</text>
-	<line_editor left="145" name="name_form" width="125"/>
-	<text name="subject_label">
-		件名：
-	</text>
-	<line_editor label="件名を入力してください" left="145" name="subject_form" width="125"/>
-	<text name="msg_label">
-		メッセージ：
-	</text>
-	<text_editor bottom_delta="-120" height="110" name="msg_form">
-		メッセージをここに入力してください。
-	</text_editor>
-	<check_box label="Web上で公開" name="allow_publish_check" tool_tip="このポストカードをWeb上で公開します。"/>
-	<check_box label="成人向けコンテンツ" name="mature_check" tool_tip="このポストカードには成人向け内容が含まれます。"/>
-	<button label="?" left="300" name="publish_help_btn"/>
-	<text name="fine_print">
-		この受信者がSLに参加すると、あなたに紹介ボーナスが入ります
-	</text>
-	<button bottom_delta="-52" label="取り消し" name="cancel_btn"/>
-	<button label="送信" name="send_btn"/>
-	<text name="default_subject">
-		[SECOND_LIFE] からのポストカードです。
-	</text>
-	<text name="default_message">
-		これは絶対チェック！
-	</text>
-	<string name="upload_message">
-		送信中...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index d48a8241ec..d48a8241ec 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
index 4638fd002e..4638fd002e 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
index a3042f66ea..a3042f66ea 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index 59ce36b022..59ce36b022 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
index ae8ae9f7b5..ae8ae9f7b5 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
index 5c0f05cec6..5c0f05cec6 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
index 4617fd1d92..4617fd1d92 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
index 10a46247a7..10a46247a7 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/ja/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
index f33406da51..f33406da51 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
index 4edb4972e4..4edb4972e4 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index d08c51c61e..d08c51c61e 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index dc34441535..dc34441535 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug.xml b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
index 0ac7a988e0..0ac7a988e0 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_limits.xml b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
index 7ccd858af7..7ccd858af7 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_preview.xml b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
index 656357aa17..656357aa17 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_queue.xml b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
index 97e79fb483..97e79fb483 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_script_search.xml b/indra/newview/skins/default/xui/ja/floater_script_search.xml
index bc4f48c995..bc4f48c995 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
index 0723be0068..0723be0068 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ b/indra/newview/skins/default/xui/ja/floater_search.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
index d41be86873..d41be86873 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index aa368eef11..aa368eef11 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index cb7950bf53..cb7950bf53 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index f145a2e8b8..f145a2e8b8 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
index 28d2388bed..28d2388bed 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
index 7d83309c46..7d83309c46 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
new file mode 100755
index 0000000000..31fbef9bcf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="スペルチェッカーの設定">
+	<check_box label="スペルチェッカーを有効にする" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		メイン辞書:
+	</text>
+	<text label="ログ：" name="spellcheck_additional">
+		その他の辞書：
+	</text>
+	<text name="spellcheck_available">
+		入手可
+	</text>
+	<text name="spellcheck_active">
+		有効
+	</text>
+	<button label="削除" name="spellcheck_remove_btn"/>
+	<button label="インポート..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..febe153d25
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="辞書をインポート">
+	<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
+	<button label="インポート" name="ok_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 6a1f34cfd8..1922e4841a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="秒ごとの KTris 描画" name="ktrissec"/>
 					<stat_bar label="オブジェクト合計" name="objs"/>
 					<stat_bar label="新規オブジェクト" name="newobjs"/>
+					<stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="テクスチャ" name="texture">
+					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
+					<stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency"/>
 					<stat_bar label="カウント" name="numimagesstat"/>
 					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
 					<stat_bar label="GL メモリ" name="gltexmemstat"/>
@@ -50,7 +53,13 @@
 				<stat_bar label="オブジェクト" name="simobjects"/>
 				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
 				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
+				<stat_bar label="スクリプト実行" name="simpctscriptsrun"/>
 				<stat_bar label="スクリプトイベント" name="simscripteps"/>
+				<stat_view label="パスファインディング" name="simpathfinding">
+					<stat_bar label="AIステップ時間" name="simsimaistepmsec"/>
+					<stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="パケットイン" name="siminpps"/>
 				<stat_bar label="パケットアウト" name="simoutpps"/>
 				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_sys_well.xml b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
index 45e97bdf5d..45e97bdf5d 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_telehub.xml b/indra/newview/skins/default/xui/ja/floater_telehub.xml
index 7318083771..7318083771 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ja/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
index 31b5bbd3bf..31b5bbd3bf 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
index 40fd8e9f93..40fd8e9f93 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/ja/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 399cffcce5..37233d3e68 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,24 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="テクスチャの選択">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		クリックして写真を選択
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		ピック:
+	</floater.string>
 	<text name="Multiple">
 		複数のテクスチャ
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="インベントリ" name="inventory" value="0"/>
+		<radio_item label="ローカル" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		サイズ： [DIMENSIONS]
 	</text>
 	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
-	<button label="なし" label_selected="なし" name="None"/>
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
-	<check_box label="フォルダを表示" name="show_folders_check"/>
-	<search_editor label="テクスチャをフィルター" name="inventory search editor"/>
-	<check_box label="すぐ適用" name="apply_immediate_check"/>
+	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
+	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="プレビュー無効"/>
+	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
+	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
+	<button label="追加" label_selected="追加" name="l_add_btn"/>
+	<button label="削除" label_selected="削除" name="l_rem_btn"/>
+	<button label="アップロード" label_selected="アップロード" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="名前" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<text name="pick title">
-		ピック:
-	</text>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..adc35137b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
+	<text name="total_num_fetched_label">
+		1, 取得したテクスチャの合計数：[NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, 取得リクエストの合計数：[NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, キャッシュヒットの合計数：[NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, 表示テクスチャの合計数：[NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, 表示テクスチャ取得リクエストの合計数：[NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, 取得したデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, 表示データの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, レンダリングされたデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_cache_read_label">
+		9, キャッシュ読み取りの合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_cache_write_label">
+		10, キャッシュ書き込みの合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_decode_label">
+		11, デコードの合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_gl_label">
+		12, glテクスチャ作成の合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_http_label">
+		13, HTTP 取得の合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_fetch_label">
+		14, 取得全体の合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, キャッシュから表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16、キャッシュからすべてのテクスチャを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17、HTTP から可視ファイルを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18、HTTP からすべてのテクスチャを再フェッチ中、時間: [TIME] 秒、フェッチ済み: [SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<spinner label="19、テセル/ピクセル比:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20、テクスチャ ソース:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="キャッシュ + HTTP" name="0"/>
+		<radio_item label="HTTP のみ" name="1"/>
+	</radio_group>
+	<button label="開始" name="start_btn"/>
+	<button label="リセット" name="clear_btn"/>
+	<button label="閉じる" name="close_btn"/>
+	<button label="キャッシュ読み取り" name="cacheread_btn"/>
+	<button label="キャッシュ書き込み" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="デコード" name="decode_btn"/>
+	<button label="GL テクスチャ" name="gl_btn"/>
+	<button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
+	<button label="すべてのキャッシュを再フェッチ" name="refetchallcache_btn"/>
+	<button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
+	<button label="すべての HTTP を再フェッチ" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 2d12a5e56a..5511433ae3 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				これらのオブジェクトを修正できません
 			</panel.string>
+			<panel.string name="text modify info 5">
+				地域（リージョン）の境界を越えてこのオブジェクトを修正できません
+			</panel.string>
+			<panel.string name="text modify info 6">
+				地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
+			</panel.string>
 			<panel.string name="text modify warning">
 				オブジェクト全体を選択して権限の設定を行ってください。
 			</panel.string>
@@ -203,12 +209,12 @@
 				<combo_box.item label="ズームする" name="Zoom"/>
 			</combo_box>
 			<check_box label="販売対象：" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="コピー" name="Copy"/>
 				<combo_box.item label="中身" name="Contents"/>
 				<combo_box.item label="オリジナル" name="Original"/>
 			</combo_box>
-			<spinner label="価格： L$" name="Edit Cost"/>
 			<check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -244,6 +250,11 @@
 					F：
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					パスファインディング属性:
+				</text>
+			</panel>
 		</panel>
 		<panel label="形状" name="Object">
 			<check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。 この機能を使うと、制作中の意図せぬ編集を防ぐことができます"/>
@@ -458,16 +469,11 @@
 				<combo_box.item label="吸い込み" name="suction"/>
 				<combo_box.item label="織目" name="weave"/>
 			</combo_box>
-			<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。 平面テクスチャのマッピングが必要です。"/>
-			<text name="rpt">
-				反復 / 面
-			</text>
 			<spinner label="水平（U）" name="TexScaleU"/>
 			<check_box label="反転" name="checkbox flip s"/>
 			<spinner label="垂直（V）" name="TexScaleV"/>
 			<check_box label="反転" name="checkbox flip t"/>
 			<spinner label="回転˚" name="TexRot"/>
-			<spinner label="反復 / メーター" name="rptctrl"/>
 			<button label="適用" label_selected="適用" name="button apply"/>
 			<text name="tex offset">
 				テクスチャのズレ
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index bfc93e5624..c44f409d4e 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		時間
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Monoタイム
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		上部コライダー
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="名前" name="name"/>
 		<scroll_list.columns label="所有者" name="owner"/>
 		<scroll_list.columns label="ロケーション" name="location"/>
+		<scroll_list.columns label="区画" name="parcel"/>
 		<scroll_list.columns label="時間" name="time"/>
-		<scroll_list.columns label="Monoタイム" name="mono_time"/>
 		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="メモリ（KB）" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		物体ID：
@@ -48,6 +46,10 @@
 		所有者：
 	</text>
 	<button label="フィルタ" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		区画：
+	</text>
+	<button label="フィルター" name="filter_parcel_btn"/>
 	<button label="更新" name="refresh_btn"/>
 	<button label="選択内容を返却" name="return_selected_btn"/>
 	<button label="すべて返却" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index ae064724c0..ae064724c0 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_toybox.xml b/indra/newview/skins/default/xui/ja/floater_toybox.xml
index 682352ec82..682352ec82 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index 27143086ac..27143086ac 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 8e09e4748a..8e09e4748a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..44e96c35ad
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ボイスチャットの音量">
+	<slider label="ボイスチャット" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
index f7d3fd11e0..f7d3fd11e0 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index ee675e143b..b38ea9331a 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィング">
+<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
 	<string name="no_voice_effect">
 		（ボイスモーフィングなし）
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
new file mode 100644
index 0000000000..a380615d5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ボイス音量">
+	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_web_content.xml b/indra/newview/skins/default/xui/ja/floater_web_content.xml
index 48fe8aee78..48fe8aee78 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ja/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index 34aba9d485..34aba9d485 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index 152a5f4806..416813d6cc 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -7,10 +7,17 @@
 		ウィンドウのサイズを設定：
 	</text>
 	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
-		<combo_box.item label="1000 x 700 （標準）" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 （720p）" name="item2"/>
-		<combo_box.item label="1920 x 1080 （1080p）" name="item3"/>
+		<combo_box.item label="1000 x 700 （デフォルト）" name="item1"/>
+		<combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/>
+		<combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/>
+		<combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/>
+		<combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/>
+		<combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/>
+		<combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/>
+		<combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/>
+		<combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/>
+		<combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/>
+		<combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="キャンセル" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index cc07596adc..cc07596adc 100644..100755
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_avatar.xml b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
index 42b67cd333..42b67cd333 100644..100755
--- a/indra/newview/skins/default/xui/ja/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_group.xml b/indra/newview/skins/default/xui/ja/inspect_group.xml
index be628befdf..be628befdf 100644..100755
--- a/indra/newview/skins/default/xui/ja/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_object.xml b/indra/newview/skins/default/xui/ja/inspect_object.xml
index e6999ac9b1..e6999ac9b1 100644..100755
--- a/indra/newview/skins/default/xui/ja/inspect_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
index 483d3fec52..483d3fec52 100644..100755
--- a/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/ja/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
index 91e8f4be7c..91e8f4be7c 100644..100755
--- a/indra/newview/skins/default/xui/ja/language_settings.xml
+++ b/indra/newview/skins/default/xui/ja/language_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
index 982a03c6a8..982a03c6a8 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 5adf0b3745..930af10692 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="フリーズ" name="Freeze..."/>
 	<menu_item_call label="追放" name="Eject..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払う" name="Pay..."/>
 	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
index 6036e1075e..d87ef8e2a0 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="グループ" name="Groups..."/>
 	<menu_item_call label="プロフィール" name="Profile..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="下に落とす" name="Drop"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
index b04f602134..b04f602134 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index 54dd96f5ef..f9cadc36ac 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="フリーズ" name="Freeze..."/>
 	<menu_item_call label="追放" name="Eject..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払う" name="Pay..."/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
index 4709522665..eb8e98059a 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="グループ" name="Groups..."/>
 	<menu_item_call label="プロフィール" name="Profile..."/>
 	<menu_item_call label="テクスチャのデバッグ" name="Debug..."/>
+	<menu_item_call label="ダンプ XML" name="Dump XML"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
deleted file mode 100644
index 7f106c1ab5..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="スピーカーボタン" name="EnableVoiceChat"/>
-	<menu_item_check label="ジェスチャーボタン" name="ShowGestureButton"/>
-	<menu_item_check label="移動ボタン" name="ShowMoveButton"/>
-	<menu_item_check label="視界ボタン" name="ShowCameraButton"/>
-	<menu_item_check label="スナップショットボタン" name="ShowSnapshotButton"/>
-	<menu_item_check label="制作ボタン" name="ShowBuildButton"/>
-	<menu_item_check label="検索ボタン" name="ShowSearchButton"/>
-	<menu_item_check label="地図ボタン" name="ShowWorldMapButton"/>
-	<menu_item_check label="ミニマップボタン" name="ShowMiniMapButton"/>
-	<menu_item_call label="切り取り" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="コピー" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="貼り付け" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="削除" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="すべて選択" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
index e786d02e40..e786d02e40 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
index eb5faa2545..eb5faa2545 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
index d984342896..d984342896 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index a071abbd2e..07bcefd9b3 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
new file mode 100644
index 0000000000..66940471da
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="会話を終える" name="close_conversation"/>
+	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
+	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
+	<menu_item_call label="選択した項目を閉じる" name="close_selected_conversations"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="フレンドを追加" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+	<menu_item_call label="グループ情報" name="group_profile"/>
+	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
+	<menu_item_call label="グループから脱退する" name="leave_group"/>
+	<context_menu label="モデレーターのオプション" name="Moderator Options">
+		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
+		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
+		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..c9d4f947a4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="ボイスコール..." name="Call"/>
+	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="Invite"/>
+	<menu_item_call label="地図" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..bd4812603f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
+	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
+	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_edit.xml b/indra/newview/skins/default/xui/ja/menu_edit.xml
index c2ef0179b2..c2ef0179b2 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_edit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_favorites.xml b/indra/newview/skins/default/xui/ja/menu_favorites.xml
index 4708b1446c..4708b1446c 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ja/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
index abf490a247..abf490a247 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_group_plus.xml b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
index 3787f7d645..3787f7d645 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
index 2e633ae1b2..2e633ae1b2 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
new file mode 100644
index 0000000000..55cd6610f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="プロフィールを表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="チャットの履歴..." name="chat_history"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払い" name="Pay"/>
+	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
+	<menu_item_check label="文字をブロックする" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..222a741718
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="簡略表示" name="compact_view"/>
+	<menu_item_check label="詳細表示" name="expanded_view"/>
+	<menu_item_check label="時間を表示" name="IMShowTime"/>
+	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml b/indra/newview/skins/default/xui/ja/menu_im_well_button.xml
deleted file mode 100644
index 3397004bd7..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="すべて閉じる" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
index 8cd6fa4a27..8cd6fa4a27 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
index 5bcb96f083..5bcb96f083 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
index 5453f998fa..5453f998fa 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/ja/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
index 9d0d0f10a6..9d0d0f10a6 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
index 5a0519ba19..5a0519ba19 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
index e3e206f3aa..e3e206f3aa 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
index 9a4a8138f5..9a4a8138f5 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index d1893a0fc8..106b09453a 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="システムフォルダを削除する" name="Delete System Folder"/>
 	<menu_item_call label="コンファレンスチャットを開始する" name="Conference Chat Folder"/>
 	<menu_item_call label="再生する" name="Sound Play"/>
+	<menu_item_call label="SLurl をコピー" name="url_copy"/>
 	<menu_item_call label="ランドマークの情報" name="About Landmark"/>
 	<menu_item_call label="インワールドで再生する" name="Animation Play"/>
 	<menu_item_call label="ローカルで再生する" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
index ae5ddbb78f..ae5ddbb78f 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
index f38dbc71a8..f38dbc71a8 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_land.xml b/indra/newview/skins/default/xui/ja/menu_land.xml
index 89c122f14f..3754bd7fa4 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_land.xml
+++ b/indra/newview/skins/default/xui/ja/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="入場許可を購入" name="Land Buy Pass"/>
 	<menu_item_call label="制作" name="Create"/>
 	<menu_item_call label="地形を編集" name="Edit Terrain"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_landmark.xml b/indra/newview/skins/default/xui/ja/menu_landmark.xml
index c134422955..c134422955 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index ab6d9e3546..3918732fa8 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="利用規約を表示" name="TOS"/>
 		<menu_item_call label="クリティカルメッセージを表示" name="Critical"/>
 		<menu_item_call label="Web コンテンツフローターのデバッグテスト" name="Web Content Floater Debug Test"/>
-		<menu label="ログレベルを設定" name="Set Logging Level"/>
+		<menu label="ログレベルを設定" name="Set Logging Level">
+			<menu_item_check label="デバッグ" name="Debug"/>
+			<menu_item_check label="情報" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="エラー" name="Error"/>
+			<menu_item_check label="なし" name="None"/>
+		</menu>
 		<menu_item_check label="グリッドピッカーを表示する" name="Show Grid Picker"/>
 		<menu_item_call label="通知コンソールを表示する" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
index faae4ef717..faae4ef717 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index 2e733ee24b..2e733ee24b 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_mode_change.xml b/indra/newview/skins/default/xui/ja/menu_mode_change.xml
deleted file mode 100644
index dff3392bd5..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="ベーシック" name="BasicMode"/>
-	<menu_item_check label="アドバンス" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
index 43f86e84bf..43f86e84bf 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_mute_particle.xml b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
new file mode 100644
index 0000000000..8dab025309
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_navbar.xml b/indra/newview/skins/default/xui/ja/menu_navbar.xml
index 9ae2e58198..9ae2e58198 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
index c2e4a27686..c2e4a27686 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
index 913bae8958..913bae8958 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 4cee8089ee..39c32bc41e 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -10,6 +10,8 @@
 	<menu_item_call label="立ち上がる" name="Object Stand Up"/>
 	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
+	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
+	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
 	<context_menu label="装着" name="Put On">
 		<menu_item_call label="装着" name="Wear"/>
 		<menu_item_call label="追加" name="Add"/>
@@ -26,4 +28,5 @@
 	<menu_item_call label="支払う" name="Pay..."/>
 	<menu_item_call label="買う" name="Buy..."/>
 	<menu_item_call label="削除" name="Delete"/>
+	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 8c4f328661..6448e9244e 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
 	<menu_item_call label="ブロック..." name="Block"/>
+	<menu_item_call label="地図に表示" name="show_on_map"/>
+	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 2bcbe1915b..1969ae2a10 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="髪" name="New Hair"/>
 		<menu_item_call label="目" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="フォルダをすべて開く" name="expand"/>
+	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
index 9491c22f31..9491c22f31 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index 64d8ded722..64d8ded722 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
new file mode 100644
index 0000000000..5816351d9d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
+	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
+	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
+	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
+	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
+	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
+	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
+	<menu_item_check label="会話ログ..." name="Conversation"/>
+	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
+	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..b5c9d11e02
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="ブロック解除" name="unblock"/>
+	<menu_item_call label="プロフィール..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..3e74b2ddff
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
+	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..4b86a353f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
+	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
new file mode 100644
index 0000000000..b95d11fdbd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
+	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
index 76340e4d76..76340e4d76 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 842d79dc4b..2c0c85ba28 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="ボイスコール" name="Call"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
new file mode 100644
index 0000000000..4a9e402fa4
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
index bfc7d15017..bfc7d15017 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 8d84b0e521..972ab767bf 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールの表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="プロフィールを表示" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="ボイスコール" name="voice_call"/>
+	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
+	<menu_item_call label="フレンド登録" name="add_friend"/>
+	<menu_item_call label="フレンドを削除" name="remove_friend"/>
+	<menu_item_call label="グループに招待..." name="invite_to_group"/>
+	<menu_item_call label="ズームイン" name="zoom_in"/>
+	<menu_item_call label="地図" name="map"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index 3f20e5d3ab..fe85e278cf 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="Add Friends"/>
-	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="コール" name="Call"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払う" name="Pay"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
+	<menu_item_call label="フレンド登録" name="add_friends"/>
+	<menu_item_call label="フレンドを削除" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="コール" name="call"/>
+	<menu_item_call label="共有" name="share"/>
+	<menu_item_call label="支払い" name="pay"/>
+	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..b7cccc4396
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+	<menu_item_check label="地図を表示" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
index 44c5438509..44c5438509 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
new file mode 100644
index 0000000000..feaeba4398
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
+	<menu_item_check label="名前で並べ替え" name="sort_name"/>
+	<menu_item_check label="人のアイコン表示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
index b4f177a068..b4f177a068 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_picks.xml b/indra/newview/skins/default/xui/ja/menu_picks.xml
index 011d3d2526..011d3d2526 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_picks.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
index 84bf90fea0..84bf90fea0 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/ja/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_place.xml b/indra/newview/skins/default/xui/ja/menu_place.xml
index a9f05e126d..a9f05e126d 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_place.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
index d5ce88b055..d5ce88b055 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ja/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
index c455204722..c455204722 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
index 579f2c2cbd..579f2c2cbd 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ja/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
index 9d3a5dda1c..9d3a5dda1c 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
index 6513d9264a..6513d9264a 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/ja/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
index a89dd0bcbe..a89dd0bcbe 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/ja/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 61ba3085d9..61ba3085d9 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
index 901eab9166..901eab9166 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
index 66bc32214f..66bc32214f 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
index 4dd44d2ec8..4dd44d2ec8 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
index fcb1038a6a..eda973c888 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="（不明）" name="Suggestion 1"/>
+	<menu_item_call label="（不明）" name="Suggestion 2"/>
+	<menu_item_call label="（不明）" name="Suggestion 3"/>
+	<menu_item_call label="（不明）" name="Suggestion 4"/>
+	<menu_item_call label="（不明）" name="Suggestion 5"/>
+	<menu_item_call label="辞書に追加" name="Add to Dictionary"/>
+	<menu_item_call label="無視に追加" name="Add to Ignore"/>
 	<menu_item_call label="切り取り" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
 	<menu_item_call label="貼り付け" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_toolbars.xml b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
index d5363a5131..d5363a5131 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/ja/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
index 1a67a2a8f7..1a67a2a8f7 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/ja/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 92d118a5ae..639602ce3c 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
+	<menu_item_call label="プロフィールを表示" name="show_agent"/>
+	<menu_item_call label="IM を送信..." name="send_im"/>
+	<menu_item_call label="フレンドを追加..." name="add_friend"/>
+	<menu_item_call label="フレンドを削除..." name="remove_friend"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_group.xml b/indra/newview/skins/default/xui/ja/menu_url_group.xml
index 1dd3d79438..1dd3d79438 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
index c3da8a8686..c3da8a8686 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
index 147ab44a1b..147ab44a1b 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_map.xml b/indra/newview/skins/default/xui/ja/menu_url_map.xml
index 8d41e1a571..8d41e1a571 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index d6a048dcfc..a02ca8415d 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
+	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
+	<menu_item_call label="ブロック..." name="block_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
index 8d264059d3..8d264059d3 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
index a516c5a075..a516c5a075 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
index 2c857ec915..2c857ec915 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
index c3507a9a33..c3507a9a33 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 8496dfb1db..b1ec62115c 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="ログイン" name="Status">
-			<menu_item_call label="一時退席中" name="Set Away"/>
-			<menu_item_call label="取り込み中" name="Set Busy"/>
+			<menu_item_check label="一時退席中" name="Away"/>
+			<menu_item_check label="着信拒否" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
 		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
@@ -28,17 +28,25 @@
 		<menu_item_call label="環境設定..." name="Preferences"/>
 		<menu_item_call label="ツールバーのボタン..." name="Toolbars"/>
 		<menu_item_call label="全てのコントロールを非表示にする" name="Hide UI"/>
+		<menu_item_check label="HUD を表示" name="Show HUD Attachments"/>
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="チャット..." name="Nearby Chat"/>
+		<menu_item_check label="会話..." name="Conversations"/>
+		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
-		<menu_item_check label="ボイス設定..." name="Nearby Voice"/>
-		<menu_item_check label="ボイスモーフィング..." name="ShowVoice"/>
+		<menu_item_check label="会話ログ..." name="Conversation Log..."/>
+		<menu label="ボイスモーフィング" name="VoiceMorphing">
+			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
+			<menu_item_check label="プレビュー..." name="Preview"/>
+			<menu_item_call label="申し込む..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_call label="フレンド" name="My Friends"/>
-		<menu_item_call label="グループ" name="My Groups"/>
-		<menu_item_call label="近くにいる人" name="Active Speakers"/>
+		<menu_item_check label="フレンド" name="My Friends"/>
+		<menu_item_check label="グループ" name="My Groups"/>
+		<menu_item_check label="近くにいる人" name="Active Speakers"/>
+		<menu_item_call label="リストをブロック" name="Block List"/>
+		<menu_item_check label="着信拒否" name="Do Not Disturb"/>
 	</menu>
 	<menu label="世界" name="World">
 		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
@@ -107,13 +115,13 @@
 			<menu_item_call label="次の部分を含める" name="Include Next Part"/>
 			<menu_item_call label="前回の部分を含める" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="リンクセット..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="選択したものに焦点を合わせる" name="Focus on Selection"/>
 		<menu_item_call label="選択したものをズームする" name="Zoom to Selection"/>
 		<menu label="オブジェクト" name="Object">
 			<menu_item_call label="買う" name="Menu Object Buy"/>
 			<menu_item_call label="取る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
-			<menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
 		</menu>
@@ -124,6 +132,12 @@
 			<menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running"/>
 			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="パスファインディング" name="Pathfinding">
+			<menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="オプション" name="Options">
 			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
 			<menu_item_check label="私のオブジェクトだけを選択する" name="Select Only My Objects"/>
@@ -152,6 +166,13 @@
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="ハウツー..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
+		<menu_item_call label="ユーザーガイド" name="User’s guide"/>
+		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
+		<menu_item_call label="日本語サポートページ" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
 		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
@@ -174,7 +195,6 @@
 			<menu_item_check label="パーティクルを非表示にする" name="Hide Particles"/>
 			<menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
 			<menu_item_check label="透明部分をハイライトする" name="Highlight Transparent"/>
-			<menu_item_check label="HUD を表示する" name="Show HUD Attachments"/>
 			<menu_item_check label="一人称視点のときに十字線を表示する" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="レンダリング（種類）" name="Rendering Types">
@@ -227,11 +247,10 @@
 			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
 			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
 			<menu_item_call label="通知コンソール" name="Notifications"/>
-			<menu_item_check label="テクスチャサイズのコンソール" name="Texture Size"/>
-			<menu_item_check label="テクスチャカテゴリのコンソール" name="Texture Category"/>
 			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
 			<menu_item_check label="メモリ" name="Memory"/>
 			<menu_item_check label="風景の統計" name="Scene Statistics"/>
+			<menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
 			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
 			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
@@ -266,6 +285,7 @@
 			<menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
 			<menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/>
 			<menu_item_check label="フレームテスト" name="Frame Test"/>
+			<menu_item_call label="フレームプロフィール" name="Frame Profile"/>
 		</menu>
 		<menu label="メタデータのレンダー" name="Render Metadata">
 			<menu_item_check label="バウンディングボックス" name="Bounding Boxes"/>
@@ -289,14 +309,21 @@
 			<menu_item_check label="描画の詳細度" name="rendercomplexity"/>
 			<menu_item_check label="添付アイテムのバイト数" name="attachment bytes"/>
 			<menu_item_check label="スカルプト" name="Sculpt"/>
+			<menu label="テクスチャの密度" name="Texture Density">
+				<menu_item_check label="なし" name="None"/>
+				<menu_item_check label="現在" name="Current"/>
+				<menu_item_check label="望ましい" name="Desired"/>
+				<menu_item_check label="フル" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="レンダリング" name="Rendering">
 			<menu_item_check label="軸" name="Axes"/>
 			<menu_item_check label="接線基底" name="Tangent Basis"/>
 			<menu_item_call label="選択したテクスチャ情報基底" name="Selected Texture Info Basis"/>
+			<menu_item_call label="選択したマテリアル情報" name="Selected Material Info"/>
 			<menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
 			<menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
-			<menu_item_check label="光と影" name="Lighting and Shadows"/>
+			<menu_item_check label="高度なライティングモデル" name="Advanced Lighting Model"/>
 			<menu_item_check label="太陽・月・プロジェクタからの影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO と影の平滑化" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL デバッグ" name="Debug GL"/>
@@ -306,8 +333,6 @@
 			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
 			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
 			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
-			<menu_item_check label="テクスチャの検査" name="Audit Textures"/>
-			<menu_item_check label="テクスチャアトラス（試験段階）" name="Texture Atlas"/>
 			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
 			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
 			<menu_item_check label="マウスオーバーで強調表示する" name="Hover Glow Objects"/>
@@ -343,7 +368,6 @@
 			<menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
 			<menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
 			<menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
-			<menu_item_call label="メモリ使用状況" name="Memory Stats"/>
 			<menu_item_check label="地域デバッグコンソール" name="Region Debug Console"/>
 			<menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
 			<menu_item_check label="ダブルクリック" name="Debug Clicks"/>
@@ -373,12 +397,16 @@
 				<menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
 				<menu_item_call label="男性アバターのテスト" name="Test Male"/>
 				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
-				<menu_item_call label="PG のトグル" name="Toggle PG"/>
 				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="アニメーションのスピード" name="Animation Speed">
+				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
+				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
+				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
+				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
 			<menu_item_check label="アニメーション情報" name="Animation Info"/>
-			<menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
 			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
 			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
 			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
index c402fa0b6d..c402fa0b6d 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
index 5334042dc9..5334042dc9 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
index 9effed1f42..9effed1f42 100644..100755
--- a/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 54663a0367..54663a0367 100644..100755
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
diff --git a/indra/newview/skins/default/xui/ja/mime_types_linux.xml b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
index 0ec1030113..0ec1030113 100644..100755
--- a/indra/newview/skins/default/xui/ja/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/ja/mime_types_mac.xml b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
index 0ec1030113..0ec1030113 100644..100755
--- a/indra/newview/skins/default/xui/ja/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 54031ccf12..f1c916bf53 100644..100755
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -144,7 +150,7 @@
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="保存しない" yestext="すべて保存"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
-		フレンド以外からのコールやインスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
+		フレンド以外の人からのコールや、インスタントメッセージを無視する設定にしたことを、相手に知られることはありません。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="FavoritesOnLogin">
@@ -215,6 +221,14 @@
 この能力を [ROLE_NAME] に割り当てますか？
 		<usetemplate name="okcancelbuttons" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		[AVATAR_NAME] をグループから追放しようとしています。
+		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		[COUNT] 名のメンバーをグループから追放しようとしています。
+		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		アタッチメントを下に置こうとしています。
 続けますか？
@@ -382,13 +396,19 @@ L$ が不足しているのでこのグループに参加することができ�
 
 [SECOND_LIFE] に入るにはアカウントが必要です。今すぐアカウントを作成しますか？
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=ja-JP
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="もう一度試す" yestext="新しいアカウントを作成"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; は有効なグリッド ID ではありません。
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		ログイン位置で有効なグリッドが指定されませんでした。
+	</notification>
 	<notification name="DeleteClassified">
 		クラシファイド広告 [NAME] を削除しますか？
 支払い済みの料金は返金されません。
@@ -495,7 +515,7 @@ L$ が不足しているのでこのグループに参加することができ�
 	</notification>
 	<notification name="StartRegionEmpty">
 		ログイン位置が指定されていません。
-ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「ホーム」を選択してください。
+ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅（ホーム）」を選択してください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -517,6 +537,33 @@ L$ が不足しているのでこのグループに参加することができ�
 		</url>
 		<usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		おそらくお使いのグラフィックチップ用の新しいドライバが入手可能です。グラフィックドライバを更新することにより、パフォーマンスが大幅に向上する場合があります。
+
+[_URL] にアクセスして更新版のドライバがあるかどうかを確認しますか？
+		<url name="url">
+			http://www.intel.com/p/ja_JP/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
+
+[_URL] へアクセスして、ドライバーを更新しますか。
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -614,6 +661,9 @@ L$ が不足しているのでこのグループに参加することができ�
 
 どのオブジェクトもロックされておらず、あなたのものであることを確認してください。
 	</notification>
+	<notification name="CannotLinkPermanent">
+		地域（リージョン）の境界を越えてオブジェクトをリンクできません。
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		所有者が異なるため、オブジェクトをリンクできません。
 
@@ -1000,6 +1050,40 @@ L$ は返金されません。
 			<button name="Cancel" text="キャンセル"/>
 		</form>
 	</notification>
+	<notification label="自動置換リストを追加" name="AddAutoReplaceList">
+		新しいリストの名前:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">
+		名前 &apos;[DUPNAME]&apos; は既に使われています
+一意の名前を入力してください:
+		<form name="form">
+			<button name="ReplaceList" text="着用中のリストを入れ替える"/>
+			<button name="SetName" text="新しい名前を使用"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		キーワードは一語でなければならず、置換は空にできません。
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		その置換リストは無効です。
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		ファイル、名前および言語を指定する必要があります。
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		辞書 [DIC_NAME] に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
+この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。
+
+https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してください。
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		[FROM_NAME] から
+
+[TO_NAME] へコピーできません
+	</notification>
 	<notification label="アウトフィットを保存する" name="SaveOutfitAs">
 		着用中のアウトフィットを新しいアウトフットとして保存：
 		<form name="form">
@@ -1063,7 +1147,7 @@ L$ は返金されません。
 金額を増やしてください。
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		ここにリンクされたアイテムが少なくとも1つあります。  このアイテムを削除するとここにリンクされたものが機能しなくなります。  リンクを先に削除することを強くお勧めします。
+		1 つ以上のアイテムにポイントするリンクがあります。このアイテムを削除する場合、そのリンクは永久に機能しなくなります。まず最初にリンクを削除することを強くお勧めします。
 
 これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
@@ -1081,9 +1165,9 @@ L$ は返金されません。
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		選択したアイテムのうち、少なくとも 1 つがあなたの所有物ではありません。
+		選択したアイテムの 1 つ以上を所有していません。
 
-本当に削除しますか？
+これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1094,26 +1178,26 @@ L$ は返金されません。
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		少なくとも 1 つのオブジェクトがロックされています。
-少なくとも 1 つのオブジェクトが、あなたの所有物ではありません。
+		1 つ以上のオブジェクトがロックされました。
+1 つ以上のオブジェクトを所有していません。
 
-本当に削除しますか？
+これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		少なくとも 1 つのオブジェクトがコピーできません。
-少なくとも 1 つのオブジェクトが、あなたの所有物ではありません。
+		1 つ以上のオブジェクトがコピーできません。
+1 つ以上のオブジェクトを所有していません。
 
-本当に削除しますか？
+これらのアイテムを削除しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		少なくとも 1 つのオブジェクトがロックされています。
-少なくとも 1 つのオブジェクトがコピーできません。
-少なくとも 1 つのオブジェクトが、あなたの所有物ではありません。
+		1 つ以上のオブジェクトがロックされています。
+1 つ以上のオブジェクトがコピーできません。
+1 つ以上のオブジェクトを所有していません。
 
-本当に削除しますか？
-		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="OK"/>
+これらのアイテムを削除しますか？
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		少なくとも 1 つのオブジェクトがロックされています。
@@ -1182,7 +1266,7 @@ L$ は返金されません。
 近くのリージョンに移動しました。
 	</notification>
 	<notification name="AvatarMovedLast">
-		前回いた場所は現在ご利用いただけません。
+		リクエストされた場所は現在ご利用いただけません。
 近くのリージョンに移動しました。
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1201,8 +1285,7 @@ L$ は返金されません。
 		[APP_NAME] のインストールが完了しました。
 
 [SECOND_LIFE] を使ったことがない場合は、ログインする前にアカウントの作成を行ってください。
-[http://join.secondlife.com/?lang=ja-JP] で新しいアカウントを作成しますか？
-		<usetemplate name="okcancelbuttons" notext="続行" yestext="新規アカウント..."/>
+		<usetemplate name="okcancelbuttons" notext="続行" yestext="アカウントを作成..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		接続がなかなかできません。 お使いのインターネット接続か、[SECOND_LIFE_GRID] の問題と考えられます。
@@ -1438,13 +1521,43 @@ http://secondlife.com/download から最新バージョンをダウンロード�
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		必要なソフトウェアのアップデートをダウンロードしました。
-バージョン [VERSION]
+バージョン [VERSION] [[INFO_URL] このアップデートに関する情報]
 
 アップデートをインストールするには [APP_NAME] を再起動する必要があります。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+[[INFO_URL] このアップデートに関する情報]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		お使いの [APP_NAME] に必要なアップデートをダウンロードしました。
+バージョン [VERSION] 
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+このアップデートの詳細については、[[INFO_URL] を参照してください]
+		<usetemplate name="okcancelbuttons" notext="後で実行" yestext="今すぐインストールして [APP_NAME] を再起動"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		お使いの [APP_NAME] に必要なアップデートをダウンロードしました。
+バージョン [VERSION]
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+[[INFO_URL] このアップデートに関する情報] を参照
+		<usetemplate name="okcancelbuttons" notext="後で実行" yestext="今すぐインストールして [APP_NAME] を再起動"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		必要なソフトウェアのアップデートをダウンロードしました。
+バージョン [VERSION]
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+[[INFO_URL] このアップデートに関する情報] を参照
+
+アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		アップデートをインストールするには [APP_NAME] を再起動する必要があります。
+この試験的なビューアが [NEW_CHANNEL] ビューアに置き換えられています;
+[[INFO_URL] このアップデートに関する情報] を参照
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1497,6 +1610,10 @@ http://secondlife.com/download から最新バージョンをダウンロード�
 グループから脱退しますか？
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		グループを抜けることができません。グループの最後のオーナーであるため、グループを抜けることができません。最初に、別のメンバーをオーナーの役割に割り当ててください。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		本当に住人全員をグリッドから追い出しますか？
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="住人全員を追い出す"/>
@@ -1525,10 +1642,13 @@ http://secondlife.com/download から最新バージョンをダウンロード�
 		現在フレンドシップを送れません。数分後にもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		取り込み中モードになりました。
-チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
-		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		「通知を受けない」がオンになります。着信通信はあなたには通知されません。
+
+- 他の住民は「通知を受けない」の応答（「設定」&gt;「一般」で設定）を受け取ることになります。
+- テレポートのオファーはすべて受け取り拒否となります。
+- ボイスコールは拒否されます。
+		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
@@ -1724,83 +1844,128 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ�
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。 年齢を確認する際の情報に不足があったためと考えられます。
-
-最新ビューワがインストールされているかをご確認ください。このレーティング区分でのアクセスに関する詳細はナレッジベースをご覧ください。
+		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。
-
-ナレッジベースを開きレーティング区分について学びますか？
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="レーティング区分の制限のため、リージョンに入ることができないとき" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+		<usetemplate ignoretext="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツ除外するように設定されています。
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		レーティング区分に関する設定により、その地域（リージョン）には立ち入れません。
-
-その地域に入るには、あなたのレーティング区分の設定を変更してください。変更すると、[REGIONMATURITY]のコンテンツの検索やアクセスが可能になります。変更内容を元に戻すには、ミー &gt; 環境設定 &gt; 一般を選択してください。
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、取り消すことができます。環境設定を変更した後、もう一度、地域（リージョン）に入ることができます。
+		<form name="form">
+			<button name="OK" text="環境設定の変更"/>
+			<button default="true" name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="テレポート：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+		<form name="form">
+			<button name="OK" text="変更して続ける"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、テレポートを取り消すことができます。環境設定を変更した後、もう一度テレポートを実行する必要があります。
 		<form name="form">
 			<button name="OK" text="環境設定の変更"/>
-			<button default="true" name="Cancel" text="閉じる"/>
-			<ignore name="ignore" text="選択したレーティング区分が原因で、リージョンに入れないとき"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		あなたのレーティング区分設定は現在 [RATING] です。
+		今後、[RATING] コンテンツ付きの地域（リージョン）を訪問しようとしているという通知を受け取りません。後でメニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、コンテンツの環境設定を変更できます。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		現在、[PREFERRED_MATURITY] コンテンツを表示するように環境設定を変更できませんでした。あなたの環境設定は、[ACTUAL_MATURITY] コンテンツを表示するようにリセットされました。メニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、もう一度環境設定を変更できます。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		あなたのレーティング区分により、この土地を取得することはできません。 年齢を確認する際の情報に不足があったためと考えられます。
-
-最新ビューワがインストールされているかをご確認ください。このレーティング区分でのアクセスに関する詳細はナレッジベースをご覧ください。
+		取得しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		あなたのレーティング区分により、この土地を取得することはできません。
-
-ナレッジベースを開きレーティング区分について学びますか？
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		この土地を購入できるのは、成人だけです。
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="レーティング区分の制限のため、この土地を取得できません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+		<usetemplate ignoretext="この土地を購入できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		あなたのレーティング区分により、この土地を取得することはできません。
+		取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		取得しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		あなたのレーティング区分設定により、この土地を取得することはできません。
-
-「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
-		<usetemplate ignoretext="選択したレーティング区分が原因で、土地を取得できないとき" name="okcancelignore" notext="閉じる" yestext="設定の変更"/>
+		取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の取得を試みることができます。
+		<form name="form">
+			<button name="OK" text="環境設定の変更"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="取得しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		あなたのレーティング区分により、この土地を購入することはできません。 年齢を確認する際の情報に不足があったためと考えられます。
-
-最新ビューワがインストールされているかをご確認ください。このレーティング区分でのアクセスに関する詳細はナレッジベースをご覧ください。
+		購入しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		あなたのレーティング区分により、この土地を購入することはできません。
-
-ナレッジベースを開きレーティング区分について学びますか？
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		この土地を取得できるのは、成人だけです。
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="レーティング区分の制限のため、この土地を購入できません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+		<usetemplate ignoretext="この土地を取得できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		あなたのレーティング区分により、この土地を購入することはできません。
+		購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		購入しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		あなたのレーティング区分設定により、この土地を購入することができません。
-
-「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
-		<usetemplate ignoretext="選択したレーティング区分が原因で、土地を購入できないとき" name="okcancelignore" notext="閉じる" yestext="設定の変更"/>
+		購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の購入を試みることができます。
+		<form name="form">
+			<button name="OK" text="環境設定の変更"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="購入しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		選択したプリムが多すぎます。  [MAX_PRIM_COUNT] 個選択するか、プリム数を減らしてもう一度お試しください。
@@ -1858,10 +2023,9 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します�
 		</form>
 	</notification>
 	<notification label="地域のレーティング区分指定変更済み" name="RegionMaturityChange">
-		このリージョン（地域）のレーティング区分がアップデートされました。
-地図に変更が反映されるまで数分かかることがあります。
-
-Adult 専用リージョンに入るには、住人のアカウントが年齢確認か支払方法のいずれかで「確認済み」でなければなりません。
+		このリージョンのレーティング区分が変更されました。
+地図にこの変更が反映するには数分かかることがあります。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">
 		[APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。
@@ -1975,6 +2139,10 @@ Adult 専用リージョンに入るには、住人のアカウントが年齢�
 		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
+		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		終了しようとしています。続けますか？
 		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
@@ -2052,14 +2220,14 @@ Linden Lab
 			<button ignore="交換しない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
-	<notification label="取り込み中の警告" name="BusyModePay">
-		現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。
+	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
+		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
 
-この取引を行うために「取り込み中」の設定を解除しますか？
+このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/>
-			<button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/>
-			<button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/>
+			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
+			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
+			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2156,14 +2324,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		<usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Second Life で Adult 指定のコンテンツや領域にアクセスできるのは 18 歳以上のユーザーのみです。年齢確認ページで 18 歳以上であることを証明してください。 
-これをクリックするとウェブブラウザが開きます。
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="年齢の確認を済ませていないとき" name="okcancelignore" notext="取り消し" yestext="年齢確認ページを開く"/>
+		訪問しようとしているロケーションは、18 才以上の住人に制限されています。
+		<usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		ロケーションは 18 才以上に制限されています。
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		支払情報が登録されていないとこのエリアを訪れることができません。  [SECOND_LIFE] サイトで登録を行いますか？
@@ -2198,11 +2363,8 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="GroupNotice">
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオンラインです
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオフラインです
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2323,9 +2485,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 「テレポート」を選択して実行することもできます。）
 	</notification>
 	<notification name="TeleportToPerson">
-		[NAME] のような住人に連絡をとるには、「人」ボタンをクリックし、表示されるウィンドウで「住人」を選択してから、
-ウィンドウ下部にある「IM」をクリックします。
-（リストの名前をダブルクリック、または右クリックして「IM」を選んでも同じです。）
+		誰かとのプライベートな会話を開くには、相手のアバターをクリックして、メニューから「IM」を選択します。
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		サーバーの境界を越えて土地を選択することできません。
@@ -2426,6 +2586,16 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="NoBuild">
 		このエリアでは制作が禁止されています。 オブジェクトを制作したり Rez することはできません。
 	</notification>
+	<notification name="PathfindingDirty">
+		この値域（リージョン）には、保留中のパスファインディングの変更があります。制作権がある場合は、「地域の再構築」ボタンをクリックして、地域（リージョン）を再構築できます。
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル 0 での通常の文字チャットもブロックされます。
 	</notification>
@@ -2444,9 +2614,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		そのリージョンにいないと公共の土地を取得することはできません。
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		あなたのレーティング区分によりそのリージョンへは入ることができません。 年齢確認を行うか、最新ビューワをインストールしてください。
-
-現在のレーティング区分でアクセス可能なエリアに関する詳細はナレッジベースを参照してください。
+		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 	</notification>
 	<notification name="URBannedFromRegion">
 		あなたはリージョンへの立入が禁止されています。
@@ -2457,11 +2625,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="ImproperPaymentStatus">
 		このリージョンに入るために適した支払いステータスがありません。
 	</notification>
-	<notification name="MustGetAgeRgion">
-		このリージョンに入るためには、年齢確認を済ませる必要があります。
+	<notification name="MustGetAgeRegion">
+		この地域（リージョン）に入るには 18 才以上である必要があります。
 	</notification>
 	<notification name="MustGetAgeParcel">
-		この区画に入るためには、年齢確認を済ませる必要があります。
+		この区画に入るには 18 才以上である必要があります。
 	</notification>
 	<notification name="NoDestRegion">
 		目的地のリージョンが見つかりませんでした。
@@ -2563,12 +2731,33 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="TeleportOffered">
 		[NAME_SLURL] はテレポートであなたを呼んでいます。
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="テレポート"/>
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] はテレポートであなたを呼んでいます。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+この地域（リージョン）には [REGION_CONTENT_MATURITY] コンテンツが含まれていますが、現在の環境設定は [REGION_CONTENT_MATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+		<form name="form">
+			<button name="Teleport" text="変更して続ける"/>
+			<button name="Cancel" text="取り消し"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] はテレポートであなたを呼んでいます。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+ただし、この地域（リージョン）には成人のみアクセスできるコンテンツが含まれています。
+	</notification>
 	<notification name="TeleportOfferSent">
 		[TO_NAME] にテレポートを送りました。
 	</notification>
@@ -2663,16 +2852,21 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています：
-
-[QUESTIONS]
-このオブジェクトや制作者を信用できない場合は、このリクエストを拒否してください。
-
-リクエストを受けますか？
+		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
+  
+そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
 		<form name="form">
-			<button name="Grant" text="許可"/>
+			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
-			<button name="Details" text="詳細..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		&apos;[NAME]&apos; が所有する &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; によってリクエストされたランタイムスクリプト権限がビューアによって認識されないため、許可できません。
+
+この権限を許可するには、ビューアを [DOWNLOADURL] からの最新バージョンにアップデートしてください。
+		<form name="form">
+			<button name="Deny" text="Ok"/>
+			<button name="Mute" text="ブロック"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2973,6 +3167,10 @@ M キーを押して変更します。
 		( 作成後[EXISTENCE]秒経過）
 &apos;[BODYREGION]&apos;の[RESOLUTION]のベークドテクスチャは[TIME]秒後にローカルに更新されました。
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		コピー不可および/または転送不可のため、このテクスチャを表示できません。
+		<usetemplate ignoretext="コピー不可および/または転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		このコールから抜けますか？
 		<usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
@@ -3144,6 +3342,62 @@ M キーを押して変更します。
 		この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには [SHORTCUT] をもう一度クリックしてください。
 		<usetemplate ignoretext="UI を非表示にする前に確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		選択された一部のリンクセットはファントムフラグが切り替えられます。
+
+続けますか？
+		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットは代わりに &apos;[RESTRICTED_TYPE]&apos; に設定されます。
+
+続けますか？
+		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		選択された一部のリンクセットは、形状が凸状でないため、&apos;[REQUESTED_TYPE]&apos; に設定できません。
+
+続けますか？
+		<usetemplate ignoretext="選択された一部のリンクセットは、形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		選択された一部のリンクセットはファントムフラグが切り替えられます。
+
+一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットは代わりに &apos;[RESTRICTED_TYPE]&apos; に設定されます。
+
+続けますか？
+		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		選択された一部のリンクセットはファントムフラグが切り替えられます。
+
+選択された一部のリンクセットは、形状が凸状でないため、&apos;[REQUESTED_TYPE]&apos; に設定できません。
+
+続けますか？
+		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットは形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットは代わりに &apos;[RESTRICTED_TYPE]&apos; に設定されます。
+
+選択された一部のリンクセットは、形状が凸状でないため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットの用途タイプは変わりません。
+
+続けますか？
+		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されており、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		選択された一部のリンクセットはファントムフラグが切り替えられます。
+
+一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットは代わりに &apos;[RESTRICTED_TYPE]&apos; に設定されます。
+
+選択された一部のリンクセットは、形状が凸状でないため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットの用途タイプは変わりません。
+
+続けますか？
+		<usetemplate ignoretext="選択された一部のリンクセットのファントムフラグが切り替えられ、他のリンクセットはリンクセットへの権限が制限され、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
+		<usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		[APP_NAME] に必要なハードウェアがないようです。 [APP_NAME] にはマルチテクスチャをサポートする OpenGL グラフィックカードが必要です。 お使いのグラフィックカードの最新ドライバがインストールされているかどうか、オペレーティングシステムのサービスパックとパッチが入っているかをご確認ください。
 
@@ -3168,4 +3422,647 @@ M キーを押して変更します。
 	<global name="You died and have been teleported to your home location">
 		死んでしまったので、ホームにテレポートされました。
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] は、見つからなかったため、更新できませんでした。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] を開くまたはデコードする試行に失敗しました（試行回数 [NRETRIES] 回）。そのため、このファイルは壊れているものとして処理されました。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。
+この試行はキャンセルされました。
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		[NUM_ITEMS] 個のアイテムを返却中です。続けますか？
+		<usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
+		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		アバターがフリーズされています。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] によってフリーズが解除されています。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		アバターのフリーズが解除されました。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		その区画の管理権限を持っていないため、フリーズに失敗しました。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		フリーズ期間が切れました。仕事に戻ってください。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		残念ながら、そのユーザーをフリーズできません。
+	</notification>
+	<notification name="NowOwnObject">
+		これで、オブジェクト [OBJECT_NAME] の所有者になりました
+	</notification>
+	<notification name="CantRezOnLand">
+		この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		リクエストが多すぎて、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="SitFailCantMove">
+		今回移動できなかったため、座ることができません。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		その土地に対して許可を受けていないため、座ることができません。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		新しいオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		所有していない土地に木や草を植えることはできません。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーする権限がないため、コピーに失敗しました。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		オブジェクト &apos;[OBJ_NAME]&apos; をあなたに転送できないため、コピーに失敗しました。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; がナビメッシュに貢献しているため、コピーに失敗しました。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		ルートオブジェクトを選択せずに複製します。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		リージョンが埋まっているため、オブジェクトのコピーを作成することができません。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		区画がいっぱいのため、
+オブジェクトを作成できません。
+	</notification>
+	<notification name="RezAttemptFailed">
+		オブジェクトへの Rez の試みに失敗しました。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		このリージョンで問題を引き起こすアイテムは作成できません。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		その持ち物アイテムはブラックリストに登録されています。
+	</notification>
+	<notification name="NoCanRezObjects">
+		現在あなたにはオブジェクトを作成するための許可がありません。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地の検索がブロックされました。
+短期間に多くの土地を検索したためです。
+しばらくしてから再度お試しください。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		死んでしまったので、ホームにテレポートされました。
+	</notification>
+	<notification name="EjectComingSoon">
+		ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。
+	</notification>
+	<notification name="NoEnterServerFull">
+		サーバーが埋まっているため、
+このリージョンに入場することはできません。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「「持ち物」に保存」が無効になっています。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		オブジェクト &apos;[DEST_NAME]&apos; を修正する権限がないため、オブジェクトのコンテンツに &apos;[OBJ_NAME]&apos; を保存できません。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		インベントリに &apos;[OBJ_NAME]&apos; を保存することはできません - この操作が無効になっています。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoTransNoCopy">
+		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		シミュレータからのオブジェクト &apos;[OBJ_NAME]&apos; の削除は、権限システムによって無効にされています。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		オブジェクト &apos;[OBJ_NAME]&apos; をコピーできないため、選択したものを保存できません。
+	</notification>
+	<notification name="NoModNoTaking">
+		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを取得できません。
+	</notification>
+	<notification name="RezDestInternalError">
+		内部エラー: 不明な宛先タイプ。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		オブジェクトが見つからないため削除できませんでした。
+	</notification>
+	<notification name="SorryCantEjectUser">
+		残念ながら、そのユーザーを追放することはできません。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="HomeLocationLimits">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="HomePositionSet">
+		家の配置の設定。
+	</notification>
+	<notification name="AvatarEjected">
+		アバターが追放されました。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		その区画の管理権限がないため、追放できませんでした。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		区画が埋まっているため、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		オブジェクト &apos;[OBJECT_NAME]&apos; は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		この区画でこのオブジェクトのリソースが不足しているため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		不明な理由により、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
+([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		そのオブジェクトを変更する権限がありません
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		キーフレームオブジェクトのために物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		土地のリソースが足りないため、オブジェクトの物理を有効にできません。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
+	</notification>
+	<notification name="UnableAddItem">
+		アイテムを追加できません!
+	</notification>
+	<notification name="UnableEditItem">
+		これは編集できません!
+	</notification>
+	<notification name="NoPermToEdit">
+		これを編集する許可がありません。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		そのインベントリをコピーすることは許可されません。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		オブジェクトのコンテンツに保存できません。アイテムが存在していません。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。
+	</notification>
+	<notification name="TooManyScripts">
+		スクリプトが多すぎます。
+	</notification>
+	<notification name="UnableAddScript">
+		テキストを追加できません!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		このリージョンでは、物理的シェイプが有効にされていません。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		そのオブジェクトタイプの物理的プロパティを設定できません。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		ルートプリムを設定できないため、シェイプがありません。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		このリージョンでは、物理的素材が有効にされていません。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		物理的素材を調整できるのは、ルートプリムだけです。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		キャラクターへの物理的素材の設定はまだサポートされていません。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定した物理的素材のプロパティが 1 つ以上無効です。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		メッシュオブジェクトの縫い目のタイプを変更することはできません。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		メッシュオブジェクトの形状を変更することはできません
+	</notification>
+	<notification name="FullRegionCantEnter">
+		リージョンが埋まっているため、\nこのリージョンに入場できません。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		リンクエラー -- 所有者が違います
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		リンクエラー -- 編集権限がありません。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		リンクエラー -- プリミティブが多すぎます。
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		リンクエラー -- コピーなしと転送なしをリンクできません。
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		リンクエラー -- リンクできるものがありません。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		リンクエラー -- パスファインディングの文字数が多すぎます
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		リンクエラー -- 土地のリソースが足りません
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはホームにテレポートされました。
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		​オブジェクト ​&apos;[OBJECT_NAME]&apos; によって、あなたはホームへテレポートされています。
+	</notification>
+	<notification name="TeleportedByAttachment">
+		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		[OWNER_ID] が所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		不明なユーザーが所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		1 つの場所に複数のオブジェクトを着用することはできません。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		ここでは、複数のオブジェクトを作成することはできません。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		要求されたオブジェクトを作成できません。もう一度お試しください。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		この土地に木を植えることはできません。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		オブジェクトをリストアできません。ワールドの位置が見つかりません。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		メッシュデータが無効なため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		現在のアクセス権限では、そこにオブジェクトを作成できません。
+	</notification>
+	<notification name="CantCreateObject">
+		現在あなたにはオブジェクト作成する許可がありません。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無効なオブジェクトパラメーター
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
+	</notification>
+	<notification name="CantChangeShape">
+		あなたにはこのシェイプを変更する許可がありません。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		現在のアクセス権限では、ここにオブジェクトを取得できません。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		現在のアクセス権限では、ここでオブジェクトを購入できません。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		アバターがオブジェクトに存在するため、オブジェクトを着用できません。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		木や草をアタッチメントとして着用できません。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		グループが所有しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		所有していないオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		ナビメッシュに貢献しているオブジェクトは着用できません。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		オブジェクトの着用に使用できるスクリプトリソースが足りません。
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		ここにオブジェクトをドロップできません。区画が埋まっています。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		削除パラメーターを絞ってください。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		資産をアップロードできません。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		ホームをテレポートするユーザーが見つかりませんでした。
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		過剰なリクエストが失敗しました
+	</notification>
+	<notification name="GenericRequestFailed">
+		一般的なリクエストに失敗しました
+	</notification>
+	<notification name="CantUploadPostcard">
+		ポストカードをアップロードできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		グループ通知のインベントリの詳細を取得できません。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		グループ通知の送信が許可されないため、送信できません。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		グループ通知を送信できません。持ち物を作成することもできません。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		通知内の持ち物を検出できません。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形のアップロードに失敗しました。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形ファイルが書き込まれました。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形ファイルを書き出し、ダウンロードを開始しています...
+	</notification>
+	<notification name="TerrainBaked">
+		地形がベークされました。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		この区画を購入するには、ビューワをアップデートする必要があります。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		購入することができません。この区画は販売対象ではありません。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		販売価格または土地の面積が変わったため、購入できません。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		あなたはこの区画の委任された買い手ではありません。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		すでに購入の認証を待機しているため、この区画を購入できません。
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		選択範囲のリース区画の数が少ないため、参加できません。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		土地を分解できません。\n区画が見つかりません。\n「Help」&gt;「Reprt Bug...」でレポートを行ってください。
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地が分割されています。
+	</notification>
+	<notification name="PassPurchased">
+		入場許可を購入しました。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		リージョンでは、クラシファイド広告を許可しません。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		この土地への入場許可はまもなく期限が切れます。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		配置に適した表面がありません。別の場所を試してみたください。
+	</notification>
+	<notification name="CantSitNoRoom">
+		ここには座る余地がありません。他の場所を試してください。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		権限がないため、オブジェクトを取得できませんでした。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの取得に失敗しました。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		グループ所有の土地は、譲渡できません。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		リンデンドルが足りないため、オブジェクトの購入に失敗しました。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		リンデンドルが不足しているため、インベントリを購入できませんでした。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		リンデンドルが足りないため、この土地への入場許可を購入できません。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		今すぐには入場許可を購入できません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		区画が埋まっているため、オブジェクトを\n作成することができません。
+	</notification>
+	<notification name="FailedPlacingObject">
+		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		イベントのためのランドマークを作成することができません。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		強力な力でフリーズを解除します。
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
+	</notification>
+	<notification name="ExpireExplanation">
+		システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
+	</notification>
+	<notification name="DieExplanation">
+		システムは、あなたのリクエストを処理できません。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		プリミティブ広告を出すには、資金が足りません。
+	</notification>
+	<notification name="RezObjectFailure">
+		資金が足りないため、オブジェクトを作成できません。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		ホームが不正なため、ホームの位置をリセットします。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		このリージョンでは、ここにホームの位置を設定できません。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
+	</notification>
+	<notification name="SetHomePosition">
+		家の配置の設定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		インベントリエラーのため、オブジェクトの Rez 解除ができません。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		リクエストされたインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		リクエストされた持ち物フォルダーを作成できません。
+	</notification>
+	<notification name="CantCreateInventory">
+		そのインベントリを作成できません。
+	</notification>
+	<notification name="CantCreateLandmark">
+		ランドマークを作成できません。
+	</notification>
+	<notification name="CantCreateOutfit">
+		アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
+	</notification>
+	<notification name="InventoryNotForSale">
+		インベントリは販売対象ではありません。
+	</notification>
+	<notification name="CantFindInvItem">
+		持ち物アイテムを見つけることができません。
+	</notification>
+	<notification name="CantFindObject">
+		オブジェクトが見つかりません。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		オブジェクトへの送金は、このリージョンでは現在無効にされています。
+	</notification>
+	<notification name="CantPayNoAgent">
+		支払いの相手を把握できませんでした。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		パブリックオブジェクトにリンデンドルを与えることはできません。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		インワールドオブジェクトでのインベントリ作成に失敗しました。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
+		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
+		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		ファイルを移動できません。以前のパスがリストアされました。
+		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100644..100755
--- a/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/ja/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
index 90491e84c5..90491e84c5 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/ja/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
index 17e1283d24..17e1283d24 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 70d37c3bad..3ef8eba19f 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
 	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
 	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
index fd91ea97d1..fd91ea97d1 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 5d6a6065ae..9263e5f347 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		ブロックリスト
-	</text>
-	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
-	<button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
-	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
-	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="フィルター" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
+		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
+		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
+		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
index 95a5a26d4e..95a5a26d4e 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
index 42d8a21660..42d8a21660 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
deleted file mode 100644
index 3529abbf36..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="マイクのオン・オフ"/>
-	<string name="VoiceControlBtnToolTip" value="ボイスコントロールパネルの表示・非表示"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="話す" label_selected="話す" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="移動" name="movement_btn" tool_tip="移動コントロールの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="視界" name="camera_btn" tool_tip="カメラコントロールの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="スナップショットを撮ります"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="制作" name="build_btn" tool_tip="制作ツールの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="検索" name="search_btn" tool_tip="検索の表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="地図" name="world_map_btn" tool_tip="世界地図の表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="ミニマップ" name="mini_map_btn" tool_tip="ミニマップの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="会話"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="通知"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
index 6eca8adfe5..6eca8adfe5 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_chat_header.xml b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
index 6717ba9ba3..6717ba9ba3 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_classified_info.xml b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
index 57a255afde..57a255afde 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
index 2159f17fec..2159f17fec 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
index 158b2fa6ac..158b2fa6ac 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
index b9bc10c220..b9bc10c220 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/ja/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..09ffb92d36
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（ローディング）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..e05a67e31d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
+	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
+	<button name="delete_btn" tool_tip="このエントリーを削除"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
index a1e30283ee..a1e30283ee 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
index 0395d4edd8..0395d4edd8 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
index 7250da69a4..7250da69a4 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
index b556b68e02..b556b68e02 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
index 94967999a1..94967999a1 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
index 72eb120c3d..72eb120c3d 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
index f73f760192..f73f760192 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
index ee39e9435c..ee39e9435c 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
index 6a1789c9f4..6a1789c9f4 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
index 6ebf0062dc..6ebf0062dc 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
index 39ea1df1e3..39ea1df1e3 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
index 4cbd7f793b..4cbd7f793b 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
index 5a3a949150..5a3a949150 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
index f33daa4eba..f33daa4eba 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
index c7626189af..c7626189af 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
index 7573132576..7573132576 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
index 6efc4ce99a..6efc4ce99a 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
index 71fc7c5682..71fc7c5682 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
index f4cfe6d83f..f4cfe6d83f 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
index f345a81922..f345a81922 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
index 66b2ffa8ba..66b2ffa8ba 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
index 000dac7b5b..000dac7b5b 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
index 49749732c9..49749732c9 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_general.xml b/indra/newview/skins/default/xui/ja/panel_group_general.xml
index a1bfb67823..a1bfb67823 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
index 7aa1aec6d0..7aa1aec6d0 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index a21b340fdd..cc9ebc405b 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		グループへの招待が送信されていません: 選択された住人が多すぎます。グループへの招待は1回のリクエストあたり100人に制限されています。
+	</panel.string>
 	<text bottom_delta="-96" font="SansSerifSmall" height="72" name="help_text">
 		グループには一度に複数の住人を招待することができます。 「リストから住人を選択」をクリックしてください。
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 82be58a0fb..82be58a0fb 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 4b548049c8..77d3d8f391 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="不明"/>
+	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index ddad6c1f9b..ddad6c1f9b 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notify.xml b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
index 7135ae780d..7135ae780d 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index d40dedf566..d40dedf566 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
index f2429ac12a..f2429ac12a 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_instant_message.xml b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
index bf4cbcdc46..bf4cbcdc46 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index 7fca66f90f..7fca66f90f 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_landmarks.xml b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
index 24d6ff23ae..24d6ff23ae 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index ac1fe455c7..396d9e65b1 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://jp.secondlife.com/registration/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=ja
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				ログイン
+			</text>
 			<text name="username_text">
 				ユーザーネーム：
 			</text>
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				パスワード：
 			</text>
-			<check_box label="パスワードを記憶" name="remember_check"/>
-			<button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
-			<text name="mode_selection_text">
-				モード：
-			</text>
-			<combo_box name="mode_combo" tool_tip="モードを選択します。ベーシックモードでは探索やチャットをすばやく簡単に実行でき、アドバンスモードでは、より多くの機能が利用できます。">
-				<combo_box.item label="ベーシック" name="Basic"/>
-				<combo_box.item label="アドバンス" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				開始地点：
 			</text>
@@ -33,16 +26,21 @@
 				<combo_box.item label="＜地域名を入力＞" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				お申し込み
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				ログインの方法
 			</text>
 			<text name="forgot_password_text">
 				ユーザー名またはパスワードをお忘れですか？
 			</text>
-			<text name="login_help">
-				ログインの方法
+			<button label="ログイン" left_pad="30" name="connect_btn" width="60"/>
+			<check_box label="パスワードを記憶" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				アカウントを作成してください
 			</text>
+			<button label="今すぐ開始" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index f908262f4f..f908262f4f 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_me.xml b/indra/newview/skins/default/xui/ja/panel_me.xml
index 3df1ae8048..3df1ae8048 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_me.xml
+++ b/indra/newview/skins/default/xui/ja/panel_me.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 6321dbb048..6321dbb048 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
index 11d9ed4c16..11d9ed4c16 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
index ea4fdb9ce5..ea4fdb9ce5 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
index 51402b2e00..51402b2e00 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
index 4048b48d3a..4048b48d3a 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 5998206f27..201fb0a376 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="ここをクリックしてチャットを開始します。" name="chat_box" tool_tip="Enter キーを押して発言し、Ctrl + Enter キーで叫びます。"/>
 	<button name="show_nearby_chat" tool_tip="近くのチャットログを表示・非表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index c29ec64304..c29ec64304 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
index aff427ed49..aff427ed49 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notifications_channel.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
index 8e0cf4bc9d..8e0cf4bc9d 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/ja/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
index 1a14283113..1a14283113 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
index e89ce0c479..e89ce0c479 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
index 93df0ba2bd..93df0ba2bd 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
index e8caab0696..e8caab0696 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
index df9ef40113..df9ef40113 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
index fd03e6b89e..fd03e6b89e 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ja/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 88c31451b5..dd8fd41681 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人" name="people_panel">
 	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
@@ -14,81 +14,56 @@
 	<string name="no_filtered_friends_msg">
 		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
 	</string>
-	<string name="people_filter_label" value="人をフィルター"/>
-	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
-	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
-		<panel label="マイ フレンド" name="friends_panel">
+		<panel label="フレンド" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人をフィルター" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="マイ グループ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
-				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
+		<panel label="グループ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
+				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
 			</panel>
+			<text name="groupcount">
+				あなたは[COUNT]グループに属しているので、まだ[REMAINING]参加できます。
+			</text>
 		</panel>
 		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
-				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人をフィルター" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
+				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
+				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
+				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
 			</panel>
 		</panel>
+		<panel label="停止" name="blocked_panel">
+			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_pick_info.xml b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
index e7b5d1929d..e7b5d1929d 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_picks.xml b/indra/newview/skins/default/xui/ja/panel_picks.xml
index c6eaaeef41..c6eaaeef41 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_picks.xml
+++ b/indra/newview/skins/default/xui/ja/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 7235bc0f18..7235bc0f18 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_places.xml b/indra/newview/skins/default/xui/ja/panel_places.xml
index 9d3925afdc..9d3925afdc 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_places.xml
+++ b/indra/newview/skins/default/xui/ja/panel_places.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
index b7c3f48557..b7c3f48557 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index 314aaef7fd..314aaef7fd 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index dcaa23fee5..dcaa23fee5 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
index 7fd2e31698..7fd2e31698 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 75bf28a3c8..1c3204ea04 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<text name="font_size">
-		文字の大きさ：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
-	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		IM の表示方法：
-	</text>
-	<text name="requires_restart_label">
-		（再起動後に反映）
-	</text>
-	<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）">
-		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
-		<radio_item label="タブ" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		受信チャットのポップアップを有効にする
-	</text>
-	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
-	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
-	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
-	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
-	<button label="チャットの翻訳設定" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			文字の大きさ：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小規模" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大規模" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			フレンド IM:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			フレンドのいない IM:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			会議 IM:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			グループチャット:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolbarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			近くのチャット:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			オブジェクト IM：
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="開いている会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="メッセージをポップアップ表示" name="PopUpMessage" value="トースト"/>
+			<item label="フラッシュ ツールバー ボタン" name="FlashToolBarButton" value="フラッシュ"/>
+			<item label="動作なし" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="サウンドを再生" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			一時的にすべての通知を停止するには、「コミュニケーション」 &gt; 「着信拒否]を使用します。
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			サウンドを再生:
+		</text>
+		<check_box label="新しい会話" name="new_conversation"/>
+		<check_box label="受信音声コール" name="incoming_voice_call"/>
+		<check_box label="テレポートを送る" name="teleport_offer"/>
+		<check_box label="インベントリを送る" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="ログを消去..." name="clear_log"/>
+		<button label="テキストチャットを削除..." name="delete_transcripts"/>
+		<button label="参照..." label_selected="参照" name="log_path_button"/>
+	</panel>
+	<button label="他の言語..." name="ok_btn"/>
+	<button label="自動置換..." name="autoreplace_showgui"/>
+	<button label="スペルチェック中..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index 9f6abf8fcb..9f6abf8fcb 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 91e1514e49..d70af7e099 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="一時退席設定なし" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		取り込み中モード時の返事：
+		「通知を受けない」応答:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 1786b4befc..15017e330e 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="近くの光" name="LocalLights"/>
 		<check_box initial_value="true" label="基本シェーダー" name="BasicShaders" tool_tip="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
 		<check_box initial_value="true" label="周囲（大気）シェーダー" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="光と影" name="UseLightShaders"/>
+		<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
 		<check_box initial_value="true" label="アンビエントオクルージョン" name="UseSSAO"/>
 		<check_box initial_value="true" label="フィールドの遠近感" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
index 121bebfd52..121bebfd52 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
index 420bbed572..420bbed572 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index d90a1632ab..2c0359cb15 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="自動的にインストール" name="Install_automatically"/>
 		<combo_box.item label="手動でアップデートをダウンロード&amp;インストール" name="Install_manual"/>
 	</combo_box>
+	<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		プロキシ設定：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 3a4c360ccc..3a4c360ccc 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 5506373eb0..5506373eb0 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 5214f79141..5214f79141 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index f6865c12b1..169da27ce5 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" name="top_scripts_help"/>
 	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動します"/>
 	<button label="?" name="restart_help"/>
-	<button label="再起動を遅延" name="cancel_restart_btn" tool_tip="地域の再起動を１時間遅延します"/>
+	<button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="リージョンの再起動をキャンセル"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index f6ef3f0934..f6ef3f0934 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 2e58c5a8f1..b5cc6b9765 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -19,7 +19,7 @@
 		次の住人にのみアクセスを許可：
 	</text>
 	<check_box label="支払情情報が登録されている" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-	<check_box label="年齢確認が済んでいる" name="limit_age_verified" tool_tip="この不動産にアクセスするには、年齢確認を済ませる必要があります。詳細については、[SUPPORT_SITE] をご覧ください。"/>
+	<check_box label="18 才以上です" name="limit_age_verified" tool_tip="この不動産（エステート）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
 	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_general.xml b/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 65148cf1ee..65148cf1ee 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index fb853c1925..fb853c1925 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml
deleted file mode 100644
index 9e442ce091..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地面テクスチャ" name="Textures">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<text name="detail_texture_text">
-		地形のテクスチャ （512x512、24ビット .tgaファイルが必要です）
-	</text>
-	<text name="height_text_lbl">
-		1（低）
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4（高）
-	</text>
-	<text name="height_text_lbl5">
-		地形テクスチャの隆起範囲
-	</text>
-	<text name="height_text_lbl6">
-		北西
-	</text>
-	<text name="height_text_lbl7">
-		北東
-	</text>
-	<text name="height_text_lbl8">
-		南西
-	</text>
-	<text name="height_text_lbl9">
-		南東
-	</text>
-	<spinner label="低" name="height_start_spin_0"/>
-	<spinner label="低" name="height_start_spin_1"/>
-	<spinner label="低" name="height_start_spin_2"/>
-	<spinner label="低" name="height_start_spin_3"/>
-	<spinner label="高" name="height_range_spin_0"/>
-	<spinner label="高" name="height_range_spin_1"/>
-	<spinner label="高" name="height_range_spin_2"/>
-	<spinner label="高" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		数値は上のテクスチャが調和する範囲を示します。
-	</text>
-	<text name="height_text_lbl11">
-		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの
-「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
-	</text>
-	<text name="height_text_lbl12">
-		そして「高」の値はテクスチャ#4の高さの下限となります。
-	</text>
-	<button label="適用" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_ed.xml b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
index 14d55002a3..b6d51085eb 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="すべて選択" name="Select All"/>
 			<menu_item_call label="選択解除" name="Deselect"/>
 			<menu_item_call label="検索 / 再配置..." name="Search / Replace..."/>
+			<menu_item_call label="行に移動..." name="Go to line..."/>
 		</menu>
 		<menu label="ヘルプ" name="Help">
 			<menu_item_call label="ヘルプ..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index 494884c187..494884c187 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index d91eba9699..d91eba9699 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
index b698fa762d..b698fa762d 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/ja/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
deleted file mode 100644
index 3fd14ece06..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="サイドバーを表示・非表示" name="sidebar_openclose" tab_title="サイドバーを開く・閉じる"/>
-	<sidetray_tab description="ホーム。" name="sidebar_home" tab_title="ホーム">
-		<panel label="ホーム" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="あなたの公開プロフィールとピックを編集してください。" name="sidebar_me" tab_title="マイ プロフィール">
-		<panel_container name="panel_container">
-			<panel label="ミー" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="フレンド、連絡先、近くの人を探してください。" name="sidebar_people" tab_title="人">
-		<panel_container name="panel_container">
-			<panel label="グループ情報" name="panel_group_info_sidetray"/>
-			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="行きたい場所、行ったことのある場所を探してください。" label="場所" name="sidebar_places" tab_title="場所">
-		<panel label="場所" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory" tab_title="持ち物">
-		<panel label="持ち物を編集" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance" tab_title="容姿">
-		<panel label="容姿の編集" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
index d06db8ccb1..d06db8ccb1 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/ja/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
index ea17cd6526..ea17cd6526 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sidetray_home_tab.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index e496e6602b..e496e6602b 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
index cb658fb6c9..cb658fb6c9 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
index c3b1cd91e7..c3b1cd91e7 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 1ddd723840..1ddd723840 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
index b860a6afe9..b860a6afe9 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
index 0824504235..0824504235 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
index 2308aff19b..2308aff19b 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/ja/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index f09643d562..f09643d562 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
index 81db7c8989..81db7c8989 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_sys_well_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
index 58e396877c..58e396877c 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
index c570cd5696..c570cd5696 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
new file mode 100644
index 0000000000..34763f78c1
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="テクスチャ" name="Texture">
+	<panel.string name="string repeats per meter">
+		メーターごとに繰り返す
+	</panel.string>
+	<panel.string name="string repeats per face">
+		面ごとに繰り返す
+	</panel.string>
+	<text name="color label">
+		色
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="color trans">
+		透過度 %
+	</text>
+	<text name="glow label">
+		グロー
+	</text>
+	<check_box label="明るさ全開" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="材質" name="Materials"/>
+		<combo_box.item label="メディア" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="テクスチャ (拡散)" name="Texture (diffuse)"/>
+		<combo_box.item label="凹凸 (標準)" name="Bumpiness (normal)"/>
+		<combo_box.item label="輝き (反射)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
+	<text name="label alphamode">
+		アルファモード
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="アルファブレンディング" name="Alpha blending"/>
+		<combo_box.item label="アルファマスキング" name="Alpha masking"/>
+		<combo_box.item label="放射状マスク" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		マスクカットオフ
+	</text>
+	<texture_picker label="テクスチャ" name="bumpytexture control" tool_tip="クリックして写真を選択します"/>
+	<text name="label bumpiness">
+		凹凸
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="明るさ" name="Brightness"/>
+		<combo_box.item label="暗さ" name="Darkness"/>
+		<combo_box.item label="木目調" name="woodgrain"/>
+		<combo_box.item label="バーク" name="bark"/>
+		<combo_box.item label="レンガ" name="bricks"/>
+		<combo_box.item label="市松模様" name="checker"/>
+		<combo_box.item label="コンクリート" name="concrete"/>
+		<combo_box.item label="堅いタイル" name="crustytile"/>
+		<combo_box.item label="カットストーン" name="cutstone"/>
+		<combo_box.item label="円板" name="discs"/>
+		<combo_box.item label="小石" name="gravel"/>
+		<combo_box.item label="ペトリ皿" name="petridish"/>
+		<combo_box.item label="サイディング" name="siding"/>
+		<combo_box.item label="ストーンタイル" name="stonetile"/>
+		<combo_box.item label="化粧しっくい" name="stucco"/>
+		<combo_box.item label="サクション" name="suction"/>
+		<combo_box.item label="ウィーブ" name="weave"/>
+	</combo_box>
+	<texture_picker label="テクスチャ" name="shinytexture control" tool_tip="クリックして写真を選択します"/>
+	<text name="label shininess">
+		輝き
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="なし" name="None"/>
+		<combo_box.item label="低" name="Low"/>
+		<combo_box.item label="中" name="Medium"/>
+		<combo_box.item label="高" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		光沢度
+	</text>
+	<text name="label environment">
+		環境
+	</text>
+	<text name="label shinycolor">
+		色
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="クリックしてカラーピッカーを開きます"/>
+	<text name="media_info">
+		選択したメディアの URL がもしあれば、ここに入ります
+	</text>
+	<button label="選択..." name="add_media" tool_tip="メディアを追加します"/>
+	<button label="削除" name="delete_media" tool_tip="このメディアテクスチャを削除します"/>
+	<button label="揃える" label_selected="メディアを一列に揃えます" name="button align" tool_tip="メディアテクスチャを一列に揃える（最初に読み込む必要があります）"/>
+	<text name="tex gen">
+		マッピング
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="デフォルト" name="Default"/>
+		<combo_box.item label="平面" name="Planar"/>
+	</combo_box>
+	<spinner label="水平スケール" name="TexScaleU"/>
+	<spinner label="垂直スケール" name="TexScaleV"/>
+	<spinner label="メーターごとに繰り返す" name="rptctrl"/>
+	<spinner label="回転度" name="TexRot"/>
+	<spinner label="水平オフセット" name="TexOffsetU"/>
+	<spinner label="垂直オフセット" name="TexOffsetV"/>
+	<spinner label="水平スケール" name="bumpyScaleU"/>
+	<spinner label="垂直スケール" name="bumpyScaleV"/>
+	<spinner label="回転度" name="bumpyRot"/>
+	<spinner label="水平オフセット" name="bumpyOffsetU"/>
+	<spinner label="垂直オフセット" name="bumpyOffsetV"/>
+	<spinner label="水平スケール" name="shinyScaleU"/>
+	<spinner label="垂直スケール" name="shinyScaleV"/>
+	<spinner label="回転度" name="shinyRot"/>
+	<spinner label="水平オフセット" name="shinyOffsetU"/>
+	<spinner label="垂直オフセット" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="平面を揃える" name="checkbox planar align" tool_tip="選択面全てのテクスチャを、最後に選択された面に揃えます。平面テクスチャのマッピングが必要です。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
index 530f0fb59d..530f0fb59d 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..967dedf061
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater">
+	<slider label="マスター" name="System Volume"/>
+	<slider label="ボタン" name="UI Volume"/>
+	<slider label="環境音" name="Wind Volume"/>
+	<slider label="サウンド" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="ジェスチャーの音を有効にする"/>
+	<slider label="音楽" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="ストリーミング音楽を有効にする"/>
+	<slider label="メディア" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="ストリーミングメディアを有効にする"/>
+	<slider label="ボイス" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="ボイスチャットを有効にする"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_world_map.xml b/indra/newview/skins/default/xui/ja/panel_world_map.xml
index 8ff853193a..8ff853193a 100644..100755
--- a/indra/newview/skins/default/xui/ja/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/ja/role_actions.xml b/indra/newview/skins/default/xui/ja/role_actions.xml
index 896ed556ae..5c2e18df03 100644..100755
--- a/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
 	<action_set description="これらの能力には、グループメンバーを追加、排除し、招待状なしに新メンバーの参加を認める権限が含まれます。" name="Membership">
 		<action description="このグループに人を招待" longdescription="「役割」セクションの「メンバー」タブ内にある「招待」ボタンを押して、このグループにメンバーを招待します。" name="member invite" value="1"/>
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="これらの能力には、区画名、公開設定、検索ディレクトリへの登録、着地点ならびに TP ルートのオプションを変更する権限が含まれます。" name="Parcel Identity">
 		<action description="「場所検索に表示」を切り替えカテゴリを設定" longdescription="「場所検索に表示」に切り替え、「土地情報」 &gt; 「オプション」タブで区画のカテゴリを設定します。" name="land find places" value="17"/>
-		<action description="区画名、説明、「場所検索に表示」の設定を変更" longdescription="区画名、説明、「場所検索に表示」の設定を変更します。 「土地情報」 &gt; 「オプション」タブで行います。" name="land change identity" value="18"/>
+		<action description="区画名、説明、および「Moderate コンテンツ」設定を変更" longdescription="区画名、説明、および「Moderate コンテンツ」設定を変更します。「土地情報」 &gt; 「オプション」タブで行います。" name="land change identity" value="18"/>
 		<action description="着地点およびテレポートルートを設定" longdescription="この能力を持つ役割のメンバーは、グループ所有の区画上で着地点を設定することにより外部からのテレポートの到着位置を指定できると共に、テレポートルートを設定して細かく制御することができます。 この操作は、「土地情報」＞「オプション」タブで行います。" name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="これらの能力には、「オブジェクトを作成」、「地形を編集」、音楽とメディアの設定など、区画のオプションに関連する権限が含まれます。" name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
index 30cef9ccc0..30cef9ccc0 100644..100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
index 51d6d48f90..51d6d48f90 100644..100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index 6931e448b3..e70d91d258 100644..100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="item properties" title="アイテムのプロフィール">
 	<panel.string name="unknown">
 		（不明）
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(不明/複数)
+	</panel.string>
 	<panel.string name="public">
 		（公開）
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index eb2bfa993b..4f65c8477b 100644..100755
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		これらのオブジェクトを修正できません
 	</panel.string>
+	<panel.string name="text modify info 5">
+		地域（リージョン）の境界を越えてこのオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify info 6">
+		地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
+	</panel.string>
 	<panel.string name="text modify warning">
 		このオブジェクトには、パーツがリンクされています
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
+			<combo_box.item label="ズーム" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="価格： L$" name="Edit Cost"/>
 		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
+		<text name="pathfinding_attributes_label">
+			パスファインディング属性:
+		</text>
 		<text name="B:">
 			B.
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 680ef60890..a0f45e5a55 100644..100755
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,10 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=ja-JP
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
@@ -448,6 +451,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="SLappAgentRequestFriend">
 		フレンド登録リクエスト
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		フレンドの削除
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		閉じる （⌘W）
 	</string>
@@ -622,8 +628,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="AvatarAway">
 		一時退席中
 	</string>
-	<string name="AvatarBusy">
-		取り込み中
+	<string name="AvatarDoNotDisturb">
+		通知を受けない
 	</string>
 	<string name="AvatarMuted">
 		ブロック中
@@ -838,6 +844,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="multiple_textures">
 		複数
 	</string>
+	<string name="use_texture">
+		テクスチャを使用
+	</string>
 	<string name="texture_loading">
 		ローディング...
 	</string>
@@ -859,6 +868,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ST_NO_JOINT">
 		ROOT または JOINT が見つかりません
 	</string>
+	<string name="NearbyChatTitle">
+		近くのチャット
+	</string>
+	<string name="NearbyChatLabel">
+		(近くのチャット)
+	</string>
 	<string name="whisper">
 		のささやき:
 	</string>
@@ -886,6 +901,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="ScriptQuestionCautionChatDenied">
 		[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を拒否しました： [PERMISSIONS]
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：
+	</string>
 	<string name="ScriptTakeMoney">
 		リンデンドル（L$）を支払う
 	</string>
@@ -922,6 +940,27 @@ support@secondlife.com にお問い合わせください。
 	<string name="NotConnected">
 		接続されていません
 	</string>
+	<string name="AgentNameSubst">
+		(あなた)
+	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
+	<string name="JoinAnExperience">
+		体験に参加する
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		土地のアクセスリストを管理するときにアラートを表示しない
+	</string>
+	<string name="OverrideYourAnimations">
+		デフォルトのアニメーションを置き換え
+	</string>
+	<string name="ScriptReturnObjects">
+		あなたの代わりにオブジェクトを返却
+	</string>
+	<string name="UnknownScriptPermission">
+		(不明)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1000,17 +1039,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="script_files">
 		スクリプト
 	</string>
-	<string name="AvatarSetNotAway">
-		一時退席中解除
-	</string>
-	<string name="AvatarSetAway">
-		一時退席中
-	</string>
-	<string name="AvatarSetNotBusy">
-		取り込み中解除
-	</string>
-	<string name="AvatarSetBusy">
-		取り込み中
+	<string name="dictionary_files">
+		辞書
 	</string>
 	<string name="shape">
 		シェイプ
@@ -1244,7 +1274,7 @@ support@secondlife.com にお問い合わせください。
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1405,6 +1435,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="InvFolder favorite">
 		お気に入り
 	</string>
+	<string name="InvFolder Favorites">
+		お気に入り
+	</string>
+	<string name="InvFolder favorites">
+		お気に入り
+	</string>
 	<string name="InvFolder Current Outfit">
 		着用中のアウトフィット
 	</string>
@@ -1420,6 +1456,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="InvFolder Meshes">
 		メッシュ
 	</string>
+	<string name="InvFolder Received Items">
+		受け取った商品
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		マーチャントのアウトボックス
+	</string>
 	<string name="InvFolder Friends">
 		フレンド
 	</string>
@@ -1950,6 +1992,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD（右下）
 	</string>
+	<string name="ATTACH_NECK">
+		首
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		アバターの中央
+	</string>
 	<string name="CursorPos">
 		[LINE] 行目、[COLUMN] 列目
 	</string>
@@ -1968,8 +2016,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
-	<string name="BusyModeResponseDefault">
-		メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。  あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
+	<string name="DoNotDisturbModeResponseDefault">
+		この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。
 	</string>
 	<string name="MuteByName">
 		（名称別）
@@ -2082,9 +2130,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDate">
 		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		内容
-	</string>
 	<string name="AcquiredItems">
 		取得アイテム
 	</string>
@@ -2982,6 +3027,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Hip Width">
 		腰の幅
 	</string>
+	<string name="Hover">
+		ホバー
+	</string>
 	<string name="In">
 		内向き
 	</string>
@@ -3856,7 +3904,13 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		General リージョン
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		この区画外にアバターを見えるようにして、チャットも許可
+		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] アップデート
@@ -3927,6 +3981,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="IM_unblock_only_groups_friends">
 		このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。
 	</string>
+	<string name="OnlineStatus">
+		オンライン
+	</string>
+	<string name="OfflineStatus">
+		オフライン
+	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
@@ -3936,6 +3996,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="you_joined_call">
 		ボイスコールに参加しました
 	</string>
+	<string name="you_auto_rejected_call-im">
+		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
+	</string>
 	<string name="name_started_call">
 		[NAME] はボイスコールを開始します
 	</string>
@@ -3952,7 +4015,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		接続中...
 	</string>
 	<string name="conference-title">
-		アドホックコンファレンス
+		複数人チャット
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] とコンファレンスする
@@ -4832,6 +4895,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Command_Chat_Label">
 		チャット
 	</string>
+	<string name="Command_Conversations_Label">
+		会話
+	</string>
 	<string name="Command_Compass_Label">
 		コンパス
 	</string>
@@ -4907,6 +4973,9 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Command_Chat_Tooltip">
 		近くの人と文字チャットする
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		全員との会話
+	</string>
 	<string name="Command_Compass_Tooltip">
 		コンパス
 	</string>
@@ -5000,6 +5069,21 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Normal">
 		普通
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		なし
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		ナビメッシュに影響を与える
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		キャラクター
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		（複数）
+	</string>
 	<string name="snapshot_quality_very_low">
 		非常に低い
 	</string>
@@ -5015,4 +5099,22 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="snapshot_quality_very_high">
 		非常に高い
 	</string>
+	<string name="TeleportMaturityExceeded">
+		住人はこの地域（リージョン）を訪問できません。
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
+	</string>
+	<string name="loading_chat_logs">
+		ロード中...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 64f01f4030..7868c25807 100644..100755
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
@@ -47,6 +47,9 @@
 		<message name="no_inventory_host">
 			インベントリシステムは現在利用できません。
 		</message>
+		<message name="MustGetAgeRegion">
+			この地域（リージョン）に入るには 18 才以上である必要があります。
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -82,5 +85,8 @@
 		<message name="requesting">
 			テレポートをリクエスト...
 		</message>
+		<message name="pending">
+			テレポートを保留中...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/ja/xui_version.xml b/indra/newview/skins/default/xui/ja/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/ja/xui_version.xml
+++ b/indra/newview/skins/default/xui/ja/xui_version.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml
index 409429ffaa..61a72ff27d 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_about.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about.xml
@@ -8,7 +8,7 @@
 		Buduj z [COMPILER] wersją [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Położenie [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Położenie [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] w [REGION] zlokalizowanym w &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml
index badff11a59..badff11a59 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_activeim.xml b/indra/newview/skins/default/xui/pl/floater_activeim.xml
index 2a34409f8b..2a34409f8b 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/pl/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
index 3402d8d31f..3402d8d31f 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml
index 9399fa1115..9399fa1115 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pl/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
index da0e947683..da0e947683 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
index 45b9e066e9..45b9e066e9 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml
index e6286a6ac1..e6286a6ac1 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml
index 5d296aa725..5d296aa725 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
index 1c24e0b35e..1c24e0b35e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_bumps.xml b/indra/newview/skins/default/xui/pl/floater_bumps.xml
index c1045ece9a..c1045ece9a 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pl/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
index 94f2b50450..94f2b50450 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
index 3e51761b37..3e51761b37 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
index 36ac88f7f6..36ac88f7f6 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
index 7b4f459b4e..7b4f459b4e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_object.xml b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
index 85861d9e76..85861d9e76 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml
index 60f3cd0fff..60f3cd0fff 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pl/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
index 877cedc0bc..877cedc0bc 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
index a607ca982f..a607ca982f 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_critical.xml b/indra/newview/skins/default/xui/pl/floater_critical.xml
index 8221a4e1bd..8221a4e1bd 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_critical.xml
+++ b/indra/newview/skins/default/xui/pl/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_display_name.xml b/indra/newview/skins/default/xui/pl/floater_display_name.xml
index ea28e65728..ea28e65728 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/pl/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml
index d278114969..d278114969 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_event.xml
+++ b/indra/newview/skins/default/xui/pl/floater_event.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_font_test.xml b/indra/newview/skins/default/xui/pl/floater_font_test.xml
index 019cee3e1e..019cee3e1e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/pl/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml
index 0c27e4d0bb..0c27e4d0bb 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
index 828898de54..828898de54 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
index 471d2c39ba..471d2c39ba 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_help_browser.xml b/indra/newview/skins/default/xui/pl/floater_help_browser.xml
index dfd5f907e5..dfd5f907e5 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/pl/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_hud.xml b/indra/newview/skins/default/xui/pl/floater_hud.xml
index a5d85aca4e..a5d85aca4e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_hud.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_im_container.xml b/indra/newview/skins/default/xui/pl/floater_im_container.xml
index ddf0790fa8..ddf0790fa8 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pl/floater_im_container.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml
index 9041ff7416..9041ff7416 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
index ba9724ff9a..ba9724ff9a 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
index b06b6d713d..b06b6d713d 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml
index 2c66f2851d..2c66f2851d 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml
index c42f57fb55..c42f57fb55 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
index 054d74b234..054d74b234 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
index bd7b221c5d..bd7b221c5d 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index 2b1e362b98..2b1e362b98 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
index 8038550bcb..8038550bcb 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
index 72a078949a..72a078949a 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
index e03c5faaeb..e03c5faaeb 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pl/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
index 7b1b395f87..7b1b395f87 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_map.xml b/indra/newview/skins/default/xui/pl/floater_map.xml
index e01c4c8a82..e01c4c8a82 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_map.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
index 9787736ad8..9787736ad8 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_media_settings.xml b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
index 5a36331c9a..5a36331c9a 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
index 9ce99692d0..9ce99692d0 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml
index 592814dbc0..592814dbc0 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_mute_object.xml b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
index 4af5872ef5..4af5872ef5 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
index 214d465f1c..214d465f1c 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pl/floater_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml
index 8e94ae821c..8e94ae821c 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
index de0b4d08c0..de0b4d08c0 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_pay.xml b/indra/newview/skins/default/xui/pl/floater_pay.xml
index 38fe5286a4..38fe5286a4 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pl/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_pay_object.xml b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
index bf88348c87..bf88348c87 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pl/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
index 2128cfa3c8..2128cfa3c8 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml
index e3dce84933..e3dce84933 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml
index fe796c6fa0..fe796c6fa0 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
index 930a5c76b0..930a5c76b0 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
index d276b1f63a..d276b1f63a 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
index 8171225666..8171225666 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
index b3275cb7b5..b3275cb7b5 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
index 3825fe742e..3825fe742e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
index e58acee139..e58acee139 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
index cfdac165cd..cfdac165cd 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/pl/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
index ce1f3c0ac7..ce1f3c0ac7 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/pl/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml
index a1f7785f48..a1f7785f48 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
index a5b96601b8..a5b96601b8 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug.xml b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
index 714a600262..714a600262 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_script_limits.xml b/indra/newview/skins/default/xui/pl/floater_script_limits.xml
index dd13d641a0..dd13d641a0 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_script_preview.xml b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
index eb6a1df77b..eb6a1df77b 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
index bdfdba569e..bdfdba569e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml
index 901d61a137..901d61a137 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_search.xml b/indra/newview/skins/default/xui/pl/floater_search.xml
index a0198670e4..a0198670e4 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_search.xml
+++ b/indra/newview/skins/default/xui/pl/floater_search.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_select_key.xml b/indra/newview/skins/default/xui/pl/floater_select_key.xml
index 190ad61352..190ad61352 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pl/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
index 2201c4b0ad..2201c4b0ad 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
index 131f92d56f..131f92d56f 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
index be92ef917d..be92ef917d 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
index ac041dff6a..ac041dff6a 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
index 886a30e5d9..886a30e5d9 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_sys_well.xml b/indra/newview/skins/default/xui/pl/floater_sys_well.xml
index e6c73af4f3..e6c73af4f3 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml
index 32cc08810d..32cc08810d 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
index 52c0cb8a93..52c0cb8a93 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 9e6fed8387..69d5c23f9c 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -442,16 +442,11 @@
 				<combo_box.item label="Suction" name="suction"/>
 				<combo_box.item label="Fali" name="weave"/>
 			</combo_box>
-			<check_box initial_value="nieprawda" label="Połącz powierzchnie planarne" name="checkbox planar align" tool_tip="Połącz tekstury na wszystkich wybranych powierzchniach z powierzchnią wybraną jako ostatnia. Wymaga planarnego mapowania tekstury."/>
-			<text name="rpt">
-				Powtórzenia / Powierzchnia
-			</text>
 			<spinner label="Poziomo (U)" name="TexScaleU"/>
 			<check_box label="Odwróć" name="checkbox flip s"/>
 			<spinner label="Pionowo (V)" name="TexScaleV"/>
 			<check_box label="Odwróć" name="checkbox flip t"/>
 			<spinner label="Powtórzenia˚" name="TexRot"/>
-			<spinner label="Powtórzenia / metr" name="rptctrl"/>
 			<button label="Zastosuj" label_selected="Zastosuj" name="button apply"/>
 			<text name="tex offset">
 				Wyrównanie tekstury
diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
index 2b06ae9f78..2b06ae9f78 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_tos.xml b/indra/newview/skins/default/xui/pl/floater_tos.xml
index 8cdf267f4b..8cdf267f4b 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_url_entry.xml b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
index fc170d8d1b..fc170d8d1b 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pl/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml
index 2155d56f27..2155d56f27 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
index e2d1fb77e9..e2d1fb77e9 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_web_content.xml b/indra/newview/skins/default/xui/pl/floater_web_content.xml
index 4cc8d0b27b..4cc8d0b27b 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/pl/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
index 4081b8a37e..4081b8a37e 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/pl/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_window_size.xml b/indra/newview/skins/default/xui/pl/floater_window_size.xml
index 2a6c257e54..2a6c257e54 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/pl/floater_window_size.xml
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
index 4f53337365..4f53337365 100644..100755
--- a/indra/newview/skins/default/xui/pl/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
index 5e982c0185..5e982c0185 100644..100755
--- a/indra/newview/skins/default/xui/pl/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml
index 63c79acc8c..63c79acc8c 100644..100755
--- a/indra/newview/skins/default/xui/pl/inspect_group.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml
index 23d8ce7700..23d8ce7700 100644..100755
--- a/indra/newview/skins/default/xui/pl/inspect_object.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
index 0d570940c1..0d570940c1 100644..100755
--- a/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/pl/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml
index 93051d1317..93051d1317 100644..100755
--- a/indra/newview/skins/default/xui/pl/language_settings.xml
+++ b/indra/newview/skins/default/xui/pl/language_settings.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
index 7c572b4fc9..7c572b4fc9 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
index aacdad97e3..aacdad97e3 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_other.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
index 163b3a231e..163b3a231e 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
index e8d2b14231..e8d2b14231 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
index dcf7921bad..dcf7921bad 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_other.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
index 8eb501c5b8..8eb501c5b8 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pl/menu_avatar_self.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml
index 1ec5883cfe..1ec5883cfe 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
index 4e5407601b..4e5407601b 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
index ee60d3feb6..ee60d3feb6 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
index ad43900137..ad43900137 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
index 9fba39be1a..9fba39be1a 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_cof_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_edit.xml b/indra/newview/skins/default/xui/pl/menu_edit.xml
index 578e270fed..578e270fed 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_edit.xml
+++ b/indra/newview/skins/default/xui/pl/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_favorites.xml b/indra/newview/skins/default/xui/pl/menu_favorites.xml
index 7310ff5c27..7310ff5c27 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/pl/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
index a72dec22fc..a72dec22fc 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_group_plus.xml b/indra/newview/skins/default/xui/pl/menu_group_plus.xml
index 83be4d38c5..83be4d38c5 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/pl/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
index 19d9510cd3..19d9510cd3 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml b/indra/newview/skins/default/xui/pl/menu_im_well_button.xml
deleted file mode 100644
index 207bc2211b..0000000000
--- a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Zamknij wszystkie" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
index 4ead44878a..4ead44878a 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
index 2b9a362123..2b9a362123 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
index 8924d6db3e..8924d6db3e 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
index 59560f236c..59560f236c 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
index c12bd490ff..c12bd490ff 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
index c4ef9761d9..c4ef9761d9 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
index 5ef0f2f7a4..5ef0f2f7a4 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml
index 5492f78b26..5492f78b26 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
index 04f9b94f7c..04f9b94f7c 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
index 591c3a81d5..591c3a81d5 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_land.xml b/indra/newview/skins/default/xui/pl/menu_land.xml
index cbfecaee56..cbfecaee56 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_land.xml
+++ b/indra/newview/skins/default/xui/pl/menu_land.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_landmark.xml b/indra/newview/skins/default/xui/pl/menu_landmark.xml
index aa5808390c..aa5808390c 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/pl/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml
index e50b694641..e50b694641 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_login.xml
+++ b/indra/newview/skins/default/xui/pl/menu_login.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
index 60dc3673a9..60dc3673a9 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/pl/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
index 8f86965416..8f86965416 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml
index 1d434670ee..1d434670ee 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
index fe5bc6ba6f..fe5bc6ba6f 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
index bd3d42f9b1..bd3d42f9b1 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/pl/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml
index 3da6c5c890..3da6c5c890 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_object.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_object_icon.xml b/indra/newview/skins/default/xui/pl/menu_object_icon.xml
index b499bca2db..b499bca2db 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pl/menu_object_icon.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
index c093557e86..c093557e86 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_outfit_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
index 998e25f38e..998e25f38e 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/pl/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
index 9e59102788..9e59102788 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pl/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
index b62b85d30a..b62b85d30a 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups.xml b/indra/newview/skins/default/xui/pl/menu_people_groups.xml
index ace5ebf888..ace5ebf888 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_groups.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
index c70ea2315f..c70ea2315f 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
index a8cc6b4a60..a8cc6b4a60 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
index dcfc48fb60..dcfc48fb60 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_multiselect.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
index 8ec3820f84..8ec3820f84 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
index b474a556bd..b474a556bd 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_picks.xml b/indra/newview/skins/default/xui/pl/menu_picks.xml
index 6f6e4b7fa8..6f6e4b7fa8 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_picks.xml
+++ b/indra/newview/skins/default/xui/pl/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
index e9c00f51a9..e9c00f51a9 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_place.xml b/indra/newview/skins/default/xui/pl/menu_place.xml
index c3b72d6abb..c3b72d6abb 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_place.xml
+++ b/indra/newview/skins/default/xui/pl/menu_place.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
index 3d0c1c87fb..3d0c1c87fb 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
index d1f283b7aa..d1f283b7aa 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
index 0139d3a987..0139d3a987 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
index ef836c8ecf..ef836c8ecf 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/pl/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
index 4bc65eca38..4bc65eca38 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/pl/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
index 256500a402..256500a402 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/pl/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_slurl.xml b/indra/newview/skins/default/xui/pl/menu_slurl.xml
index 862f538aa7..862f538aa7 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/pl/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
index 0e58592d46..0e58592d46 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
index cd36c116b0..cd36c116b0 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
index b12df08d6a..b12df08d6a 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_text_editor.xml b/indra/newview/skins/default/xui/pl/menu_text_editor.xml
index 812f87bc1a..812f87bc1a 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/pl/menu_text_editor.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
index 53536c8f1c..53536c8f1c 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/pl/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
index db729be725..db729be725 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_agent.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_group.xml b/indra/newview/skins/default/xui/pl/menu_url_group.xml
index f340b3296a..f340b3296a 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_http.xml b/indra/newview/skins/default/xui/pl/menu_url_http.xml
index e73f7b6745..e73f7b6745 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
index e36fa0dd2b..e36fa0dd2b 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_map.xml b/indra/newview/skins/default/xui/pl/menu_url_map.xml
index 179ab1f676..179ab1f676 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
index 7576208a9e..7576208a9e 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
index 1b8dd62137..1b8dd62137 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
index eb83245c48..eb83245c48 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
index 4d4a5b4c4d..4d4a5b4c4d 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
index e225546930..e225546930 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/pl/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml
index 24c961fa26..e1725fc308 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml
@@ -236,7 +236,7 @@
 		<menu label="Renderowanie" name="Rendering">
 			<menu_item_check label="Osie" name="Axes"/>
 			<menu_item_check label="Tryb obrazu szkieletowego" name="Wireframe"/>
-			<menu_item_check label="Oświetlenie i cienie" name="Lighting and Shadows"/>
+			<menu_item_check label="Oświetlenie i cienie" name="Advanced Lighting Model"/>
 			<menu_item_check label="Cienie Słońca/Księżyca/Projektory" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO and wygładzanie cienia" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Globalne oświetlenie (eksperymentalne)" name="Global Illumination"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
index bf85246be8..bf85246be8 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
index 47cafdbd99..47cafdbd99 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
index 7531437043..7531437043 100644..100755
--- a/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/pl/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml
index cbf2afa91d..cbf2afa91d 100644..100755
--- a/indra/newview/skins/default/xui/pl/mime_types.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types.xml
diff --git a/indra/newview/skins/default/xui/pl/mime_types_linux.xml b/indra/newview/skins/default/xui/pl/mime_types_linux.xml
index a2b8168b51..a2b8168b51 100644..100755
--- a/indra/newview/skins/default/xui/pl/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
index 7213b26165..7213b26165 100644..100755
--- a/indra/newview/skins/default/xui/pl/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 0194293642..f255b1b8ea 100644..100755
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -1106,7 +1106,6 @@ Możesz normalnie używać [SECOND_LIFE], inni użytkownicy będą Cię widzieli
 		Instalacja [APP_NAME] zakończona.
 
 Jeżeli używasz [SECOND_LIFE] po raz pierwszy to musisz stworzyć konto żeby móc się zalogować.
-Czy chcesz przejść na stronę [http://join.secondlife.com secondlife.com] żeby stworzyć nowe konto?
 		<usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Nowe konto..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
diff --git a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
index bac885e5d8..bac885e5d8 100644..100755
--- a/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/pl/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
index ab1d8d7007..ab1d8d7007 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/pl/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
index ba0c85e4ef..ba0c85e4ef 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/pl/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
index c43a9bed81..c43a9bed81 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_avatar_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
index 62cb392ba7..62cb392ba7 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_block_list_sidetray.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
index cebb6e3cfe..cebb6e3cfe 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
index 560bfe78f4..560bfe78f4 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml
index 8a033fc32f..8a033fc32f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
index e32c12a8ee..e32c12a8ee 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_classified_info.xml b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
index 52f54fc7cf..52f54fc7cf 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
index 17a6d1eb8b..17a6d1eb8b 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
index 42d1ead400..42d1ead400 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
index 970b994c20..970b994c20 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/pl/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
index f9fba4d79f..f9fba4d79f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
index 83210808f1..83210808f1 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
index 51ee3af00d..51ee3af00d 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
index 7cfd9c221c..7cfd9c221c 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
index 390a5313b5..390a5313b5 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
index d32646d1a3..d32646d1a3 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
index cbcba97eb6..cbcba97eb6 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
index 7653e84cc0..7653e84cc0 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
index 7975e55746..7975e55746 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
index a773a52a59..a773a52a59 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
index 72c162f63d..72c162f63d 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
index e6fd8b18f8..e6fd8b18f8 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
index 54f9fdc21c..54f9fdc21c 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
index 9530c781ab..9530c781ab 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
index d90a6d8726..d90a6d8726 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
index 9e0acd3cec..9e0acd3cec 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
index f74ad916cd..f74ad916cd 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
index b41069e8d7..b41069e8d7 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
index 6fd1e2277a..6fd1e2277a 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
index f2a9b10f17..f2a9b10f17 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
index 7da1341e96..7da1341e96 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
index 2027b8715b..2027b8715b 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
index 4e373cdf8f..4e373cdf8f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml
index a4d76badf0..a4d76badf0 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
index 37fb529f2b..37fb529f2b 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
index 1822551e86..1822551e86 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
index aea4e50fd5..aea4e50fd5 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
index a8b4056976..a8b4056976 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_list_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
index a3b0998de3..a3b0998de3 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_notify.xml b/indra/newview/skins/default/xui/pl/panel_group_notify.xml
index d27a81217a..d27a81217a 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_group_roles.xml b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
index 9e9c79d26a..9e9c79d26a 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pl/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
index 4aadd3b93b..4aadd3b93b 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/pl/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
index 3370f6f58e..3370f6f58e 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_landmarks.xml b/indra/newview/skins/default/xui/pl/panel_landmarks.xml
index 039be3b504..039be3b504 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index dc8e7399af..c87a3d3bd4 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -5,6 +5,9 @@
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				POŁĄCZ
+			</text>
 			<text name="username_text">
 				Użytkownik:
 			</text>
@@ -12,15 +15,8 @@
 			<text name="password_text">
 				Hasło:
 			</text>
-			<check_box label="Zapamiętaj hasło" name="remember_check"/>
-			<button label="Połącz" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Tryb życia:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Wybierz tryb życia. Wybierz tryb turystyczny dla łatwego zwiedzania i czatowania. Wybierz tryb zaawansowany aby mieć dostęp do większej ilości opcji.">
-				<combo_box.item label="Turystyczny" name="Basic"/>
-				<combo_box.item label="Zaawansowany" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Rozpocznij w:
 			</text>
@@ -30,16 +26,23 @@
 				<combo_box.item label="&lt;Wpisz Region&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Utwórz nowe konto
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Potrzebujesz pomocy z logowaniem się?
 			</text>
 			<text name="forgot_password_text">
 				Zapomniałeś swojej nazwy użytkownika lub hasła?
 			</text>
-			<text name="login_help">
-				Potrzebujesz pomocy z logowaniem się?
+			<button label="Połącz" name="connect_btn"/>
+			<check_box label="Zapamiętaj hasło" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CREATE YǾUR ACCǾUNT
 			</text>
+			<button name="create_new_account_btn"
+					label="Utwórz nowe konto"
+					width="120"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
index 8d6fa1173c..8d6fa1173c 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_me.xml b/indra/newview/skins/default/xui/pl/panel_me.xml
index 72a5f51520..72a5f51520 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_me.xml
+++ b/indra/newview/skins/default/xui/pl/panel_me.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
index 914a2aee73..914a2aee73 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
index a87c29d7b3..a87c29d7b3 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
index 7e95c4942f..7e95c4942f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
index b01e686c41..b01e686c41 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
index 63cf96b571..4ed3ff669b 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<string name="min_width">
 		192
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
index d77c6d7852..d77c6d7852 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
index e1668e1ef1..e1668e1ef1 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/pl/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/pl/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
index 50353d4fba..50353d4fba 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
index bf23ace58f..bf23ace58f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
index 2f8c008f98..2f8c008f98 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
index ed3057399d..ed3057399d 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
index 5559c151e7..5559c151e7 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/pl/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml
index ef52e2148b..ef52e2148b 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_people.xml
+++ b/indra/newview/skins/default/xui/pl/panel_people.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
index 26afded795..26afded795 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/pl/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_picks.xml b/indra/newview/skins/default/xui/pl/panel_picks.xml
index 1ba4e76196..1ba4e76196 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_picks.xml
+++ b/indra/newview/skins/default/xui/pl/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
index 2a4ffab36c..2a4ffab36c 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pl/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_places.xml b/indra/newview/skins/default/xui/pl/panel_places.xml
index d69d137d23..d69d137d23 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_places.xml
+++ b/indra/newview/skins/default/xui/pl/panel_places.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
index 5e61f62691..5e61f62691 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
index d53a99e8c1..d53a99e8c1 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
index 7fd1029e6a..7fd1029e6a 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
index 3affda57bf..3affda57bf 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index fff56eab6e..fff56eab6e 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index f2beef091a..4cd271a141 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -26,7 +26,7 @@
 		<text name="ShadersText">
 			Cieniowanie pixeli (shadery):
 		</text>
-		<check_box initial_value="prawda" label="Przeźroczystość wody" name="TransparentWater"/>
+		<check_box initial_value="true" label="Przeźroczystość wody" name="TransparentWater"/>
 		<check_box initial_value="true" label="Mapowanie wypukłości i połysk" name="BumpShiny"/>
 		<check_box initial_value="true" label="Podstawowe shadery" name="BasicShaders" tool_tip="Wyłączenie tej opcji może naprawić błędy niektórych sterowników graficznych."/>
 		<check_box initial_value="true" label="Shadery atmosfery" name="WindLightUseAtmosShaders"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
index 4c2df2c1f3..4c2df2c1f3 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
index 5af2fed142..5af2fed142 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index fa0a5981a8..b663e18227 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
@@ -26,14 +26,13 @@
 		Internet:
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="Użyj zewnętrznej przeglądarki (IE, Firefox, Safari)" name="external" tool_tip="Używaj zewnętrznej przeglądarki. Nie jest to rekomendowane w trybie pełnoekranowym." value="1"/>
+		<radio_item label="Użyj zewnętrznej przeglądarki (IE, Firefox, Safari)" name="external" tool_tip="Używaj zewnętrznej przeglądarki. Nie jest to rekomendowane w trybie pełnoekranowym." value="true"/>
 		<radio_item label="Używaj wbudowanej przeglądarki." name="internal" tool_tip="Używaj wbudowanej przeglądarki. Ta przeglądarka otworzy nowe okno w [APP_NAME]." value=""/>
 	</radio_group>
 	<check_box initial_value="true" label="Zezwalaj na wtyczki" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Akceptuj ciasteczka z Internetu" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Zezwalaj na Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="nieprawda" label="Zezwól na wyskakujące okienka przeglądarki mediów" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="Używaj serwera proxy" name="web_proxy_enabled"/>
+	<check_box initial_value="false" label="Zezwól na wyskakujące okienka przeglądarki mediów" name="media_popup_enabled"/>
 	<text name="Proxy location">
 		Lokalizacja proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
index 46f5ebb8e2..46f5ebb8e2 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
index b5763e1291..b5763e1291 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pl/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
index 932e3631ab..932e3631ab 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
index c5b08383dc..c5b08383dc 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
index 1b64827725..1b64827725 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml
index 601571f62e..601571f62e 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
index f22b4a5989..f22b4a5989 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml
index c6ed2457f1..c6ed2457f1 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_script_ed.xml b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
index b05223aa0f..b05223aa0f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/pl/panel_script_ed.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
index a52d8aed3d..a52d8aed3d 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
index 070f025087..070f025087 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
index 70a6e39412..70a6e39412 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/pl/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray.xml b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
index ff4ca23a4d..ff4ca23a4d 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/pl/panel_side_tray.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
index 95cd7c53dc..95cd7c53dc 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/pl/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
index 9f7f7f1238..9f7f7f1238 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
index 6aa0d27bb8..6aa0d27bb8 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
index b43bd96536..b43bd96536 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
index f0fe28c4ce..f0fe28c4ce 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pl/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
index f8a076424f..f8a076424f 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..1611900700
--- /dev/null
+++ b/indra/newview/skins/default/xui/pl/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="volumepulldown_floater">
+    <slider label="Główny" name="System Volume"/>
+    <slider label="Przyciski" name="UI Volume"/>
+    <slider label="Okolica" name="Wind Volume"/>
+    <slider label="Efekty" name="SFX Volume"/>
+    <check_box name="gesture_audio_play_btn" tool_tip="Włącz dźwięki gestów"/>
+    <slider label="Muzyka" name="Music Volume"/>
+    <check_box tool_tip="Włącz muzykę strumieniową" name="enable_music"/>
+    <slider label="Media" name="Media Volume"/>
+    <check_box tool_tip="Włącz media strumieniowe" name="enable_media"/>
+    <slider label="Głos" name="Voice Volume"/>
+    <check_box tool_tip="Włącz rozmowy głosowe" name="enable_voice_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml
index 69f18be767..69f18be767 100644..100755
--- a/indra/newview/skins/default/xui/pl/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/pl/role_actions.xml b/indra/newview/skins/default/xui/pl/role_actions.xml
index 57df2bc70f..57df2bc70f 100644..100755
--- a/indra/newview/skins/default/xui/pl/role_actions.xml
+++ b/indra/newview/skins/default/xui/pl/role_actions.xml
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
index cea903769c..cea903769c 100644..100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
index c2e50473a5..c2e50473a5 100644..100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
index 9ec3c480b7..9ec3c480b7 100644..100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml
diff --git a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
index eb8c9cdbbb..eb8c9cdbbb 100644..100755
--- a/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_task_info.xml
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index f6dec8536b..f6dec8536b 100644..100755
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
diff --git a/indra/newview/skins/default/xui/pl/teleport_strings.xml b/indra/newview/skins/default/xui/pl/teleport_strings.xml
index 0366c3fdbc..0366c3fdbc 100644..100755
--- a/indra/newview/skins/default/xui/pl/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pl/teleport_strings.xml
diff --git a/indra/newview/skins/default/xui/pl/xui_version.xml b/indra/newview/skins/default/xui/pl/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/pl/xui_version.xml
+++ b/indra/newview/skins/default/xui/pl/xui_version.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index e843e56090..47975a6386 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -7,7 +7,9 @@
 		Construído com [COMPILER] versão [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME]&lt;/nolink&gt;([HOSTIP])
+		Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(coordenadas globais [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -65,27 +67,26 @@ Versão do servidor de voz: [VOICE_VERSION]
 		</panel>
 		<panel label="Licenças" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University e David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         O Visualizador do Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e seus Licenciantes). Todos os direitos reservados. Consulte www.havok.com para obter detalhes.
 
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index cd0fb4c41b..f48280840c 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -465,7 +465,7 @@ Mídia:
 				Permitir acesso apenas para residentes que:
 			</text>
 			<check_box label="Possuam Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Os residentes devem ter seus dados de pagamento cadastrados para acessar este lote.  Consulte o [SUPPORT_SITE] para saber mais."/>
-			<check_box label="Tiveram sua idade verificada [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Os residentes devem ter a idade verificada para acessar este lote. Consulte o [SUPPORT_SITE] para saber mais."/>
+			<check_box label="Tem 18 anos ou mais [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar este lote. Consulte o [SUPPORT_SITE] para obter mais informações."/>
 			<check_box label="Permitir acesso do grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
 			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/pt/floater_activeim.xml b/indra/newview/skins/default/xui/pt/floater_activeim.xml
index 892ccdf974..892ccdf974 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/pt/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml
index 05326d8594..05326d8594 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
index 5cae581045..5cae581045 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
deleted file mode 100644
index 3ec81612a1..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Não foi possível iniciar o movimento
-	</floater.string>
-	<floater.string name="anim_too_long">
-		O arquivo de animação tem [LENGTH] segundos de duração. 
-
-A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Não foi possível ler o arquivo de animação.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fim de arquivo prematuro
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Impossível ler definição constraint.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Impossível abrir arquivo BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Invalid HIERARCHY header.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		RAIZ ou JUNTA não encontrados.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Impossível obter nome JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Impossível localizar OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Impossível localizar CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Impossível obter ordem de rotação.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Impossível obter eixo de rotação.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Impossível localizar MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Impossível determinar número de quadros.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Impossível determinar tempo dos quadros.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Impossível definir posicionamento.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Impossível definir valores da rotação.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Impossível abrir arquivo de tradução.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Impossível ler cabeçalho de tradução.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Impossível ler nomes traduzidos.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Impossível obter valor traduzido a ignorar.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Impossível obter valor traduzido relativo.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Impossível obter valor traduzido.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Impossível ler matriz de tradução.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Impossível obter nome mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Impossível obter nome mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Impossível obter valor prioritário.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Impossível obter valor do loop.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossível obter valor easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Impossível obter valor easeOut.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Impossível obter valor de morph da mão.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Impossível ler nome do emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nome da junta incorreto, use &quot;quadril&quot;.
-	</floater.string>
-	<text name="name_label">
-		Nome:
-	</text>
-	<text name="description_label">
-		Descrição:
-	</text>
-	<spinner label="Prioridade" label_width="72" name="priority" tool_tip="Controla quais animações podem ser interrompidas por esta animação" width="110"/>
-	<check_box label="Loop" name="loop_check" tool_tip="Executa esta animação sem parar"/>
-	<spinner label="Dentro(%)" label_width="56" left="65" name="loop_in_point" tool_tip="Define o ponto em que a animação em loop reinicia" width="116"/>
-	<spinner label="Fora(%)" label_width="40" left="185" name="loop_out_point" tool_tip="Define o ponto em que a animação em loop acaba"/>
-	<text name="hand_label">
-		Pose de Mão
-	</text>
-	<combo_box left_delta="100" name="hand_pose_combo" tool_tip="Controla os gestos das mãos durante a animação" width="184">
-		<combo_box.item label="Abrir" name="Spread"/>
-		<combo_box.item label="Relaxado" name="Relaxed"/>
-		<combo_box.item label="Apontar ambas" name="PointBoth"/>
-		<combo_box.item label="Punho" name="Fist"/>
-		<combo_box.item label="E relaxada" name="RelaxedLeft"/>
-		<combo_box.item label="Apontar E" name="PointLeft"/>
-		<combo_box.item label="Punho E" name="FistLeft"/>
-		<combo_box.item label="D relaxada" name="RelaxedRight"/>
-		<combo_box.item label="Apontar D" name="PointRight"/>
-		<combo_box.item label="Punho D" name="FistRight"/>
-		<combo_box.item label="Saudação D" name="SaluteRight"/>
-		<combo_box.item label="Escrevendo" name="Typing"/>
-		<combo_box.item label="Paz D" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expressão
-	</text>
-	<combo_box left_delta="100" name="emote_combo" tool_tip="Controla as expressões faciais durante a animação" width="184">
-		<item label="(nenhum)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Com medo" name="Afraid" value="Com medo"/>
-		<item label="Bravo" name="Angry" value="Bravo"/>
-		<item label="Sorriso contagiante" name="BigSmile" value="Sorriso contagiante"/>
-		<item label="À toa" name="Bored" value="À toa"/>
-		<item label="Chorar" name="Cry" value="Chorar"/>
-		<item label="Desdenho" name="Disdain" value="Desdenho"/>
-		<item label="Com vergonha" name="Embarrassed" value="Com vergonha"/>
-		<item label="Franzir testa" name="Frown" value="Franzir testa"/>
-		<item label="Beijo" name="Kiss" value="Beijo"/>
-		<item label="Rir" name="Laugh" value="Rir"/>
-		<item label="Mostrar a língua" name="Plllppt" value="Mostrar a língua"/>
-		<item label="Asco" name="Repulsed" value="Asco"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Encolher os ombros" name="Shrug" value="Encolher os ombros"/>
-		<item label="Sorriso" name="Smile" value="Sorriso"/>
-		<item label="Surpresa" name="Surprise" value="Surpresa"/>
-		<item label="Piscar" name="Wink" value="Piscar"/>
-		<item label="Preocupado" name="Worry" value="Preocupado"/>
-	</combo_box>
-	<text name="preview_label" width="250">
-		Prever enquanto
-	</text>
-	<combo_box left_delta="100" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns." width="130">
-		<item label="Em pé" name="Standing" value="Em pé"/>
-		<item label="Andando" name="Walking" value="Andando"/>
-		<item label="Sentado" name="Sitting" value="Sentado"/>
-		<item label="Voando" name="Flying" value="Voando"/>
-	</combo_box>
-	<spinner label="Facilitar a entrada (sec)" label_width="125" name="ease_in_time" tool_tip="Tempo (em segundos) da transição inicial da animação" width="192"/>
-	<spinner bottom_delta="-20" label="Facilitar a saída (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Tempo (em segundos) da transição de saída da animação" width="192"/>
-	<button bottom_delta="-32" name="play_btn" tool_tip="Executar animação"/>
-	<button name="pause_btn" tool_tip="Pausar a animação"/>
-	<button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
-	<text name="bad_animation_text">
-		Incapaz de ler o arquivo de animação.
-
-Nós recomendamos exportar arquivos BVH do
-Poser 4.
-	</text>
-	<button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
-	<button label="Cancelar" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml
index 074f7bf001..074f7bf001 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pt/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
new file mode 100755
index 0000000000..ca813a8540
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Configurações da substituição automática">
+	<check_box label="Habilitar substituição automática" name="autoreplace_enable" tool_tip="Ao inserir texto de bate-papo, substitua quaisquer palavras-chave inseridas pela substituição correspondente"/>
+	<button label="Importar lista..." name="autoreplace_import_list" tool_tip="Carrega uma lista exportada anteriormente de um arquivo."/>
+	<button label="Exportar lista..." name="autoreplace_export_list" tool_tip="Salva um arquivo da lista selecionada para compartilhá-la."/>
+	<button label="Nova lista..." name="autoreplace_new_list" tool_tip="Cria uma nova lista."/>
+	<button label="Excluir lista" name="autoreplace_delete_list" tool_tip="Exclui a lista selecionada."/>
+	<button name="autoreplace_list_up" tool_tip="Aumenta a prioridade desta lista."/>
+	<button name="autoreplace_list_down" tool_tip="Diminui a prioridade desta lista."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Palavra-chave" name="keyword"/>
+		<scroll_list.columns label="Substituição" name="replacement"/>
+	</scroll_list>
+	<button label="Adicionar..." name="autoreplace_add_entry"/>
+	<button label="Remover" name="autoreplace_delete_entry"/>
+	<button label="Salvar entrada" name="autoreplace_save_entry" tool_tip="Salva esta entrada."/>
+	<button label="Salvar alterações" name="autoreplace_save_changes" tool_tip="Salvar todas as alterações."/>
+	<button label="Cancelar" name="autoreplace_cancel" tool_tip="Descarta todas as alterações."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar.xml b/indra/newview/skins/default/xui/pt/floater_avatar.xml
index 168cdacae1..168cdacae1 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index 2b65952676..2b65952676 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 9473ee7ce9..9473ee7ce9 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml
index f8ae3cd2d8..f8ae3cd2d8 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index acc462ea94..acc462ea94 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
index 8823d04b62..998fa8b2d6 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="EDITAR AUTORIZAÇÕES DE CONTEÚDO">
+<floater name="floaterbulkperms" title="AJUSTAR PERMISSÕES DE CONTEÚDO">
 	<floater.string name="nothing_to_modify_text">
 		A seleção não contém nenhum conteúdo editável.
 	</floater.string>
@@ -33,7 +33,7 @@
 	<button label="Tudo" label_selected="Todas" name="check_all"/>
 	<button label="Limpar" label_selected="Nenhuma" name="check_none"/>
 	<text name="newperms">
-		Novas autorizações de conteúdo
+		Ajustar permissões de conteúdo para
 	</text>
 	<text name="GroupLabel">
 		Grupo:
@@ -49,6 +49,7 @@
 	<check_box label="Modificar" name="next_owner_modify"/>
 	<check_box label="Copiar" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Transferir" name="next_owner_transfer" tool_tip="O próximo dono poderá revender ou dar este objeto"/>
-	<button label="OK" name="apply"/>
+	<button label="OK" name="ok"/>
+	<button label="Aplicar" name="apply"/>
 	<button label="Cancelar" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml
index 475d36c119..475d36c119 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index b9e7a04412..b9e7a04412 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index 2845a29e1d..2845a29e1d 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
index 24e41ac8c8..24e41ac8c8 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 258c95cc7d..258c95cc7d 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
index c465197c9a..c465197c9a 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
index 9cda01c187..9cda01c187 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pt/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
index 72016c6b40..2eb2c94940 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="BATE-PAPO LOCAL">
+<floater name="nearby_chat" title="BATE-PAPO LOCAL">
 	<panel name="bottom_panel">
 		<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
 		<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml
index 60f01a3733..60f01a3733 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/pt/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index 4ea014335f..4ea014335f 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
new file mode 100644
index 0000000000..ae7dd3c441
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA">
+	<panel name="buttons_panel">
+		<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
new file mode 100644
index 0000000000..97a2e8327c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="CONVERSA:">
+	<floater.string name="Title">
+		CONVERSA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Página"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_critical.xml b/indra/newview/skins/default/xui/pt/floater_critical.xml
index 5d7fe0142b..5d7fe0142b 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_critical.xml
+++ b/indra/newview/skins/default/xui/pt/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
index a8b5d8f67d..a8b5d8f67d 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/pt/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_destinations.xml b/indra/newview/skins/default/xui/pt/floater_destinations.xml
index df18698d2f..df18698d2f 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/pt/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_display_name.xml b/indra/newview/skins/default/xui/pt/floater_display_name.xml
index 8daa40cc23..8daa40cc23 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/pt/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
index 9e25938986..9e25938986 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/pt/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
index 1f1fbcce7e..1f1fbcce7e 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/pt/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
index 7bde22851e..7bde22851e 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/pt/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
index 4055ba97ef..4055ba97ef 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_event.xml b/indra/newview/skins/default/xui/pt/floater_event.xml
index a8dc3f96d7..a8dc3f96d7 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_event.xml
+++ b/indra/newview/skins/default/xui/pt/floater_event.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
index eeb39583ef..eeb39583ef 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_font_test.xml b/indra/newview/skins/default/xui/pt/floater_font_test.xml
index c506cdb12d..c506cdb12d 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/pt/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
index 2e5b92aaf7..2e5b92aaf7 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 8003a35d16..8003a35d16 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_goto_line.xml b/indra/newview/skins/default/xui/pt/floater_goto_line.xml
new file mode 100644
index 0000000000..f2ef825ba0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="IR PARA A LINHA">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Ir para a linha
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
index 1bc2bce768..1204fb93e2 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Habilitar VBO:
 	</text>
 	<check_box initial_value="true" label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
+	<text name="tc label">
+		Habilitar S3TC:
+	</text>
+	<check_box initial_value="true" label="Habilitar compressão de texturas (requer reinício)" name="texture compression" tool_tip="Comprime as texturas na memória de vídeo, permitindo o carregamento de texturas de maior resolução em detrimento da qualidade da cor."/>
 	<slider label="Memória de texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Quanto da memória deve ser alocado para texturas.  O padrão é definido pela memória da placa de vídeo.  Reduzir este valor pode melhorar o desempenho, mas as texturas podem fica fora de foco."/>
 	<spinner label="Relação de Distância de  Nevoeiro:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_help_browser.xml b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
index 9cc8a0a6b2..9cc8a0a6b2 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_how_to.xml b/indra/newview/skins/default/xui/pt/floater_how_to.xml
index 15c4946cb0..15c4946cb0 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/pt/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml
index e458913452..e458913452 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_hud.xml
+++ b/indra/newview/skins/default/xui/pt/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index 0fbb826a96..a1cea72b1e 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAS"/>
+<multi_floater name="floater_im_box" title="CONVERSAS">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
+					<button name="add_btn" tool_tip="Iniciar uma nova conversa"/>
+					<button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Recolher este painel"/>
+					<text name="stub_textbox">
+						Esta conversa está em uma janela separada.   [secondlife:/// Trazer de volta.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 5543ffa41d..e592b14fa7 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Para" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/>
+	<floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/>
+	<floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/>
+	<floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/>
+	<floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/>
+	<floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/>
+				<button name="voice_call_btn" tool_tip="Abrir conexão por voz"/>
+				<button name="close_btn" tool_tip="Encerrar esta conversa"/>
+				<button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Traduzir conversa" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Para" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 362a553d64..362a553d64 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_import_collada.xml b/indra/newview/skins/default/xui/pt/floater_import_collada.xml
index ad55d416c3..ad55d416c3 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/pt/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 6344258fa0..1e86f847ad 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz?
 	</floater.string>
 	<text name="question">
-		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
+		Se você atender, será desconectado de suas conversas de voz atuais.
 	</text>
-	<button label="Aceitar" label_selected="Aceitar" name="Accept"/>
-	<button label="Rejeitar" label_selected="Rejeitar" name="Reject"/>
-	<button label="Enviar MI" name="Start IM"/>
+	<button label="Atender" label_selected="Atender" name="Accept"/>
+	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
+	<button label="Iniciar MI em vez disso" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml
index 6a00b1a628..6a00b1a628 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
deleted file mode 100644
index ae3312eab0..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MEU INVENTÁRIO">
-	<floater.string name="Title">
-		MEU INVENTÁRIO
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MEU INVENTÁRIO (Pegando [ITEM_COUNT] items...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MEU INVENTÁRIO ([ITEM_COUNT] items) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Obtido
-	</floater.string>
-	<panel label="Painel do inventário" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 8a8f1f5b34..8a8f1f5b34 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index 71759abdc2..71759abdc2 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 98d8c0e319..98d8c0e319 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
index 9932318293..9932318293 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 7475bdd5b8..7475bdd5b8 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 5ad116ac8a..5ad116ac8a 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index 73f187f0e4..73f187f0e4 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_map.xml b/indra/newview/skins/default/xui/pt/floater_map.xml
index 8233f2a43f..8233f2a43f 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_map.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
index 7491218067..7491218067 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_media_settings.xml b/indra/newview/skins/default/xui/pt/floater_media_settings.xml
index 5af002c502..5af002c502 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
index efb5da4ace..efb5da4ace 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
index bb6113671b..bb6113671b 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
index 8960500831..8194278b16 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triângulos" name="triangles" value="Triângulos"/>
 				<text initial_value="Vértices" name="vertices" value="Vértices"/>
 				<text initial_value="Alto" name="high_label" value="Alto"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Médio" name="medium_label" value="Médio"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+					<item name="Use LoD above" value="Usar LoD acima"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Baixo" name="low_label" value="Baixo"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+					<item name="Use LoD above" value="Usar LoD acima"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Mais baixo" name="lowest_label" value="Mais baixo"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+					<item name="Use LoD above" value="Usar LoD acima"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Gerar normais" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml b/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
deleted file mode 100644
index 0d07303c91..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="CARREGAR ASSISTENTE DE MODELAGEM">
-	<button label="5. Carregar" name="upload_btn"/>
-	<button label="4. Revisar" name="review_btn"/>
-	<button label="3. Física" name="physics_btn"/>
-	<button label="2. Otimizar" name="optimize_btn"/>
-	<button label="1. Selecionra arquivo" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Escolher arquivo de modelo
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Usuários avançados: se você estiver familiarizado com ferramentas de criação de conteúdo 3D, use o Advanced Uploader.
-			</text>
-			<button label="Trocar para avançado" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Escolha o arquivo de modelo para upload
-			</text>
-			<button label="Procurar..." label_selected="Procurar..." name="browse"/>
-			<text name="Model types">
-				O Second Life oferece suporte a arquivos COLLADA (.dae)
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				AVISO:
-			</text>
-			<text name="warning_text">
-				Não será possível concluir a etapa final do upload desse modelo para os servidores do Second Life. [secondlife:///app/floater/learn_more Saiba como] configurar sua conta para uploads de modelos mesh.
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Otimizar modelo
-			</text>
-		</panel>
-		<text name="optimize_description">
-			O modelo foi ajustado para desempenho. Faça novos ajustes, se desejar.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Gerar nível de detalhes: Alto
-			</text>
-			<text name="medium_detail_text">
-				Gerar nível de detalhes: Médio
-			</text>
-			<text name="low_detail_text">
-				Gerar nível de detalhes: Baixo
-			</text>
-			<text name="lowest_detail_text">
-				Gerar nível de detalhes: Mais baixo
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Recalcular geometria" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Visualização da geometria
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="LOD para exibir na renderização de visualização">
-				<combo_item name="high">
-					Máximo de detalhes
-				</combo_item>
-				<combo_item name="medium">
-					Detalhes médios
-				</combo_item>
-				<combo_item name="low">
-					Poucos detalhes
-				</combo_item>
-				<combo_item name="lowest">
-					Mínimo de detalhes
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Ajustar físico
-			</text>
-		</panel>
-		<text name="physics_description">
-			Criaremos uma forma para o corpo externo do modelo. Ajuste o nível de detalhes como necessário para a finalidade desejada de seu modelo.
-		</text>
-		<panel name="physics_content">
-			<button label="Recalcular físico" name="recalculate_physics_btn"/>
-			<button label="Recalculando..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Visualização do físico
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="LOD para exibir na renderização de visualização">
-				<combo_item name="high">
-					Máximo de detalhes
-				</combo_item>
-				<combo_item name="medium">
-					Detalhes médios
-				</combo_item>
-				<combo_item name="low">
-					Poucos detalhes
-				</combo_item>
-				<combo_item name="lowest">
-					Mínimo de detalhes
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				Revisar
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Impacto no lote/região: [EQUIV] equivalentes de prim
-			</text>
-			<text name="review_fee">
-				Uma tarifa de upload de L$ [FEE] será debitada da sua conta.
-			</text>
-			<text name="review_confirmation">
-				Ao clicar no botão de upload, você confirma que detém os direitos apropriados sobre o material contido no modelo.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Upload concluído
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Seu modelo foi carregado.
-		</text>
-		<text name="inventory_text">
-			Disponível na pasta Objetos do seu inventário.
-		</text>
-		<text name="charged_fee">
-			L$ [FEE] foram debitados da sua conta.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Voltar" name="back"/>
-	<button label="Próximo &gt;&gt;" name="next"/>
-	<button label="Calcular pesos e tarifa &gt;&gt;" name="calculate"/>
-	<button label="Calculando..." name="calculating"/>
-	<button label="Carregar" name="upload" tool_tip="Carregar no simulador"/>
-	<button label="Cancelar" name="cancel"/>
-	<button label="Fechar" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Inativo
-	</string>
-	<string name="status_parse_error">
-		Dae parsing - erro, detalhes no log.
-	</string>
-	<string name="status_reading_file">
-		Carregando...
-	</string>
-	<string name="status_generating_meshes">
-		Gerando meshes...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Erro: Número de Vertex acima de 65534. Abortado.
-	</string>
-	<string name="bad_element">
-		Erro: elemento inválido
-	</string>
-	<string name="high">
-		Alto
-	</string>
-	<string name="medium">
-		Médio
-	</string>
-	<string name="low">
-		Baixo
-	</string>
-	<string name="lowest">
-		Mais baixo
-	</string>
-	<string name="mesh_status_good">
-		Entregar!
-	</string>
-	<string name="mesh_status_na">
-		N/D
-	</string>
-	<string name="mesh_status_none">
-		Nenhum
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Cada nível de detalhamento têm um número de faces para textura.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Cada nível de detalhamento têm um número de faces para textura.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		O nível de detalhamento possui vértices demais.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Falta o nível de detalhamento necessário.
-	</string>
-	<string name="layer_all">
-		Tudo
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
index 728357a400..728357a400 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
index 97fbd35fcc..97fbd35fcc 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml
index 38e06d2aed..38e06d2aed 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml
index 71d8682758..71d8682758 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
deleted file mode 100644
index 653861f7d8..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="Bate-papo local">
-	<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_object_weights.xml b/indra/newview/skins/default/xui/pt/floater_object_weights.xml
index 45bd1c7127..45bd1c7127 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/pt/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_openobject.xml b/indra/newview/skins/default/xui/pt/floater_openobject.xml
index 0dc2852bac..0dc2852bac 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/pt/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
index 60d4d3dc5c..60d4d3dc5c 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
index 35afde7612..35afde7612 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..05784115e7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personagens do pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Procurando por personagens do pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erro detectado ao procurar por personagens do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nenhum personagem do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personagens selecionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Carregando]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Desconhecido]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[grupo]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome" name="name"/>
+			<scroll_list.columns label="Descrição" name="description"/>
+			<scroll_list.columns label="Proprietário" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitude" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personagens:
+		</text>
+		<button label="Atualizar lista" name="refresh_objects_list"/>
+		<button label="Selecionar tudo" name="select_all_objects"/>
+		<button label="Selecionar nenhum" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Ações nos personagens selecionados:
+		</text>
+		<check_box label="Exibir baliza" name="show_beacon"/>
+		<check_box label="Exibir cápsula da física" name="show_physics_capsule"/>
+		<button label="Pegar" name="take_objects"/>
+		<button label="Pegar uma cópia" name="take_copy_objects"/>
+		<button label="Teletransportar-me até ele" name="teleport_me_to_object" tool_tip="Habilitado apenas quando um personagem é selecionado."/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Excluir" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..182f2513e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Visualização/teste do pathfinding">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Impossível encontrar a implementação de biblioteca de pathing.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Aguardando a conclusão do carregamento da região.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Verificando o status do navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Baixando o navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		O navmesh foi alterado no servidor. Baixando o navmesh mais recente.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		O navmesh mais recente foi baixado.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Impossível baixar o navmesh com êxito.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		O navmesh tem alterações pendentes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		O navmesh está compilando.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Algumas regiões navmesh têm alterações pendentes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Algumas regiões navmesh estão compilando.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Algumas regiões navmesh têm alterações pendentes e outras estão compilando.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		O navmesh está atualizado.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Impossível encontrar a implementação de biblioteca de pathing.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Escolha os pontos inicial e final.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Escolha o ponto inicial.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Escolha o ponto final.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		O caminho é exibido em laranja.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Impossível encontrar um caminho entre os pontos escolhidos.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Ocorreu um erro durante a geração do caminho.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Visualizar" name="view_panel">
+			<text name="show_label">
+				Exibir:
+			</text>
+			<check_box label="Mundo" name="show_world"/>
+			<check_box label="Apenas móveis" name="show_world_movables_only"/>
+			<check_box label="Navmesh" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Exibir mapa de possibilidade de caminhar:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Não exibir" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Tipo de personagem A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Tipo de personagem B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Tipo de personagem C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Tipo de personagem D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Caminháveis" name="show_walkables"/>
+			<check_box label="Volumes materiais" name="show_material_volumes"/>
+			<check_box label="Obstáculos estáticos" name="show_static_obstacles"/>
+			<check_box label="Volumes de exclusão" name="show_exclusion_volumes"/>
+			<check_box label="Plano aquático" name="show_water_plane"/>
+			<check_box label="Com visão de raio X" name="show_xray"/>
+		</panel>
+		<panel label="Testar caminho" name="test_panel">
+			<text name="ctrl_click_label">
+				Aperte a tecla Ctrl e clique com o mouse para selecionar o ponto inicial.
+			</text>
+			<text name="shift_click_label">
+				Aperte a tecla Shift e clique com o mouse para selecionar o ponto final.
+			</text>
+			<text name="character_width_label">
+				Largura do personagem
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Tipo de personagem
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Nenhum" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Limpar caminho" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..e0c60679dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Linksets do pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Procurando por linksets do pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erro detectado ao procurar por linksets do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modificando os linksets do pathfinding selecionados...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Erro detectado ao modificar os linksets do pathfinding selecionados.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nenhum linkset do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] linksets selecionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terreno]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Carregando]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Desconhecido]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[grupo]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Sim
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		Não
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Desconhecido
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Caminhável
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Obstáculo estático
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Obstáculo móvel
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volume material
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volume de exclusão
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Fantasma móvel
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[inalterável]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restrito]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[côncavo]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restrito,côncavo]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Escolher uso do linkset...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtrar por uso do linkset..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Caminhável" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Obstáculo estático" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Obstáculo móvel" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volume material" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volume de exclusão" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Fantasma móvel" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Aplicar" name="apply_filters"/>
+		<button label="Limpar" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome (prim raiz)" name="name"/>
+			<scroll_list.columns label="Descrição (prim raiz)" name="description"/>
+			<scroll_list.columns label="Proprietário" name="owner"/>
+			<scroll_list.columns label="Com script" name="scripted"/>
+			<scroll_list.columns label="Impacto" name="land_impact"/>
+			<scroll_list.columns label="Distância" name="dist_from_you"/>
+			<scroll_list.columns label="Uso do linkset" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Linksets:
+		</text>
+		<button label="Atualizar lista" name="refresh_objects_list"/>
+		<button label="Selecionar tudo" name="select_all_objects"/>
+		<button label="Selecionar nenhum" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Exibir baliza" name="show_beacon"/>
+		<button label="Pegar" name="take_objects"/>
+		<button label="Pegar uma cópia" name="take_copy_objects"/>
+		<button label="Teletransportar-me até ele" name="teleport_me_to_object"/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Excluir" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Possibilidade de caminhar:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Possibilidade de caminhar para os personagens do tipo A. Por exemplo: o tipo do personagem é humano."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Possibilidade de caminhar para os personagens do tipo B. Por exemplo: o tipo do personagem é criatura."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Possibilidade de caminhar para os personagens do tipo C. Por exemplo: o tipo do personagem é robô."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Possibilidade de caminhar para os personagens do tipo D. Por exemplo: o tipo do personagem é outro."/>
+		<button label="Aplicar alterações" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humano)
+		</text>
+		<text name="suggested_use_b_label">
+			(Criatura)
+		</text>
+		<text name="suggested_use_c_label">
+			(Robô)
+		</text>
+		<text name="suggested_use_d_label">
+			(Outro)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
index 8094ad376c..8094ad376c 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index a5579f03bf..a5579f03bf 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_people.xml b/indra/newview/skins/default/xui/pt/floater_people.xml
index 10a516ee36..10a516ee36 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_people.xml
+++ b/indra/newview/skins/default/xui/pt/floater_people.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
index 33a0d6a456..33a0d6a456 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/pt/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_picks.xml b/indra/newview/skins/default/xui/pt/floater_picks.xml
index 9766196319..9766196319 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_picks.xml
+++ b/indra/newview/skins/default/xui/pt/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_places.xml b/indra/newview/skins/default/xui/pt/floater_places.xml
index 12c6548205..12c6548205 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_places.xml
+++ b/indra/newview/skins/default/xui/pt/floater_places.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_post_process.xml b/indra/newview/skins/default/xui/pt/floater_post_process.xml
index d4f2e96539..d4f2e96539 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/pt/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
deleted file mode 100644
index 9740fbcb4d..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ENVIAR FOTO VIA EMAIL">
-	<text name="to_label" width="135">
-		Para (email):
-	</text>
-	<line_editor left="143" name="to_form" width="127"/>
-	<text name="from_label">
-		De (email):
-	</text>
-	<line_editor left="143" name="from_form" width="127"/>
-	<text name="name_label">
-		Seu nome:
-	</text>
-	<line_editor left="143" name="name_form" width="127"/>
-	<text name="subject_label">
-		Assunto:
-	</text>
-	<line_editor left="143" name="subject_form" width="127"/>
-	<line_editor label="Digite o assunto aqui" name="subject_form"/>
-	<text name="msg_label">
-		Mensagem:
-	</text>
-	<text_editor name="msg_form">
-		Digite sua mensagem aqui.
-	</text_editor>
-	<text name="fine_print">
-		Se seu indicado entrar no [SECOND_LIFE], você receberá um bônus pela indicação.
-	</text>
-	<button label="Cancelar" name="cancel_btn"/>
-	<button label="Enviar" name="send_btn"/>
-	<string name="default_subject">
-		Postal do [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Dá uma olhada nisto!
-	</string>
-	<string name="upload_message">
-		Enviando...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
index c89a61d9b1..c89a61d9b1 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
index 3aaee2d4a7..3aaee2d4a7 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index 19474d8099..19474d8099 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 089694608b..089694608b 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index d094c1b63a..d094c1b63a 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index 7c5a1538f2..7c5a1538f2 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
index 6f39635240..6f39635240 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
index b078962feb..b078962feb 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
index de3417ea14..de3417ea14 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/pt/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml
index d3b5df2d74..d3b5df2d74 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml
index cc5e0d59d4..cc5e0d59d4 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/pt/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index 08413a9231..08413a9231 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
index 6d1d981ca7..6d1d981ca7 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_script_limits.xml b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
index 64a8a49c85..64a8a49c85 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
index 5be866d052..5be866d052 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
index 5fb6dd1c35..5fb6dd1c35 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
index 8878590a4e..8878590a4e 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml
index 3509cb786d..3509cb786d 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_search.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_select_key.xml b/indra/newview/skins/default/xui/pt/floater_select_key.xml
index 7264a5a713..7264a5a713 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/pt/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
index 014ae0845e..014ae0845e 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index 83f7b24572..83f7b24572 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 4110e69068..4110e69068 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
index 948d727540..948d727540 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
index e62260c2e3..e62260c2e3 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml
new file mode 100755
index 0000000000..02bb154d26
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Configurações do verificador ortográfico">
+	<check_box label="Habilitar verificador ortográfico" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Dicionário principal:
+	</text>
+	<text label="Logs:" name="spellcheck_additional">
+		Dicionários adicionais:
+	</text>
+	<text name="spellcheck_available">
+		Disponível
+	</text>
+	<text name="spellcheck_active">
+		Ativo
+	</text>
+	<button label="Remover" name="spellcheck_remove_btn"/>
+	<button label="Importar..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..f4e95bddec
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Importar dicionário">
+	<button label="Procurar" label_selected="Procurar" name="dictionary_path_browse"/>
+	<button label="Importar" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
index f0a053ebe3..be53624145 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris desenhados por segundo" name="ktrissec"/>
 					<stat_bar label="Total Objects" name="objs"/>
 					<stat_bar label="New Objects" name="newobjs"/>
+					<stat_bar label="Taxa de acertos do cache do objeto" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Taxa de acertos do cache" name="texture_cache_hits"/>
+					<stat_bar label="Latência de leitura do cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Count" name="numimagesstat"/>
 					<stat_bar label="Raw Count" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>
@@ -44,6 +47,12 @@
 					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>
 					<stat_bar label="Memory Allocated" name="physicsmemoryallocated"/>
 				</stat_view>
+				<stat_bar label="Scripts executados" name="simpctscriptsrun"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="Tempo de etapa de AI" name="simsimaistepmsec"/>
+					<stat_bar label="Etapas de silhueta ignoradas" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personagens atualizados" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_view label="Time (ms)" name="simperf">
 					<stat_bar label="Total Frame Time" name="simframemsec"/>
 					<stat_bar label="Net Time" name="simnetmsec"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_sys_well.xml b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
index 38beec022c..38beec022c 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml
index 6b35d3f919..6b35d3f919 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml
index b479d5f6d6..b479d5f6d6 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/pt/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml
index dd282bf1fc..dd282bf1fc 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/pt/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 144bc0340e..ba4ef0afde 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="DESTAQUE: TEXTURA">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Clique para escolher uma imagem
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Pegar:
+	</floater.string>
 	<text name="Multiple">
 		Multiplas texturas
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventário" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Tamanho: [DIMENSÕES]
 	</text>
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
-	<button label="Nenhum" label_selected="Nenhum" name="None"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
-	<check_box label="Exibir pastas" name="show_folders_check"/>
-	<search_editor label="Filtrar texturas" name="inventory search editor"/>
-	<check_box label="Applicar agora" name="apply_immediate_check"/>
-	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Nenhum" label_selected="Nenhum" name="None"/>
+	<check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Visualização desativada"/>
+	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
+	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
+	<button label="Adicionar" label_selected="Adicionar" name="l_add_btn"/>
+	<button label="Remover" label_selected="Remover" name="l_rem_btn"/>
+	<button label="Enviar" label_selected="Enviar" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nome" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Pegar:
-	</string>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..0e897aea09
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Depurador de obtenção de textura">
+	<text name="total_num_fetched_label">
+		1, Número total de texturas obtidas: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Número total de solicitações de obtenção: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Número total de acertos de cache: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Número total de texturas visíveis: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Número total de solicitações de obtenção de texturas visíveis: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Número total de dados obtidos: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Número total de dados visíveis: [SIZE1]KB, Dados decodificados: [SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Número total de dados renderizados: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tempo total de leituras de cache: [TIME] segundos
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tempo total de gravações em cache: [TIME] segundos
+	</text>
+	<text name="total_time_decode_label">
+		11, Tempo total das decodificações: [TIME] segundos
+	</text>
+	<text name="total_time_gl_label">
+		12, Tempo total de criação de texturas gl: [TIME] segundos
+	</text>
+	<text name="total_time_http_label">
+		13, Tempo total de obtenção de HTTP: [TIME] segundos
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tempo total de obtenção completa: [TIME] segundos
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Obtendo novamente visíveis do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, Obtendo novamente todas as texturas do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, Obtendo novamente visíveis do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, Obtendo novamente todas as texturas do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<spinner label="19, Proporção de texel/pixel:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, Origem da textura:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Cache + HTTP" name="0"/>
+		<radio_item label="Apenas HTTP" name="1"/>
+	</radio_group>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Redefinir" name="clear_btn"/>
+	<button label="Fechar" name="close_btn"/>
+	<button label="Leitura do cache" name="cacheread_btn"/>
+	<button label="Gravação em cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodificar" name="decode_btn"/>
+	<button label="Textura GL" name="gl_btn"/>
+	<button label="Obter novamente cache visível" name="refetchviscache_btn"/>
+	<button label="Obter todo o cache novamente" name="refetchallcache_btn"/>
+	<button label="Obter novamente HTTP visível" name="refetchvishttp_btn"/>
+	<button label="Obter todo o HTTP novamente" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 4b31833602..66c14cdecf 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				Você não pode modificar estes objetos
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Não é possível modificar este objeto através de uma demarcação da região
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Não é possível modificar estes objetos através de uma demarcação da região
+			</panel.string>
 			<panel.string name="text modify warning">
 				Selecione o objeto inteiro para configurar as autorizações
 			</panel.string>
@@ -197,12 +203,12 @@
 				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="À venda" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Cópia" name="Copy"/>
 				<combo_box.item label="Conteúdo" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Preço: L$" name="Edit Cost"/>
 			<check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -238,6 +244,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Atributos do pathfinding:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objeto" name="Object">
 			<check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
@@ -452,16 +463,11 @@
 				<combo_box.item label="Sulcos" name="suction"/>
 				<combo_box.item label="Weave" name="weave"/>
 			</combo_box>
-			<check_box initial_value="falso" label="Alinhar planares" name="checkbox planar align" tool_tip="Alinhar texturas dos planos selecionados com o plano selecionado por último. Requer mapeamento planar da textura."/>
-			<text name="rpt">
-				Repetições / Plano
-			</text>
 			<spinner label="Horizontal (U)" name="TexScaleU"/>
 			<check_box label="Inverter" name="checkbox flip s"/>
 			<spinner label="Vertical (V)" name="TexScaleV"/>
 			<check_box label="Inverter" name="checkbox flip t"/>
 			<spinner label="Rotação˚" name="TexRot"/>
-			<spinner label="Repetições/Metro" name="rptctrl"/>
 			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
 			<text name="tex offset">
 				Offset de textura
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index c3d5820616..ef682714c6 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Tempo
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Hora Mono
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Principais Colidentes
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nome" name="name"/>
 		<scroll_list.columns label="Proprietário" name="owner"/>
 		<scroll_list.columns label="Local" name="location"/>
+		<scroll_list.columns label="Lote" name="parcel"/>
 		<scroll_list.columns label="Tempo" name="time"/>
-		<scroll_list.columns label="Hora Mono" name="mono_time"/>
 		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="Memória (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID do Objeto:
@@ -51,6 +49,10 @@
 	</text>
 	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Lote:
+	</text>
+	<button label="Filtrar" name="filter_parcel_btn"/>
 	<button label="Atualizar" name="refresh_btn"/>
 	<button label="Retornar Selecionado" name="return_selected_btn" width="170"/>
 	<button label="Retornar Tudo" left="190" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index c4954cb61f..c4954cb61f 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_toybox.xml b/indra/newview/skins/default/xui/pt/floater_toybox.xml
index 3677c3b1f5..3677c3b1f5 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/pt/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml
index 1955599a81..1955599a81 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
index 48af8de363..48af8de363 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..de7aa2df12
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ">
+	<slider label="Bate-papo de voz" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
index 745a7d0e00..745a7d0e00 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index b29ca3d699..71d3c33ae5 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ">
+<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
 	<string name="no_voice_effect">
 		(Não distorcer voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
new file mode 100644
index 0000000000..dae47a99ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="VOLUME DE VOZ">
+	<slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_web_content.xml b/indra/newview/skins/default/xui/pt/floater_web_content.xml
index 5101579c6f..5101579c6f 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/pt/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
index 865d939d24..865d939d24 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
index 6a8ccbd002..7deb799bd7 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Definir tamanho da janela:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="largura x altura">
-		<combo_box.item label="1000 x 700 (padrão)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (padrão)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Definir" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 490a975e80..490a975e80 100644..100755
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/pt/inspect_avatar.xml b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
index 19244d9b27..19244d9b27 100644..100755
--- a/indra/newview/skins/default/xui/pt/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/pt/inspect_group.xml b/indra/newview/skins/default/xui/pt/inspect_group.xml
index 889d35f269..889d35f269 100644..100755
--- a/indra/newview/skins/default/xui/pt/inspect_group.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/pt/inspect_object.xml b/indra/newview/skins/default/xui/pt/inspect_object.xml
index b72de7038d..b72de7038d 100644..100755
--- a/indra/newview/skins/default/xui/pt/inspect_object.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml
index 789194bf2e..789194bf2e 100644..100755
--- a/indra/newview/skins/default/xui/pt/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/pt/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/pt/language_settings.xml b/indra/newview/skins/default/xui/pt/language_settings.xml
index 8799475ace..8799475ace 100644..100755
--- a/indra/newview/skins/default/xui/pt/language_settings.xml
+++ b/indra/newview/skins/default/xui/pt/language_settings.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml
index 4b81276ab3..4b81276ab3 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
index cfd69158bc..61953f9f78 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Ejetar" name="Eject..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
index 5b32784c32..2d4cd670e6 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Largar" name="Drop"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml
index beba969b7e..beba969b7e 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
index a4a26144c7..1af8d64438 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Congelar" name="Freeze..."/>
 	<menu_item_call label="Ejetar" name="Eject..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
index e84dcb093d..447b77657b 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Meus grupos" name="Groups..."/>
 	<menu_item_call label="Meu perfil" name="Profile..."/>
 	<menu_item_call label="Depurar texturas" name="Debug..."/>
+	<menu_item_call label="Descartar XML" name="Dump XML"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
deleted file mode 100644
index 4598b8ab25..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Botão Falar" name="EnableVoiceChat"/>
-	<menu_item_check label="Botão de gestos" name="ShowGestureButton"/>
-	<menu_item_check label="Botão de movimento" name="ShowMoveButton"/>
-	<menu_item_check label="Botão de ver" name="ShowCameraButton"/>
-	<menu_item_check label="Botão de fotos" name="ShowSnapshotButton"/>
-	<menu_item_check label="Botão Construir" name="ShowBuildButton"/>
-	<menu_item_check label="Botão Buscar" name="ShowSearchButton"/>
-	<menu_item_check label="Botão Mapa" name="ShowWorldMapButton"/>
-	<menu_item_check label="Botão do Mini mapa" name="ShowMiniMapButton"/>
-	<menu_item_call label="Cortar" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copiar" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Colar" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Excluir" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Selecionar tudo" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml
index 527e3af3c9..527e3af3c9 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml
index 704fd226eb..704fd226eb 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml
index 051323ae6a..051323ae6a 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
index 8716992a5e..b59895573e 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Gear COF">
+<toggleable_menu name="Gear COF">
 	<menu label="Roupas novas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/>
-</menu>
+	<menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
new file mode 100644
index 0000000000..2dd150a61e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
+	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
+	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
+	<menu_item_call label="Fechar selecionados" name="close_selected_conversations"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Remover amigos" name="remove_friends"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear voz" name="block_unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+	<menu_item_call label="Perfil do grupo" name="group_profile"/>
+	<menu_item_call label="Ativar grupo" name="activate_group"/>
+	<menu_item_call label="Sair do grupo" name="leave_group"/>
+	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
+		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
+		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
+		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..616e6db46e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="MI..." name="IM"/>
+	<menu_item_call label="Chamada de voz..." name="Call"/>
+	<menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/>
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Oferecer teletransporte" name="teleport"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="Invite"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..cab81175a0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por data" name="sort_by_date"/>
+	<menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/>
+	<menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_edit.xml b/indra/newview/skins/default/xui/pt/menu_edit.xml
index ff431c9a21..ff431c9a21 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_edit.xml
+++ b/indra/newview/skins/default/xui/pt/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_favorites.xml b/indra/newview/skins/default/xui/pt/menu_favorites.xml
index 062820fbca..062820fbca 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/pt/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml
index 70d8ae7a8e..70d8ae7a8e 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_group_plus.xml b/indra/newview/skins/default/xui/pt/menu_group_plus.xml
index 1083845d68..1083845d68 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/pt/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml
index 5f6bd096a8..5f6bd096a8 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/pt/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
new file mode 100644
index 0000000000..a8434dc336
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Exibir perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo" name="Add Friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
+	<menu_item_check label="Bloquear texto" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..398b890f66
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Exibição compacta" name="compact_view"/>
+	<menu_item_check label="Exibição expandida" name="expanded_view"/>
+	<menu_item_check label="Mostrar hora" name="IMShowTime"/>
+	<menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml b/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
deleted file mode 100644
index 2d37cefd6f..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Fechar tudo" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml
index ead949ba13..ead949ba13 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml
index dd177d1b8d..dd177d1b8d 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml
index d821b3ded0..d821b3ded0 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/pt/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
index 2b5aa7508b..2b5aa7508b 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml
index 7e271904e9..7e271904e9 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
index e8fafa58a9..e8fafa58a9 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml
index c404719c95..c404719c95 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 09e1fbf72e..a3a648eb34 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/>
 	<menu_item_call label="Pasta conversa em conferência" name="Conference Chat Folder"/>
 	<menu_item_call label="Executar som" name="Sound Play"/>
+	<menu_item_call label="Copiar SLurl" name="url_copy"/>
 	<menu_item_call label="Sobre o marco" name="About Landmark"/>
 	<menu_item_call label="Executar animação" name="Animation Play"/>
 	<menu_item_call label="Executar áudio" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
index 7a7ebc50af..7a7ebc50af 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
index 6faea517fe..6faea517fe 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_land.xml b/indra/newview/skins/default/xui/pt/menu_land.xml
index 9182ce321a..2ebe85df6e 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_land.xml
+++ b/indra/newview/skins/default/xui/pt/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Comprar passe" name="Land Buy Pass"/>
 	<menu_item_call label="Construir" name="Create"/>
 	<menu_item_call label="Editar a topografia" name="Edit Terrain"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_landmark.xml b/indra/newview/skins/default/xui/pt/menu_landmark.xml
index 6accfebee7..6accfebee7 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/pt/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index be94ad49db..cd840f3137 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -17,7 +17,13 @@
 		<menu_item_call label="Mostrar TOS" name="TOS"/>
 		<menu_item_call label="Mostrar mensagem crítica" name="Critical"/>
 		<menu_item_call label="Test de Bugs de Conteúdo Web" name="Web Content Floater Debug Test"/>
-		<menu label="Configurar nível de registro em log" name="Set Logging Level"/>
+		<menu label="Configurar nível de registro em log" name="Set Logging Level">
+			<menu_item_check label="Depurar" name="Debug"/>
+			<menu_item_check label="Info" name="Info"/>
+			<menu_item_check label="Aviso" name="Warning"/>
+			<menu_item_check label="Erro" name="Error"/>
+			<menu_item_check label="Nenhum" name="None"/>
+		</menu>
 		<menu_item_check label="Exibir seletor da grade" name="Show Grid Picker"/>
 		<menu_item_call label="Exibir painel de notificações" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
index ac84b02870..ac84b02870 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_mini_map.xml b/indra/newview/skins/default/xui/pt/menu_mini_map.xml
index 6a3fe55de5..6a3fe55de5 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/pt/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_mode_change.xml b/indra/newview/skins/default/xui/pt/menu_mode_change.xml
deleted file mode 100644
index 314d3e409b..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Básico" name="BasicMode"/>
-	<menu_item_check label="Avançado" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
index 079f876add..079f876add 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/pt/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_mute_particle.xml b/indra/newview/skins/default/xui/pt/menu_mute_particle.xml
new file mode 100644
index 0000000000..be13c66d7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_navbar.xml b/indra/newview/skins/default/xui/pt/menu_navbar.xml
index 57c1471de3..57c1471de3 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/pt/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml
index f1ea83c837..f1ea83c837 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pt/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
index 43ad4134ec..43ad4134ec 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/pt/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index f4919e0c1f..a552a5de5a 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -10,6 +10,8 @@
 	<menu_item_call label="Ficar de pé" name="Object Stand Up"/>
 	<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
+	<menu_item_call label="Exibir em linksets" name="show_in_linksets"/>
+	<menu_item_call label="Exibir em personagens" name="show_in_characters"/>
 	<context_menu label="Colocar no(a)" name="Put On">
 		<menu_item_call label="Vestir" name="Wear"/>
 		<menu_item_call label="Adicionar" name="Add"/>
@@ -26,4 +28,5 @@
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Comprar" name="Buy..."/>
 	<menu_item_call label="Excluir" name="Delete"/>
+	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index 7af760a6ee..df224a88fa 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
 	<menu_item_call label="Bloquear..." name="Block"/>
+	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
+	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 894f1d741c..3602bdaac4 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Novo cabelo" name="New Hair"/>
 		<menu_item_call label="Novos olhos" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Expandir todas as pastas" name="expand"/>
+	<menu_item_call label="Recolher todas as pastas" name="collapse"/>
 	<menu_item_call label="Renomear look" name="rename"/>
 	<menu_item_call label="Excluir visual" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml
index 8db5e405b3..8db5e405b3 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_list.xml b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
index 01f1d4ef80..01f1d4ef80 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/pt/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
new file mode 100644
index 0000000000..b61108cf54
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/>
+	<menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/>
+	<menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/>
+	<menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/>
+	<menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/>
+	<menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/>
+	<menu_item_check label="Registro de conversas..." name="Conversation"/>
+	<menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/>
+	<menu_item_check label="Configurações de tradução..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..8bbde9b38c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Desbloquear" name="unblock"/>
+	<menu_item_call label="Perfil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..e69935995c
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/>
+	<menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..b80d683c7b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
new file mode 100644
index 0000000000..46caeae310
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por status" name="sort_status"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
+	<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
index e7c325010f..e7c325010f 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
index 9a924ad7b9..2ba7af17cd 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver dados" name="View Info"/>
 	<menu_item_call label="Bate-papo" name="Chat"/>
-	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Chamada de voz" name="Call"/>
 	<menu_item_call label="Ativar" name="Activate"/>
 	<menu_item_call label="Sair" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
new file mode 100644
index 0000000000..637e591ae1
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
index 86a9d2263f..86a9d2263f 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 7c720f262b..51464fed68 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Exibir perfil" name="view_profile"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Chamada de voz" name="voice_call"/>
+	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
+	<menu_item_call label="Adicionar amigo" name="add_friend"/>
+	<menu_item_call label="Remover amigo" name="remove_friend"/>
+	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
+	<menu_item_call label="Mais zoom" name="zoom_in"/>
+	<menu_item_call label="Mapa" name="map"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 79edb96b1c..7f3c6ace27 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
-	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
-	<menu_item_call label="MI" name="IM"/>
-	<menu_item_call label="Ligar" name="Call"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_call label="Teletransportar?" name="teleport"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friends"/>
+	<menu_item_call label="Remover amigo..." name="remove_friends"/>
+	<menu_item_call label="MI" name="im"/>
+	<menu_item_call label="Ligar" name="call"/>
+	<menu_item_call label="Compartilhar" name="share"/>
+	<menu_item_call label="Pagar" name="pay"/>
+	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..bce015e732
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+	<menu_item_check label="Exibir mapa" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
index 0d32d58de4..0d32d58de4 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
new file mode 100644
index 0000000000..e4b368fe14
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
+	<menu_item_check label="Ordenar por nome" name="sort_name"/>
+	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
index f3b89e01cd..f3b89e01cd 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_picks.xml b/indra/newview/skins/default/xui/pt/menu_picks.xml
index 8b9e10fc02..8b9e10fc02 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_picks.xml
+++ b/indra/newview/skins/default/xui/pt/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml
index 95a7c05262..95a7c05262 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/pt/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_place.xml b/indra/newview/skins/default/xui/pt/menu_place.xml
index 282ea20a7a..282ea20a7a 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_place.xml
+++ b/indra/newview/skins/default/xui/pt/menu_place.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
index d099d04f8d..d099d04f8d 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/pt/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml
index 7cba70a110..7cba70a110 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/pt/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
index fec0911fcf..fec0911fcf 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/pt/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
index d41ecbd755..d41ecbd755 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/pt/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml
index 61c6b9202f..61c6b9202f 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/pt/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml
index ccf3878e14..ccf3878e14 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/pt/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml
index 6d4c84fc3c..6d4c84fc3c 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/pt/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml
index f034509be8..f034509be8 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
index ec1e7a0950..ec1e7a0950 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml
index 6a633cf74c..6a633cf74c 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml
index 31c284c6ed..a26b50e1c2 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/pt/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(desconhecido)" name="Suggestion 1"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 2"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 3"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 4"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 5"/>
+	<menu_item_call label="Adicionar ao dicionário" name="Add to Dictionary"/>
+	<menu_item_call label="Adicionar para ignorar" name="Add to Ignore"/>
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Colar" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_toolbars.xml b/indra/newview/skins/default/xui/pt/menu_toolbars.xml
index b58a1a6e4f..b58a1a6e4f 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/pt/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml
index d9347950b1..d9347950b1 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/pt/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index ba5e055124..102df18b28 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar perfil de residente" name="show_agent"/>
+	<menu_item_call label="Exibir perfil" name="show_agent"/>
+	<menu_item_call label="Enviar MI..." name="send_im"/>
+	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
+	<menu_item_call label="Remover amigo..." name="remove_friend"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_group.xml b/indra/newview/skins/default/xui/pt/menu_url_group.xml
index 5b67a69c9a..5b67a69c9a 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_http.xml b/indra/newview/skins/default/xui/pt/menu_url_http.xml
index e53a2572b8..e53a2572b8 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml
index 45c14355d0..45c14355d0 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_map.xml b/indra/newview/skins/default/xui/pt/menu_url_map.xml
index ba114cccaa..ba114cccaa 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index c197444181..2cd0f52ef3 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/>
+	<menu_item_call label="Perfil do objeto..." name="show_object"/>
+	<menu_item_call label="Bloquear..." name="block_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml
index 6cc668bfd3..6cc668bfd3 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml
index d0784149ac..d0784149ac 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml
index 7216ccf0b3..7216ccf0b3 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml
index f007425646..f007425646 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index d7d5d59a33..e6eceb5f2f 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Status" name="Status">
-			<menu_item_call label="Ausente" name="Set Away"/>
-			<menu_item_call label="Ocupado" name="Set Busy"/>
+			<menu_item_check label="Ausente" name="Away"/>
+			<menu_item_check label="Não perturbe" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Caixa de saída do lojista..." name="MerchantOutbox"/>
@@ -28,17 +28,25 @@
 		<menu_item_call label="Preferências..." name="Preferences"/>
 		<menu_item_call label="Botões da barra de ferramentas..." name="Toolbars"/>
 		<menu_item_call label="Ocultar todos os controles" name="Hide UI"/>
+		<menu_item_check label="Exibir anexos de HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
-		<menu_item_check label="Bate-papo..." name="Nearby Chat"/>
+		<menu_item_check label="Conversas..." name="Conversations"/>
+		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
-		<menu_item_check label="Configurações de voz..." name="Nearby Voice"/>
-		<menu_item_check label="Distorção de voz..." name="ShowVoice"/>
+		<menu_item_check label="Registro de conversas..." name="Conversation Log..."/>
+		<menu label="Distorção de voz" name="VoiceMorphing">
+			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
+			<menu_item_check label="Visualizar..." name="Preview"/>
+			<menu_item_call label="Assinar..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_call label="Amigos" name="My Friends"/>
-		<menu_item_call label="Grupos" name="My Groups"/>
-		<menu_item_call label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_check label="Amigos" name="My Friends"/>
+		<menu_item_check label="Grupos" name="My Groups"/>
+		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_call label="Lista de bloqueados" name="Block List"/>
+		<menu_item_check label="Não perturbe" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Mundo" name="World">
 		<menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/>
@@ -107,23 +115,29 @@
 			<menu_item_call label="Incluir próxima parte" name="Include Next Part"/>
 			<menu_item_call label="Incluir parte anterior" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Linksets..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Enfocar seleção" name="Focus on Selection"/>
 		<menu_item_call label="Ampliar seleção" name="Zoom to Selection"/>
 		<menu label="Objeto:" name="Object">
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Pegar" name="Menu Object Take"/>
 			<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
-			<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
 		<menu label="Scripts" name="Scripts">
-			<menu_item_call label="Recompilar scripts (LSL)" name="Mono"/>
+			<menu_item_call label="Recompilar scripts (Mono)" name="Mono"/>
 			<menu_item_call label="Recompilar scripts (LSL)" name="LSL"/>
 			<menu_item_call label="Resetar scripts" name="Reset Scripts"/>
 			<menu_item_call label="Scripts em modo execução" name="Set Scripts to Running"/>
 			<menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="Opções" name="Options">
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
 			<menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/>
@@ -152,6 +166,13 @@
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Como..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
+		<menu_item_call label="Guia do usuário" name="User’s guide"/>
+		<menu_item_call label="Base de conhecimento" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Fóruns da comunidade" name="Community Forums"/>
+		<menu_item_call label="Portal de suporte" name="Support portal"/>
+		<menu_item_call label="Notícias do [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
@@ -163,7 +184,7 @@
 		<menu_item_check label="Limitar distância da seleção" name="Limit Select Distance"/>
 		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
 		<menu_item_check label="Foto de alta resolução" name="HighResSnapshot"/>
-		<menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/>
+		<menu_item_check label="Fotos sem barulho para HD" name="QuietSnapshotsToDisk"/>
 		<menu label="Ferramentas de desempenho" name="Performance Tools">
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>
@@ -174,7 +195,6 @@
 			<menu_item_check label="Esconder partículas" name="Hide Particles"/>
 			<menu_item_check label="Ocultar seleções" name="Hide Selected"/>
 			<menu_item_check label="Realçar transparentes" name="Highlight Transparent"/>
-			<menu_item_check label="Mostrar anexos HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Mostrar retículo na vista subjetiva" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Tipos de renderização" name="Rendering Types">
@@ -226,11 +246,10 @@
 			<menu_item_check label="Painel de textura" name="Texture Console"/>
 			<menu_item_check label="Console de depuração" name="Debug Console"/>
 			<menu_item_call label="Painel de avisos" name="Notifications"/>
-			<menu_item_check label="Painel de tamanho de textura" name="Texture Size"/>
-			<menu_item_check label="Painel de texturas" name="Texture Category"/>
 			<menu_item_check label="Tempos" name="Fast Timers"/>
 			<menu_item_check label="Memória" name="Memory"/>
 			<menu_item_check label="Estatísticas da cena" name="Scene Statistics"/>
+			<menu_item_call label="Painel de depuração de obtenção de textura" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Câmera:" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
@@ -260,6 +279,7 @@
 			<menu_item_check label="Camera Offset" name="Camera Offset"/>
 			<menu_item_check label="Taxa de quadros aleatória" name="Randomize Framerate"/>
 			<menu_item_check label="Frame Test" name="Frame Test"/>
+			<menu_item_call label="Perfil do quadro" name="Frame Profile"/>
 		</menu>
 		<menu label="Render Metadata" name="Render Metadata">
 			<menu_item_check label="Normais" name="Normals"/>
@@ -271,18 +291,24 @@
 			<menu_item_check label="Renderizar complexidade" name="rendercomplexity"/>
 			<menu_item_check label="Bytes do anexo" name="attachment bytes"/>
 			<menu_item_check label="Esculpir" name="Sculpt"/>
+			<menu label="Densidade da textura" name="Texture Density">
+				<menu_item_check label="Nenhuma" name="None"/>
+				<menu_item_check label="Atual" name="Current"/>
+				<menu_item_check label="Desejada" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
+			<menu_item_call label="Informações sobre o material selecionado" name="Selected Material Info"/>
 			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Iluminação e sombras" name="Lighting and Shadows"/>
+			<menu_item_check label="Modelo avançado de luzes" name="Advanced Lighting Model"/>
 			<menu_item_check label="Sombras da projeção do sol/lua" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO e sombra suave" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Máscaras alpha automáticas (adiadas)" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="Máscaras alpha automáticas (sem adiar)" name="Automatic Alpha Masks (non-deferred)"/>
 			<menu_item_check label="Texturas de animação" name="Animation Textures"/>
 			<menu_item_check label="Desativar texturas" name="Disable Textures"/>
-			<menu_item_check label="Atlas texturizado (fase experimental)" name="Texture Atlas"/>
 			<menu_item_check label="Render Attached Lights" name="Render Attached Lights"/>
 			<menu_item_check label="Render Attached Particles" name="Render Attached Particles"/>
 			<menu_item_check label="Objetos iridescentes" name="Hover Glow Objects"/>
@@ -301,7 +327,6 @@
 			<menu_item_call label="Teste de mídia do navegador" name="Web Browser Test"/>
 			<menu_item_call label="Navegador de conteúdo web" name="Web Content Browser"/>
 			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
-			<menu_item_call label="Dados de memória" name="Memory Stats"/>
 			<menu_item_check label="Console de depuração de região" name="Region Debug Console"/>
 			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
 			<menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/>
@@ -325,9 +350,14 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Velocidade de animação" name="Animation Speed">
+				<menu_item_call label="Todas as animações 10% mais rápidas" name="All Animations 10 Faster"/>
+				<menu_item_call label="Todas as animações 10% mais lentas" name="All Animations 10 Slower"/>
+				<menu_item_call label="Redefinir todas as velocidades de animação" name="Reset All Animation Speed"/>
+				<menu_item_check label="Animações em câmera lenta" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Dados da animação" name="Animation Info"/>
-			<menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/>
 			<menu_item_check label="Disable Level Of Detail" name="Disable LOD"/>
 			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
 			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml
index 2487f6779f..2487f6779f 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
index 75dca703cb..75dca703cb 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
index 4e6e52ebc7..4e6e52ebc7 100644..100755
--- a/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/pt/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
index f9c0496eea..f9c0496eea 100644..100755
--- a/indra/newview/skins/default/xui/pt/mime_types.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types.xml
diff --git a/indra/newview/skins/default/xui/pt/mime_types_linux.xml b/indra/newview/skins/default/xui/pt/mime_types_linux.xml
index 789843cbba..789843cbba 100644..100755
--- a/indra/newview/skins/default/xui/pt/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/pt/mime_types_mac.xml b/indra/newview/skins/default/xui/pt/mime_types_mac.xml
index 34b40e94ab..34b40e94ab 100644..100755
--- a/indra/newview/skins/default/xui/pt/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 3b39c0f92c..d5096ec858 100644..100755
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -203,6 +209,14 @@ Qualquer membro numa função com esta habilidade, pode atribuir a sí mesmo --
 Adicionar esta habilidade a &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Você está prestes a expulsar [AVATAR_NAME] do grupo.
+		<usetemplate ignoretext="Confirmar expulsão de um participante do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Você está prestes a expulsar [COUNT] membros do grupo.
+		<usetemplate ignoretext="Confirmar expulsão de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Você está prestes a largar seu anexo. 
     Tem certeza de que quer prosseguir?
@@ -357,13 +371,19 @@ Digite o nome de usuário de seu avatar.
 
 É preciso ter uma conta para entrar no [SECOND_LIFE]. Deseja criar uma conta agora?
 		<url name="url">
-			https://join.secondlife.com/index.php?lang=pt-BR
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Tentar novamente" yestext="Abrir conta"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Digite o nome de usuário ou o nome e sobrenome do seu avatar no campo Nome de usuário, depois entre em sua conta novamente.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; não é um identificador de grade válido.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Seu ponto de partida não especificou uma grade válida.
+	</notification>
 	<notification name="DeleteClassified">
 		Apagar classificado&apos;[NAME]&apos;?
 Não há reembolso por taxas já pagas.
@@ -466,8 +486,8 @@ O objeto pode estar fora de alcance ou ter sido deletado.
 		Houve um problema em salvar uma compilação de script devido a seguinte razão: [REASON].  Por favor, tente salvar novamente o script mais tarde.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Oops, você ainda não definiu sua região de partida. 
-Digite o nome da região na caixa &apos;Ponto de partida&apos; ou selecione &apos;Última localização&apos; ou &apos;Meu início&apos; como ponto de partida.
+		Sua região de partida não está definida.
+Digite o nome da região na caixa &apos;Ponto de partida&apos; ou selecione &apos;Meu último local&apos; ou &apos;Minha casa&apos; como ponto de partida.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -489,6 +509,33 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://www.intel.com/p/pt_BR/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://www.nvidia.com.br/Download/index.aspx?lang=br
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -585,6 +632,9 @@ Você pode unir um máximo de [MAX] objetos.
 
 Por favor, certifique-se de que nenhum deles está travado e que você é dono de todos eles.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Os objetos não podem ser vinculados através de demarcações de região.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Impossibilitado de unir porque nem todos os objetos são do mesmo dono.
 
@@ -963,6 +1013,41 @@ Oferecer amizade para [NAME]?
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification label="Adicionar lista de substituição automática" name="AddAutoReplaceList">
+		Nome para a nova lista:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Renomear lista de substituição automática" name="RenameAutoReplaceList">
+		O nome &apos;[DUPNAME]&apos; já está em uso
+    Insira um novo nome exclusivo:
+		<form name="form">
+			<button name="ReplaceList" text="Substituir lista atual"/>
+			<button name="SetName" text="Usar novo nome"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		A palavra-chave deve ser uma palavra única e a substituição não pode estar vazia.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		A lista de substituição é inválida.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Você deve especificar um arquivo, um nome e um idioma.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		O dicionário [DIC_NAME] não aparenta ter um arquivo &quot;aff&quot;; isso significa que ele é um dicionário &quot;secundário&quot;.
+Ele pode ser usado como dicionário adicional mas não como dicionário Principal.
+
+Consulte https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Impossível copiar
+    [FROM_NAME]
+    para
+    [TO_NAME]
+	</notification>
 	<notification label="Salvar este look" name="SaveOutfitAs">
 		Veja o meu novo visual:
 		<form name="form">
@@ -1028,9 +1113,9 @@ em TODOS OS TERRENOS deste sim?
 Por favor, insira um valor maior.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Pelo menos um dos itens possui links que levam a ele.  Ao excluir o item, os links não funcionarão mais.   Por isso, recomendamos excluir os links primeiro.
+		Pelo menos um dos itens possui links que levam a ele.  Ao excluir o item, os links não funcionarão mais.  Por isso, recomendamos excluir os links primeiro.
 
-Tem certeza de que quer excluir estes items?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLock">
@@ -1046,9 +1131,9 @@ Tem certeza de que deseja apagar estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		Você não é proprietário de pelo menos um dos itens selecionados.
+		Ao menos um dos itens selecionados não é seu.
 
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
@@ -1058,22 +1143,26 @@ Tem certeza de que deseja apagar estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		Pelo menos um dos objetos está trancado ou não é de sua posse.
+		Ao menos um objeto está bloqueado.
+Ao menos um objeto não é seu.
 
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Pelo menos um dos objetos não é copiável ou não é de sua posse.
+		Ao menos um objeto não é copiável.
+Ao menos um objeto não é seu.
 
-Tem certeza de que deseja apagar estes itens?
+Tem certeza de que quer excluir estes itens?
 		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		Pelo menos um dos objetos está trancado, não é copiável ou você não o possui.
+		Ao menos um objeto está bloqueado.
+Ao menos um objeto não é copiável.
+Ao menos um objeto não é seu.
 
-Tem certeza de que deseja apagar estes itens?
-		<usetemplate name="okcancelbuttons" notext="Não" yestext="Sim"/>
+Tem certeza de que quer excluir estes itens?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sim"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Pelo menos um dos objetos está trancado.
@@ -1137,7 +1226,7 @@ para &apos;[THIS_GPU]&apos;
 Você chegou a uma região próxima.
 	</notification>
 	<notification name="AvatarMovedLast">
-		Esse destino não está disponível no momento. 
+		O destino solicitado não está disponível no momento.
 Você chegou a uma região próxima.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1153,11 +1242,10 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
 		</form>
 	</notification>
 	<notification name="FirstRun">
-		A instalação do [APP_NAME] está pronta. 
+		A instalação do [APP_NAME] está pronta.
 
-Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar. 
-Voltar para [http://join.secondlife.com secondlife.com] para criar sua conta?
-		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/>
+Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar.
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Criar conta"/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Estamos detectando um problema de conexão.  Pode haver um problema com a sua conexão à internet ou com o [SECOND_LIFE_GRID].
@@ -1392,13 +1480,43 @@ Versão [VERSION] [[RELEASE_NOTES_FULL_URL] sobre esta atualização]
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		O software requer uma atualização que já foi baixada.
-Versão [VERSION]
+Versão [VERSION] Informação [[INFO_URL] sobre essa atualização]
 
 Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+Informação [[INFO_URL] sobre essa atualização]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Baixamos uma atualização para a instalação do [APP_NAME].
+Versão [VERSION] 
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte [[INFO_URL] para obter mais detalhes sobre essa atualização]
+		<usetemplate name="okcancelbuttons" notext="Depois..." yestext="Instalar agora e reiniciar o [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Baixamos uma atualização para a instalação do [APP_NAME].
+Versão [VERSION]
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
+		<usetemplate name="okcancelbuttons" notext="Depois..." yestext="Instalar agora e reiniciar o [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		O software requer uma atualização que já foi baixada.
+Versão [VERSION]
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
+
+Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Para instalar a atualização, será preciso reiniciar o [APP_NAME].
+O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
+consulte a informação [[INFO_URL] sobre essa atualização]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1448,6 +1566,10 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Você é atualmente um membro do grupo
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sair"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Não foi possível deixar o grupo. Você não pode deixar o grupo pois é o último proprietário dele. Primeiramente, atribua outro membro à função de proprietário.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Tem CERTEZA de que deseja expulsar todos os residentes do grid?
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Chutar todos"/>
@@ -1475,10 +1597,13 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Modo ocupado ativado. 
-O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua resposta de modo ocupado.  Todas as ofertas de teletransporte serão recusadas.  Todas as ofertas de inventário serão colocadas na Lixeira.
-		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Não perturbe está ativado.  Você não será notificado de comunicações recebidas.
+
+- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências &gt; Geral).
+- As ofertas de teletransporte serão recusadas.
+- Chamadas de voz serão recusadas.
+		<usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
@@ -1673,83 +1798,128 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Você não é permitido na Região devido à sua Classificação de maturidade. Isto pode ser o resultado da falta de informação de validação de sua idade.
-
-Por favor, verifique se você está com o último Visualizador instalado e vá ao Banco de Conhecimento para detalhes em como acessar áreas com esta classificação de maturidade.
+		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Você não é permitido nesta região devido à sua Classificação de maturidade.
-
-Ir para o Banco de Conhecimento para maiores informações sobre Classificações de maturidade?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Não posso entrar nessa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/>
+		<usetemplate ignoretext="Passagem de região: A região que você está tentando visitar tem conteúdo acessível apenas para adultos." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Você não é permitido nesta região devido à sua Classificação de maturidade.
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Você não pode entrar nessa região devido à sua seleção de maturidade.
-
-Para entrar na região desejada, mude o nível de maturidade.  Você então poderá fazer buscas e acessar conteúdo [REGIONMATURITY]. Para desfazer qualquer mudança, vá para Eu &gt; Preferências &gt; Geral.
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências ou você pode cancelar. Após a alteração de suas preferências, você pode tentar acessar a região novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button default="true" name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Passagem de região: A região que você está tentando visitar tem conteúdo excluído por suas preferências."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos tendo dificuldades técnicas com seu teletransporte, pois suas preferências estão dessincronizadas com o servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Teletransportar: A região que você está tentando visitar tem conteúdo acessível apenas para adultos." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências e continuar o teletransporte, ou você pode cancelar este teletransporte.
+		<form name="form">
+			<button name="OK" text="Alterar e continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teletransportar (reinicializável): A região que você está tentando visitar tem conteúdo excluído por suas preferências."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências ou você pode cancelar o teletransporte. Após a alteração de suas preferências, você pode tentar se teletransportar novamente.
 		<form name="form">
-			<button name="OK" text="Mudar preferência"/>
-			<button default="true" name="Cancel" text="Fechar"/>
-			<ignore name="ignore" text="Minha preferência de maturidade impede que eu vá a uma região"/>
+			<button name="OK" text="Mudar preferências"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teletransportar (não reinicializável): A região que você está tentando visitar tem conteúdo excluído por suas preferências."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos tendo dificuldades técnicas com seu teletransporte, pois suas preferências estão dessincronizadas com o servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Sua opção de nível de maturidade é [RATING].
+		Você não receberá mais notificações de que está prestes a visitar uma região com conteúdo [RATING].  Posteriormente você poderá alterar suas preferências de conteúdo acessando Eu &gt; Preferências &gt; Geral da barra do menu.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Impossível alterar suas preferências para visualizar conteúdo [PREFERRED_MATURITY] no momento.  Suas preferências foram redefinidas para visualizar conteúdo [ACTUAL_MATURITY].  Você pode tentar alterar suas preferências novamente acessando Eu &gt; Preferências &gt; Geral na barra do menu.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Você não pode reclamar esta terra devido à sua Classificação de maturidade. Isto pode ser o resultado de falta de informação na validação de sua idade.
-
-Por favor, verifique se você tem o último Visualizador instalado e vá para o Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade.
+		O terreno que você está tentando reivindicar possui uma classificação de maturidade que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Você não pode reclamar esta terra devido à sua Classificação de maturidade.
-
-Ir para a o Banco de Conhecimento para maiores informações sobre Classificações de maturidade?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Apenas adultos podem reivindicar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Não reivindicar essa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/>
+		<usetemplate ignoretext="Apenas adultos podem reivindicar este terreno." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Você não pode reclamar esta terra devido à sua Classificação de maturidade.
+		O terreno que você está tentando reivindicar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		O terreno que você está tentando reivindicar tem conteúdo [REGIONMATURITY], que é acessível apenas para adultos.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Você não pode reivindicar essa região devido à sua preferência de maturidade
-
-Clique em &apos;Mudar preferência&apos; para aumentar o nível de maturidade e entrar nessa região.  De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] .  Para modificar esta configuração, vá à Eu &gt; Preferências &gt; Geral.
-		<usetemplate ignoretext="Minha preferência de conteúdo impede que eu reivindique terrenos" name="okcancelignore" notext="Fechar" yestext="Mudar Preferência"/>
+		O terreno que você está tentando reivindicar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências e, então, você poderá tentar reivindicar a região novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="O terreno que você está tentando reivindicar tem conteúdo excluído por suas preferências."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Você não pode comprar esta terra devido à sua Classificação de maturidade. Isto pode ser o resultado de falta de informação na validação de sua idade.
-
-Por favor, verifique se você tem o último Visualizador instalado e vá para o Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade.
+		O terreno que você está tentando comprar possui uma classificação de maturidade que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Você não pode comprar esta terra devido à sua Classificação de maturidade.
-
-Ir para o Banco de Conhecimento para maiores informações sobre Classificações de Maturidade?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Apenas adultos podem comprar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Não posso comprar essa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/>
+		<usetemplate ignoretext="Apenas adultos podem comprar este terreno." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Você não pode comprar esta terra devido à sua Classificação de maturidade.
+		O terreno que você está tentando comprar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], que é acessível apenas para adultos.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Você não pode comprar esse terreno devido à sua preferência de maturidade
-
-Clique em &apos;Mudar preferência&apos; para aumentar o nível de maturidade e entrar nessa região.  De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] .  Para modificar esta configuração, vá à Eu &gt; Preferências &gt; Geral.
-		<usetemplate ignoretext="Minha preferência de conteúdo não me deixa comprar terrenos" name="okcancelignore" notext="Fechar" yestext="Mudar Preferência"/>
+		O terreno que você está tentando comprar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências e, então, você poderá tentar comprar a região novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="O terreno que você está tentando comprar tem conteúdo excluído por suas preferências."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Muitos prims foram selecionados.   Selecione [MAX_PRIM_COUNT] ou menos prims, e tente de novo
@@ -1804,10 +1974,9 @@ Publicar este classificado agora por L$ [AMOUNT]?
 		</form>
 	</notification>
 	<notification label="Modificar a maturidade da Região" name="RegionMaturityChange">
-		O conteúdo desta região foi reclassificado. 
-Talvez leve algum tempo para a mudança ser refletida no mapa. 
-
-Para ir a regiões de conteúdo Adulto, é preciso ter uma conta verificada, seja comprovando a idade ou com dados de pagamento.
+		A classificação de maturidade desta região foi alterada.
+Talvez leve algum tempo para que esta mudança seja refletida no mapa.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Discordância de Versão de Voz" name="VoiceVersionMismatch">
 		Esta versão do [APP_NAME] não é compatível com o recurso &apos;Bate-papo de voz&apos; desta região.  Para o bate-papo de voz funcionar, atualize o [APP_NAME].
@@ -1920,6 +2089,10 @@ Mover para o inventário o(s) item(s)?
 		Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta?
 		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada.  Todos os participantes recebem notificações sobre a nova conversa.
+		<usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Tem certeza que deseja sair?
 		<usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/>
@@ -1994,14 +2167,14 @@ Você deseja substituí-lo pelo objeto selecionado?
 			<button ignore="Never Replace" name="No" text="Não"/>
 		</form>
 	</notification>
-	<notification label="Aviso de Modo Ocupado" name="BusyModePay">
-		Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento.
+	<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
+		Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
 
-Você gostaria de deixar o modo Ocupado antes de completar esta transação?
+Deseja desativar o Não perturbe antes de concluir esta transação?
 		<form name="form">
-			<ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/>
-			<button ignore="Always leave Busy Mode" name="Yes" text="Sim"/>
-			<button ignore="Never leave Busy Mode" name="No" text="Não"/>
+			<ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/>
+			<button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/>
+			<button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2097,14 +2270,11 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 		<usetemplate ignoretext="Vestir as roupas que eu criar enquanto edito minha aparência" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Você deve ter no mínimo 18 anos para acessar conteúdo e áreas adultas no Second Life. Visite nossa página de verificação de idade para confirmar que você tem mais de 18 anos. 
-Isso abrirá o seu navegador.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Cancelar" yestext="Ir para verificação de idade"/>
+		O local que você está tentando visitar é restrito a residentes com 18 anos ou mais.
+		<usetemplate ignoretext="Não tenho idade suficiente para visitar áreas com restrição de idade." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Localização restrita para 18 anos de idade ou mais.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Área restrita a residentes que já cadastraram seus dados de pagamento  Deseja ir ao site do [SECOND_LIFE] para cuidar disso? 
@@ -2139,11 +2309,8 @@ Isso abrirá o seu navegador.
 	<notification name="GroupNotice">
 		Assunto: [SUBJECT], Mensagem: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está online
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está offline
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
@@ -2263,9 +2430,7 @@ Selecione só um objeto.
     e selecionar &apos;Teletransportar&apos;.)
 	</notification>
 	<notification name="TeleportToPerson">
-		Para entrar em contato com residentes como &apos;[NAME]&apos;, clique no botão &quot;Pessoas&quot;, selecione um residente na janela que é exibida e clique em &apos;MI&apos; na
-    parte inferior da janela.
-    (Também é possível clicar duas vezes no nome, ou clicar no nome com o botão direito e selecionar &apos;MI&apos;.)
+		Para iniciar uma conversa particular com alguém, clique com o botão direito no avatar e selecione &quot;MI&quot; no menu.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Impossível selecionar terra nas fronteiras do servidor. Tente selecionar um pedaço menor de terra.
@@ -2362,6 +2527,16 @@ Logo, não é possível voar aqui.
 	<notification name="NoBuild">
 		Esta área desativou a opção de construir.  Não é possível construir ou fazer rez de objetos nesta área.
 	</notification>
+	<notification name="PathfindingDirty">
+		A região possui alterações de pathfinding pendentes.  Se você possui direitos de construção, poderá recarregar a região clicando no botão “Recarregar região”.
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		O pathfinding dinâmico não está habilitado nesta região.  Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Erro.  Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção.  Às vezes, fazer login e logout novamente resolve este problema.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Este terreno oculta os avatares e bate-papo de outro terreno.    Não é possível ver residentes fora do terreno e vice-versa.   O bate-papo por texto no canal 0 também está bloqueado.
 	</notification>
@@ -2380,9 +2555,7 @@ Os únicos scripts que funcionam são os do proprietário do terreno.
 		Você só pode reivindicar terrenos públicos na região onde você está.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Você não é permitido na Região devido à sua Classificação de maturidade. Você precisa validar sua idade e/ou instalar o último Visualizador.
-
-Por favor, vá ao Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade.
+		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Você está banido da região.
@@ -2393,8 +2566,11 @@ Por favor, vá ao Banco de Conhecimento para detalhes sobre o acesso de áreas c
 	<notification name="ImproperPaymentStatus">
 		Você não tem o status de pagamento adequado para entrar nesta região.
 	</notification>
+	<notification name="MustGetAgeRegion">
+		Você deve ter 18 anos ou mais para acessar esta região.
+	</notification>
 	<notification name="MustGetAgeParcel">
-		Você precisa ter a idade verificada para entrar neste lote.
+		Você deve ter 18 anos ou mais para acessar este lote.
 	</notification>
 	<notification name="NoDestRegion">
 		Nenhuma região de destino encontrada.
@@ -2496,12 +2672,33 @@ Por favor, tente novamente em alguns instantes.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] quer teletransportar você para a região deles:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teletransporte"/>
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] quer teletransportar você para a região deles:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+A região tem conteúdo [REGION_CONTENT_MATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGION_CONTENT_MATURITY].  Podemos alterar suas preferências e continuar o teletransporte, ou você pode cancelar este teletransporte.
+		<form name="form">
+			<button name="Teleport" text="Alterar e continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] quer teletransportar você para a região deles:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+No entanto, esta região tem conteúdo acessível apenas para adultos.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Oferta de teletransporte enviada para [TO_NAME]
 	</notification>
@@ -2596,16 +2793,21 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Um objeto chamado &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;&apos;, de &apos;[NAME]&apos;, gostaria de:
-
-[QUESTIONS]
-Se você não confia nos objetos deste autor, recuse-o.
-
-Deseja aceitar?
+		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
+  
+Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
-			<button name="Grant" text="Autorizar"/>
+			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
-			<button name="Details" text="Detalhes..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		A permissão de script de tempo de execução solicitada por &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, um objeto de &apos;[NAME]&apos;, não é reconhecida pelo visualizador e não pode ser concedida.
+
+Para conceder essa permissão, atualize seu visualizador para a versão mais recente em [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="Ok"/>
+			<button name="Mute" text="Bloquear"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2903,6 +3105,10 @@ Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; e
 		( [EXISTENCE] segundos de vida )
 Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; em [TIME] segundos.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Não podemos exibir uma visualização desta textura, pois ela é cópia proibida e/ou transferência proibida.
+		<usetemplate ignoretext="Avise-me quando o modo Visualização em Tempo Real estiver indisponível para texturas de cópia proibida e/ou transferência proibida" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Tem certeza de que quer sair desta ligação?
 		<usetemplate ignoretext="Confirmar antes de deixar ligação" name="okcancelignore" notext="Não" yestext="Sim"/>
@@ -3072,6 +3278,62 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
 		Essa ação irá ocultar todos os itens de menu e botões. Para trazê-los de volta, clique em [SHORTCUT] novamente.
 		<usetemplate ignoretext="Confirmar antes de ocultar interface" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		Alguns linksets selecionados terão suas sinalizações fantasmas alternadas.
+
+Deseja continuar?
+		<usetemplate ignoretext="Algumas sinalizações fantasmas dos linksets selecionados serão alternadas." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Algumas sinalizações fantasmas dos linksets selecionados não podem ser definidas como &apos;[REQUESTED_TYPE]&apos; devido às restrições de permissão no linkset.  Ao invés disso, estes linksets serão definidos como &apos;[RESTRICTED_TYPE]&apos;.
+
+Deseja continuar?
+		<usetemplate ignoretext="Alguns linksets selecionados não podem ser definidos devido às restrições de permissão no linkset." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos;, pois a forma não é convexa.
+
+Deseja continuar?
+		<usetemplate ignoretext="Alguns linksets selecionados não podem ser definidos, pois a forma não é convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		Alguns linksets selecionados terão suas sinalizações fantasmas alternadas.
+
+Algumas sinalizações fantasmas dos linksets selecionados não podem ser definidas como &apos;[REQUESTED_TYPE]&apos; devido às restrições de permissão no linkset.  Ao invés disso, estes linksets serão definidos como &apos;[RESTRICTED_TYPE]&apos;.
+
+Deseja continuar?
+		<usetemplate ignoretext="Algumas sinalizações fantasmas dos linksets selecionados serão alternadas e outras não poderão ser definidas devido às restrições de permissão no linkset." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		Alguns linksets selecionados terão suas sinalizações fantasmas alternadas.
+
+Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos;, pois a forma não é convexa.
+
+Deseja continuar?
+		<usetemplate ignoretext="Algumas sinalizações fantasmas dos linksets selecionados serão alternadas e outros não podem ser definidas, pois a forma não é convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Algumas sinalizações fantasmas dos linksets selecionados não podem ser definidas como &apos;[REQUESTED_TYPE]&apos; devido às restrições de permissão no linkset.  Ao invés disso, estes linksets serão definidos como &apos;[RESTRICTED_TYPE]&apos;.
+
+Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos;, pois a forma não é convexa. Estes tipos de uso de linksets não mudarão.
+
+Deseja continuar?
+		<usetemplate ignoretext="Alguns linksets selecionados não podem ser definidos devido às restrições de permissão no linkset e porque a forma não é convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		Alguns linksets selecionados terão suas sinalizações fantasmas alternadas.
+
+Algumas sinalizações fantasmas dos linksets selecionados não podem ser definidas como &apos;[REQUESTED_TYPE]&apos; devido às restrições de permissão no linkset.  Ao invés disso, estes linksets serão definidos como &apos;[RESTRICTED_TYPE]&apos;.
+
+Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos;, pois a forma não é convexa. Estes tipos de uso de linksets não mudarão.
+
+Deseja continuar?
+		<usetemplate ignoretext="Algumas sinalizações fantasmas dos linksets selecionados serão alternadas e outras não poderão ser definidas, pois a forma não é convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		O objeto selecionado afeta o navmesh.  Alterá-lo para um Caminho Flexível irá removê-lo do navmesh.
+		<usetemplate ignoretext="O objeto selecionado afeta o navmesh.  Alterá-lo para um Caminho Flexível irá removê-lo do navmesh." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Aparentemente a sua máquina não atende os requisitos de hardware do [APP_NAME].  [APP_NAME] requer placas de vídeo OpenGL com suporte a multitexturas.  Se sua place de vídeo tiver este perfil, atualize o driver da placa de vídeo, assim como patches e service packs do sistema operacional. 
 
@@ -3096,4 +3358,653 @@ Outra opção é procurar por lugares com a tag &apos;Infohub&apos; no mapa.
 	<global name="You died and have been teleported to your home location">
 		Você morreu e foi reenviado ao seu início.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Não foi possível atualizar [FNAME], pois o arquivo não pôde ser encontrado.
+Desabilitando atualizações futuras deste arquivo.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] não pode ser aberto ou decodificado em [NRETRIES] tentativas, e agora é considerado corrompido.
+Desabilitando atualizações futuras deste arquivo.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentativa de adição de um formato de imagem inválido ou ilegível [FNAME] que não pode ser aberto ou decodificado.
+Tentativa cancelada.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Você está devolvendo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
+		<usetemplate ignoretext="Tem certeza de que deseja devolver múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Você está excluindo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
+		<usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar congelado.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] descongelou você.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar descongelado.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		O congelamento falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Seu congelamento expirou, vá cuidar da sua vida.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Não é possível congelar esse usuário.
+	</notification>
+	<notification name="NowOwnObject">
+		Agora você é o proprietário do objeto [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite.  Use a ferramenta de terrenos para ver a propriedade do terreno.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		O objeto não pode ser renderizado porque há muitas solicitações.
+	</notification>
+	<notification name="SitFailCantMove">
+		Você não pode sentar porque não pode se mover no momento.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Você não pode sentar porque não está autorizado a sentar nesse terreno.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Tente chegar mais perto.  Não é possível sentar no objeto porque
+ele não está na mesma região que você.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Não foi possível criar um novo objeto. A região está cheia.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Você não pode criar árvores e grama em terrenos que não são sua propriedade.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		A cópia falhou porque você não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; não pode ser transferido para você.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; contribui para o navmesh.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Duplicar sem objetos raiz selecionados.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Não é possível duplicar objetos porque a região está cheia.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Não é possível criar objeto porque 
+o lote está cheio.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Falha na tentativa de renderizar um objeto.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Não é possível criar um item que causou problemas a essa região.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Esse item do inventário foi incluído na lista.
+	</notification>
+	<notification name="NoCanRezObjects">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Pesquisa de terreno bloqueada.
+Você realizou muitas pesquisas de terreno muito rápido.
+Tente novamente em instantes.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Você morreu e foi teletransportado para seu início
+	</notification>
+	<notification name="EjectComingSoon">
+		Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Você não pode entrar nesta região porque 
+o servidor está cheio.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Salvar no inventário foi desativado.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque você não tem permissão para modificar o objeto &apos;[DEST_NAME]&apos;.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Não é possível salvar &apos;[OBJ_NAME]&apos; no inventário -- essa operação foi desativada.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Você não pode copiar sua seleção porque não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		A remoção do objeto &apos;[OBJ_NAME]&apos; do simulador é proibida pelo sistema de permissões.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Você não pode salvar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Não é possível salvar sua seleção porque o objeto &apos;[OBJ_NAME]&apos; não é copiável.
+	</notification>
+	<notification name="NoModNoTaking">
+		Você não pode levar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
+	</notification>
+	<notification name="RezDestInternalError">
+		Erro interno: tipo de destino desconhecido.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		A exclusão falhou porque o objeto não foi encontrado
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Não é possível expulsar esse usuário.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="HomePositionSet">
+		Posição de início definida.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar expulso.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		A expulsão falhou porque você não tem permissão de administrador para esse lote.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Não é possível mover &apos;[OBJECT_NAME]&apos; para
+[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Você não está autorizado a modificar este objeto
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Não é possível ativar propriedades físicas para objetos keyframe.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh.
+	</notification>
+	<notification name="UnableAddItem">
+		Não é possível adicionar item!
+	</notification>
+	<notification name="UnableEditItem">
+		Não é possível editar isso!
+	</notification>
+	<notification name="NoPermToEdit">
+		Não é permitido editar isso.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Não é permitido copiar esse inventário.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Não é possível salvar no conteúdo do objeto: O item não existe mais.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
+	</notification>
+	<notification name="TooManyScripts">
+		Muitos scripts.
+	</notification>
+	<notification name="UnableAddScript">
+		Não é possível adicionar script!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Servidor de objetos não respondeu a tempo.  Objeto retornado a sim.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Esta região não tem formas físicas ativadas.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Você não pode modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Não é possível definir as propriedades físicas neste tipo de objeto.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Não é possível definir que um prim raiz não tenha forma.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Esta região não tem materiais físicos ativados.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Apenas prims raiz podem ter seus materiais físicos ajustados.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Ainda não há suporte para a configuração dos materiais físicos em personagens.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Uma ou mais das propriedades do material físico são inválidas.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Você não pode alterar o tipo de acabamento de um objeto mesh.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Você não pode alterar a forma de um objeto mesh
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Você não pode entrar nesta região porque \nela está cheia.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Falha na vinculação -- proprietários diferentes
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Falha na vinculação -- não é possível modificar o navmesh além dos limites da região.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Ocorreu uma falha na vinculação porque você não tem permissão de edição.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Falha na vinculação -- muitos prims
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Falha na vinculação -- nada é vinculável.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Falha na vinculação -- muitos personagens com pathfinding
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Falha na vinculação -- recursos de terreno insuficientes
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		O objeto usa muitos recursos físicos – sua dinâmica foi desativada.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Você foi teletransportado por um anexo em [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de um usuário desconhecido.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Não foi possível criar o objeto solicitado. A região está cheia.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Não é possível anexar vários objetos a um local.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Você não pode criar vários objetos aqui.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Não foi possível criar o objeto solicitado. Tente novamente.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Falha na renderização, objeto solicitado demorou muito a carregar.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Você não pode criar plantas neste terreno.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Não é possível renderizar o objeto porque os dados de mesh são inválidos.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Não foi possível renderizar objeto porque já há muitos scripts nesta região.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Seus privilégios de acesso não permitem que você crie objetos aqui.
+	</notification>
+	<notification name="CantCreateObject">
+		No momento, você não está autorizado a criar objetos.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Parâmetros de objeto inválidos
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Seus privilégios de acesso não permitem que você duplique objetos aqui.
+	</notification>
+	<notification name="CantChangeShape">
+		Você não está autorizado a alterar essa forma.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Seus privilégios de acesso não permitem que você reivindique objetos aqui.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		A doação falhou porque você não está autorizado a doar objetos ao seu grupo.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Seus privilégios de acesso não permitem que você compre objetos aqui.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Não é possível anexar objeto porque um avatar está sentado nele.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Árvores e grama não podem ser usadas como anexos.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Não é possível anexar objetos de propriedade de um grupo.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Não é possível anexar objetos que não sua propriedade.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Não é possível anexar objetos que contribuem com o navmesh.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Não é possível vincular objeto porque você não tem permissão para movê-lo.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Não há recursos de script disponíveis suficientes para anexar objeto!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Falha ao largar anexo: você não está autorizado a largá-lo aqui.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Falha ao largar anexo: recursos de terreno disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Falha ao largar anexos: recursos disponíveis insuficientes.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Não é possível largar objeto aqui.  O lote está cheio.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Detalhe seus parâmetros de exclusão.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Não é possível carregar objeto.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Não foi possível encontrar usuário para teletransportar para início
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		solicitação de poderes de deus falhou
+	</notification>
+	<notification name="GenericRequestFailed">
+		falha em solicitação genérica
+	</notification>
+	<notification name="CantUploadPostcard">
+		Não foi possível carregar cartão postal.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Não foi possível obter detalhes de inventário para o anúncio de grupo.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Não é possível enviar anúncio de grupo -- não permitido.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Não é possível enviar anúncio de grupo -- não foi possível construir inventário.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Não é possível processar o inventário do anúncio.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Falha no envio de terreno.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Arquivo de terreno gravado.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Arquivo de terreno criado, iniciando o download...
+	</notification>
+	<notification name="TerrainBaked">
+		Terreno confeccionado.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Você precisa atualizar seu visualizador para comprar este lote.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Não é possível comprar, este lote não está à venda.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Não é possível comprar, o preço de venda ou a área do terreno foram alterados.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Você não é o comprador autorizado deste lote.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Você não pode comprar este lote porque já está aguardando aut. de compra
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Não é possível criar objeto aqui porque isso sobrecarregaria o lote.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Não há lotes alugados suficientes na seleção para reunir.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -&gt; Relatar bug...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		O terreno foi dividido.
+	</notification>
+	<notification name="PassPurchased">
+		Você comprou um passe.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		A região não permite classificados.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Seu passe para este terreno está prestes a expirar.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Não há uma superfície adequada para sentar, tente outro local.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Não há espaço para sentar aqui, tente outro local.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		A reivindicação do objeto falhou porque você não tem permissão
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		A reivindicação do objeto falhou porque você não tem L$ suficiente.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Não é possível doar terrenos de propriedade de um grupo.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		A compra do objeto falhou porque você não tem L$ suficientes.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		A compra do inventário falhou porque você não tem L$ suficiente
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Você não tem L $ suficientes para comprar um passe para este terreno.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Não é possível comprar passe no momento.  Tente novamente mais tarde.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Não é possível criar objeto porque \no lote está cheio.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Falha ao posicionar objeto em local específico.  Tente novamente.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Não é possível criar marco para o evento.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Seus poderes de deus rompem o congelamento!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Falha na solicitação de poderes especiais. Essa solicitação foi registrada.
+	</notification>
+	<notification name="ExpireExplanation">
+		O sistema não pode processar sua solicitação no momento. A solicitação expirou.
+	</notification>
+	<notification name="DieExplanation">
+		O sistema não pode processar sua solicitação.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Fundos insuficientes para criar prim.
+	</notification>
+	<notification name="RezObjectFailure">
+		Fundos insuficientes para criar objeto.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Redefinir Início pois o Início não era legal.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Esta região não permite que você a defina como seu início.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
+	</notification>
+	<notification name="SetHomePosition">
+		Posição de início definida.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Não é possível desrenderizar objeto devido a uma falha de inventário.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Não é possível criar o inventário solicitado.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Não é possível criar a pasta de inventário solicitada.
+	</notification>
+	<notification name="CantCreateInventory">
+		Não é possível criar esse inventário.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Não é possível criar marco.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Não é possível criar roupa agora. Tente novamente em instantes.
+	</notification>
+	<notification name="InventoryNotForSale">
+		O inventário não está à venda.
+	</notification>
+	<notification name="CantFindInvItem">
+		Não é possível encontrar item do inventário.
+	</notification>
+	<notification name="CantFindObject">
+		Não foi possível encontrar objeto.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Transferências de dinheiro para objetos estão desativadas para esta região no momento.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Não foi possível descobrir a quem pagar.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Não é possível dar L$ a objetos públicos.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Falha na criação de inventário de objetos do mundo virtual.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Um erro interno impediu que seu visualizador fosse atualizado corretamente.  O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Não é possível criar grandes prims que interceptam outros jogadores.  Tente novamente quando os outros jogadores tiverem se movido.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo.
+		<usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos.
+		<usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Não foi possível mover arquivos. Caminho anterior restaurado.
+		<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml
index b1ffa0d2e5..b1ffa0d2e5 100644..100755
--- a/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml
+++ b/indra/newview/skins/default/xui/pt/outfit_accordion_tab.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml
index 73f6b2225f..73f6b2225f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/pt/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
index bd50d4953d..bd50d4953d 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index b444593af8..22eb23ebc5 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -26,5 +26,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
index c5f93d719a..2fcf6b9932 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Lista de bloqueados
-	</text>
-	<scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
-	<button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/>
-	<button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/>
-	<button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrar" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/>
+		<menu_button name="view_btn" tool_tip="Opções de ordenação"/>
+		<menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/>
+		<button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
index 87a2e1674d..87a2e1674d 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
index 094a03553b..094a03553b 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
deleted file mode 100644
index cb517f643c..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Liga e desliga o microfone"/>
-	<string name="VoiceControlBtnToolTip" value="Mostra/oculta os controles de voz"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Falar" label_selected="Falar" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Movimentar" name="movement_btn" tool_tip="Mostra/oculta os controles de movimento"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Exibir" name="camera_btn" tool_tip="Mostra/oculta os controles da câmera"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Tirar foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construir" name="build_btn" tool_tip="Mostra/oculta ferramentas de Construção"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Busca" name="search_btn" tool_tip="Mostra/oculta os gestos"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Mapa" name="world_map_btn" tool_tip="Mostra/oculta o Mapa Múndi"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini Mapa" name="mini_map_btn" tool_tip="Mostra/oculta o Mini Mapa"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversas"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notificações"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
index 78d9826099..78d9826099 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml
index 0551d9cba6..0551d9cba6 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_classified_info.xml b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
index 73bfe7444e..73bfe7444e 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
index bfdc7290d2..bfdc7290d2 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
index 4b45a49f74..4b45a49f74 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
index 3e4b12b001..3e4b12b001 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/pt/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..f56168c962
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(carregando)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..74daded58f
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/>
+	<icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/>
+	<button name="delete_btn" tool_tip="Remover esta entrada"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
index 7ca5e23981..7ca5e23981 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
index 3dfb5a0a16..3dfb5a0a16 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml
index b274945dbd..b274945dbd 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
index 23e00bfc3a..23e00bfc3a 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml
index f21656d526..f21656d526 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml
index 281823d641..281823d641 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
index 13f1f892f9..13f1f892f9 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml
index 5798325bd7..5798325bd7 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml
index 18568a81a8..18568a81a8 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml
index 967aab8bc3..967aab8bc3 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
index 5eb9987e71..5eb9987e71 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
index 0ba7382845..0ba7382845 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
index de41ba3ad2..de41ba3ad2 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml
index c7e2b1e64c..c7e2b1e64c 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml
index 08465d09e7..08465d09e7 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml
index d00aa2dc66..d00aa2dc66 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml
index 275efba6e6..275efba6e6 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml
index 6f4779d855..6f4779d855 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
index f85bb3c499..f85bb3c499 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml
index c383471851..c383471851 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml
index 0bf510c67f..0bf510c67f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
index 2e3e3d6305..2e3e3d6305 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/pt/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
index 502dae8d67..502dae8d67 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index b634ec3f64..b634ec3f64 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
index 30c825723b..30c825723b 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index c7def0ed96..de057481de 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Alguns dos residentes selecionados já estão no grupo, portanto não receberam convite.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Os convites para o grupo não foram enviados: muitos residentes selecionados. Os convites para o grupo são limitados a 100 por solicitação.
+	</panel.string>
 	<text name="help_text" width="214">
 		Selecione um ou mais residentes para convidar.  Clique em &apos;Abrir seletor de residentes&apos; para começar.
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index 2346fe7f4f..2346fe7f4f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index 19c34d2f10..0490878507 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
+	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 3bff1f8fb3..3bff1f8fb3 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notify.xml b/indra/newview/skins/default/xui/pt/panel_group_notify.xml
index 5a8ea81074..5a8ea81074 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 11a31570d1..11a31570d1 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
index 91b7d1b7cd..91b7d1b7cd 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/pt/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
index 39c19a22d4..39c19a22d4 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_landmarks.xml b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
index 49e1203601..49e1203601 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/pt/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index f4af6a7108..d7e9fa76ea 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php?lang=pt
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				LOGIN
+			</text>
 			<text name="username_text">
 				Nome de usuário:
 			</text>
@@ -15,33 +15,32 @@
 			<text name="password_text">
 				Senha:
 			</text>
-			<check_box label="Lembrar senha" name="remember_check"/>
-			<button label="conectar" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Modo:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Selecione o modo. O modo Básico é mais rápido e ideal para explorar e conversar. Use o modo Avançado para acessar mais recursos.">
-				<combo_box.item label="Básico" name="Basic"/>
-				<combo_box.item label="Avançado" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Começar em:
 			</text>
 			<combo_box name="start_location_combo">
 				<combo_box.item label="Última posição" name="MyLastLocation"/>
-				<combo_box.item label="Meu início" name="MyHome"/>
+				<combo_box.item label="Minha casa" name="MyHome"/>
+				<combo_box.item label="&lt;Digite o nome da região&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Cadastre-se
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Precisa de ajuda com o login?
 			</text>
 			<text name="forgot_password_text">
 				Esqueceu seu nome ou senha?
 			</text>
-			<text name="login_help">
-				Precisa de ajuda ao conectar?
+			<button label="Login" name="connect_btn"/>
+			<check_box label="Lembrar senha" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				CRIE SUA CONTA
 			</text>
+			<button label="Comece agora" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index dbf8e4fa52..dbf8e4fa52 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_me.xml b/indra/newview/skins/default/xui/pt/panel_me.xml
index 281c886bd4..281c886bd4 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_me.xml
+++ b/indra/newview/skins/default/xui/pt/panel_me.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml
index 43c0820036..43c0820036 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml
index 55226db274..55226db274 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/pt/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
index e38c44d8fe..e38c44d8fe 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
index 4fa5436805..4fa5436805 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
index 6828d41dee..6828d41dee 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
index 9b993488be..5628a87109 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Clique aqui para bater papo." name="chat_box" tool_tip="Tecle Enter para falar, Ctrl+Enter para gritar"/>
 	<button name="show_nearby_chat" tool_tip="Mostra/oculta o histórico do bate-papo local"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
index 43bf8f9661..43bf8f9661 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/pt/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml
index dcd9ba1815..dcd9ba1815 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/pt/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/pt/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
index 442622035a..442622035a 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
index eb23f5c079..eb23f5c079 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
index 816a9bc46e..816a9bc46e 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
index 736b8f1fdd..736b8f1fdd 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
index 2d74e092a4..2d74e092a4 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
index 9224ec4742..9224ec4742 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/pt/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index f3af15b991..205fd6b97d 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -14,81 +14,56 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_filtered_friends_msg">
 		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
-	<string name="people_filter_label" value="Filtro de pessoas"/>
-	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
-	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
-		<panel label="MEUS AMIGOS" name="friends_panel">
+		<panel label="AMIGOS" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="MEUS GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Opções"/>
-				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
-				<button name="activate_btn" tool_tip="Ativar o grupo selecionado"/>
+		<panel label="GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Filtrar grupos" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/>
+				<menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
+				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
 			</panel>
+			<text name="groupcount">
+				Você pertence a [COUNT] grupos e pode entrar em mais [REMAINING].
+			</text>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Opções"/>
-				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Filtrar pessoas" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
+				<menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/>
+				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
+				<dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
 			</panel>
 		</panel>
+		<panel label="BLOQUEADA" name="blocked_panel">
+			<panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_pick_info.xml b/indra/newview/skins/default/xui/pt/panel_pick_info.xml
index caa140a245..caa140a245 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_picks.xml b/indra/newview/skins/default/xui/pt/panel_picks.xml
index 2ff1eed624..2ff1eed624 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_picks.xml
+++ b/indra/newview/skins/default/xui/pt/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
index 8abe579702..8abe579702 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml
index 69f0baf65f..69f0baf65f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_places.xml
+++ b/indra/newview/skins/default/xui/pt/panel_places.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml
index 9cde810430..9cde810430 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/pt/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
index 3088b9a996..3088b9a996 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/pt/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
index c72928fc35..c72928fc35 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
index 2ffe720ccf..2ffe720ccf 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index c5a4febb0e..89f1e07647 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<text name="font_size">
-		Tamanho da fonte:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Pequeno" name="radio" value="0"/>
-		<radio_item label="Médio" name="radio2" value="1"/>
-		<radio_item label="Grande" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
-	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
-	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Mostrar MIs em:
-	</text>
-	<text name="requires_restart_label">
-		(Reinicie para ativar)
-	</text>
-	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
-		<radio_item label="Janelas separadas" name="radio" value="0"/>
-		<radio_item label="Guias" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Ativar pop-ups de novos bate-papos:
-	</text>
-	<check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/>
-	<check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/>
-	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
-	<button label="Configurações de tradução de bate-papo" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Executar animação de digitação durante o bate-papo" name="play_typing_animation"/>
+		<check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/>
+		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Tamanho da fonte:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Pequeno" name="Small" value="0"/>
+			<item label="Médio" name="Medium" value="1"/>
+			<item label="Grande" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balão de conversa" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			MIs de amigos:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			MIs de não amigos:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			MIs de conferências:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Conversa em grupo:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Conversa local:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			MIs de objetos:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="avisos"/>
+			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="piscar"/>
+			<item label="Nenhuma ação" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Executar som" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Executar som:
+		</text>
+		<check_box label="Nova conversa" name="new_conversation"/>
+		<check_box label="Chamada de voz recebida" name="incoming_voice_call"/>
+		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
+		<check_box label="Oferta de inventário" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Limpar registro..." name="clear_log"/>
+		<button label="Excluir transcrições..." name="delete_transcripts"/>
+		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
+	</panel>
+	<button label="Tradução..." name="ok_btn"/>
+	<button label="Substituição automática..." name="autoreplace_showgui"/>
+	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
index d6c6f66e37..d6c6f66e37 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index c53aa7d5f7..8a0495f9bb 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -69,6 +69,9 @@
 		<combo_box.item label="(nunca)" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Mensagem do modo ocupado:
+		Resposta de Não perturbe:
 	</text>
+	<text_editor name="do_not_disturb_response">
+		log_in_to_change
+	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 28e7184326..756e345cb8 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -26,14 +26,14 @@ rápido
 		<text name="ShadersText">
 			Sombreadores:
 		</text>
-		<check_box initial_value="verdadeiro" label="Água transparente" name="TransparentWater"/>
+		<check_box initial_value="true" label="Água transparente" name="TransparentWater"/>
 		<check_box initial_value="true" label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
-		<check_box initial_value="verdadeiro" label="Luzes locais" name="LocalLights"/>
+		<check_box initial_value="true" label="Luzes locais" name="LocalLights"/>
 		<check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vídeo a travem."/>
 		<check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="verdadeiro" label="Iluminação e sombras" name="UseLightShaders"/>
-		<check_box initial_value="verdadeiro" label="Oclusão ambiental" name="UseSSAO"/>
-		<check_box initial_value="verdadeiro" label="Profundidade" name="UseDoF"/>
+		<check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Oclusão ambiental" name="UseSSAO"/>
+		<check_box initial_value="true" label="Profundidade" name="UseDoF"/>
 		<text name="shadows_label">
 			Sombras:
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
index fa6f5f5851..fa6f5f5851 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
index d7fb585e35..d7fb585e35 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index ebbd63138a..1279e74e21 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -21,7 +21,7 @@
 	<check_box initial_value="true" label="Habilitar plugins" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Aceitar cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Habilitar Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="falso" label="Ativar pop-ups no navegador de mídia" name="media_popup_enabled"/>
+	<check_box initial_value="false" label="Ativar pop-ups no navegador de mídia" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Atualizações de software:
 	</text>
@@ -29,6 +29,7 @@
 		<combo_box.item label="Instalar automaticamente" name="Install_automatically"/>
 		<combo_box.item label="Baixar e instalar atualizações manualmente" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Disposto a atualizar para candidatos da versão" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Configurações de proxy:
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
index d910a7b812..fff5fd7005 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
@@ -19,7 +19,7 @@
 	<check_box label="Ativado" name="enable_voice_check"/>
 	<check_box label="Autorizar auto-play de mídias" name="media_auto_play_btn" tool_tip="Marque esta opção para auto-executar mídias, se elas quiserem" value="true"/>
 	<check_box label="Tocar mídia anexada em outros avatares" name="media_show_on_others_btn" tool_tip="Desmarque esta opção para ocultar mídias anexadas em avatares por perto" value="true"/>
-	<check_box label="Tocar áudio de gestos" name="gesture_audio_play_btn" tool_tip="Selecione para ouvir o áudio de gestos" value="verdadeiro"/>
+	<check_box label="Tocar áudio de gestos" name="gesture_audio_play_btn" tool_tip="Selecione para ouvir o áudio de gestos" value="true"/>
 	<text name="voice_chat_settings">
 		Configuração de bate-papo de voz
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
index 9e07b6772f..9e07b6772f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index 65ac89baf8..65ac89baf8 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index f2cc9f644d..be15d40d74 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="297" name="top_scripts_help"/>
 	<button label="Reiniciar a região" name="restart_btn" tool_tip="Após 2 minutos de contagem regressiva, reiniciar a região"/>
 	<button label="?" name="restart_help"/>
-	<button label="Adiar reinício" name="cancel_restart_btn" tool_tip="Adiar o reinício da região por uma hora"/>
+	<button label="Cancelar reinício" name="cancel_restart_btn" tool_tip="Cancelar reinício da região"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_environment.xml b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
index 79eedebe5f..79eedebe5f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 6c5945aa15..b1453c9c32 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -26,7 +26,7 @@
 		Permitir acesso apenas para residentes que:
 	</text>
 	<check_box label="Dados de pagamento constam no registro." name="limit_payment" tool_tip="Propriedade de acesso restrito a residentes que já cadastraram seus dados de pagamento  Consulte o [SUPPORT_SITE] para saber mais."/>
-	<check_box label="A idade foi verificada" name="limit_age_verified" tool_tip="Residentes devem ter a idade verificada para acessar esta propriedade. Consulte o [SUPPORT_SITE] para saber mais."/>
+	<check_box label="Tem 18 anos ou mais" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar esta propriedade. Consulte o [SUPPORT_SITE] para obter mais informações."/>
 	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
index 4be1cd11c0..4be1cd11c0 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index 74330a8946..74330a8946 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
deleted file mode 100644
index 35928ccc67..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texturas de Chão" name="Textures">
-	<text name="region_text_lbl">
-		Região:
-	</text>
-	<text name="region_text">
-		desconhecido
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
-	</text>
-	<text name="height_text_lbl">
-		1 (baixo)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (alto)
-	</text>
-	<text name="height_text_lbl5">
-		Escalas de Elevação de Terreno
-	</text>
-	<text name="height_text_lbl6">
-		Noroeste
-	</text>
-	<text name="height_text_lbl7">
-		Nordeste
-	</text>
-	<text name="height_text_lbl8">
-		Sudoeste
-	</text>
-	<text name="height_text_lbl9">
-		Sudeste
-	</text>
-	<spinner label="Baixo" name="height_start_spin_0"/>
-	<spinner label="Baixo" name="height_start_spin_1"/>
-	<spinner label="Baixo" name="height_start_spin_2"/>
-	<spinner label="Baixo" name="height_start_spin_3"/>
-	<spinner label="Alto" name="height_range_spin_0"/>
-	<spinner label="Alto" name="height_range_spin_1"/>
-	<spinner label="Alto" name="height_range_spin_2"/>
-	<spinner label="Alto" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Os valores representam o intervalo de mistura das texturas acima.
-	</text>
-	<text name="height_text_lbl11">
-		Em metros, o valor BAIXO é a altura MÁXIMA da Textura 1, e HIGH é a altura MÍNIMA da Textura 4.
-	</text>
-	<text name="height_text_lbl12">
-		e o valor Alto é a altura Mínima da Textura #4.
-	</text>
-	<button label="Aplicar" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_ed.xml b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
index de02aafe2f..39bb5edc75 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/pt/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Selecionar tudo" name="Select All"/>
 			<menu_item_call label="Desmarcar" name="Deselect"/>
 			<menu_item_call label="Buscar / Substituir..." name="Search / Replace..."/>
+			<menu_item_call label="Ir para a linha..." name="Go to line..."/>
 		</menu>
 		<menu label="Ajuda" name="Help">
 			<menu_item_call label="ajuda..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
index daf87c4dc6..daf87c4dc6 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
index 94274b2cfe..94274b2cfe 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
index 87e6d16056..87e6d16056 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml
index 0a5a2e2572..0a5a2e2572 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray.xml b/indra/newview/skins/default/xui/pt/panel_side_tray.xml
deleted file mode 100644
index 1a424fb7f1..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Exibir ou não barra lateral" name="sidebar_openclose" tab_title="Exibir ou não barra lateral"/>
-	<sidetray_tab description="Início" name="sidebar_home" tab_title="Início">
-		<panel label="Início" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Edite seu perfil público e destaques." name="sidebar_me" tab_title="Meu perfil">
-		<panel_container name="panel_container">
-			<panel label="Eu" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encontre seus amigos, contatos e pessoas nas proximidades." name="sidebar_people" tab_title="Pessoas">
-		<panel_container name="panel_container">
-			<panel label="Perfil do grupo" name="panel_group_info_sidetray"/>
-			<panel label="Residentes&amp; Objetos bloqueados" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encontre lugares para ir e lugares que você ja visitou." label="Lugares" name="sidebar_places" tab_title="Lugares">
-		<panel label="Lugares" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Abra seu inventário." name="sidebar_inventory" tab_title="Meu inventário">
-		<panel label="Editar inventário" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Muda sua aparência e seu visual atual." name="sidebar_appearance" tab_title="Minha aparência">
-		<panel label="Editar aparência" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml
index 09444a5535..09444a5535 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/pt/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
index 3c4bb18687..3c4bb18687 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
index 36b5b0cbe6..36b5b0cbe6 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
index 7f1452e992..7f1452e992 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
index 12a648f600..12a648f600 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
index 095b8fc75d..095b8fc75d 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
index 66db89f48f..66db89f48f 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml
index 05869cf67a..05869cf67a 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/pt/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index cb9a6eb757..cb9a6eb757 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
index b77064a1ff..b77064a1ff 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/pt/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
index 65f80fddd2..65f80fddd2 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
new file mode 100644
index 0000000000..03da89dd3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Textura" name="Texture">
+	<panel.string name="string repeats per meter">
+		Repetições por metro
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Repetições por face
+	</panel.string>
+	<text name="color label">
+		Cor
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Selecionar a cor"/>
+	<text name="color trans">
+		% de transparência
+	</text>
+	<text name="glow label">
+		Brilho
+	</text>
+	<check_box label="Completamente luminoso" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Materiais" name="Materials"/>
+		<combo_box.item label="Mídia" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Textura (difusa)" name="Texture (diffuse)"/>
+		<combo_box.item label="Relevo (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Brilho (especular)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Textura" name="texture control" tool_tip="Selecionar imagem"/>
+	<text name="label alphamode">
+		Modo alpha
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Nenhum" name="None"/>
+		<combo_box.item label="Mistura alpha" name="Alpha blending"/>
+		<combo_box.item label="Máscara alpha" name="Alpha masking"/>
+		<combo_box.item label="Máscara emissiva" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Corte da máscara
+	</text>
+	<texture_picker label="Textura" name="bumpytexture control" tool_tip="Selecionar imagem"/>
+	<text name="label bumpiness">
+		Relevo
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Nenhum" name="None"/>
+		<combo_box.item label="Luminosidade" name="Brightness"/>
+		<combo_box.item label="Escuridão" name="Darkness"/>
+		<combo_box.item label="grão de madeira" name="woodgrain"/>
+		<combo_box.item label="casca de árvore" name="bark"/>
+		<combo_box.item label="tijolos" name="bricks"/>
+		<combo_box.item label="quadriculado" name="checker"/>
+		<combo_box.item label="concreto" name="concrete"/>
+		<combo_box.item label="ladrilho ríspido" name="crustytile"/>
+		<combo_box.item label="pedra talhada" name="cutstone"/>
+		<combo_box.item label="discos" name="discs"/>
+		<combo_box.item label="cascalho" name="gravel"/>
+		<combo_box.item label="placa de petri" name="petridish"/>
+		<combo_box.item label="desvio" name="siding"/>
+		<combo_box.item label="ladrilho de pedra" name="stonetile"/>
+		<combo_box.item label="estuque" name="stucco"/>
+		<combo_box.item label="sucção" name="suction"/>
+		<combo_box.item label="tecelagem" name="weave"/>
+	</combo_box>
+	<texture_picker label="Textura" name="shinytexture control" tool_tip="Selecionar imagem"/>
+	<text name="label shininess">
+		Brilho
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Nenhum" name="None"/>
+		<combo_box.item label="Baixo" name="Low"/>
+		<combo_box.item label="Médio" name="Medium"/>
+		<combo_box.item label="Alto" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Acetinação
+	</text>
+	<text name="label environment">
+		Ambiente
+	</text>
+	<text name="label shinycolor">
+		Cor
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Selecionar a cor"/>
+	<text name="media_info">
+		A URL da mídia escolhida, caso haja, é inserida aqui
+	</text>
+	<button label="Selecionar..." name="add_media" tool_tip="Adicionar mídia"/>
+	<button label="Remover" name="delete_media" tool_tip="Excluir esta textura de mídia"/>
+	<button label="Alinhar" label_selected="Alinhar mídia" name="button align" tool_tip="Alinhar texturas de mídia (após carregar mídia)"/>
+	<text name="tex gen">
+		Mapeamento
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Padrão" name="Default"/>
+		<combo_box.item label="Planar" name="Planar"/>
+	</combo_box>
+	<spinner label="Escala horizontal" name="TexScaleU"/>
+	<spinner label="Escala vertical" name="TexScaleV"/>
+	<spinner label="Repetições por metro" name="rptctrl"/>
+	<spinner label="Graus de rotação" name="TexRot"/>
+	<spinner label="Offset horizontal" name="TexOffsetU"/>
+	<spinner label="Offset vertical" name="TexOffsetV"/>
+	<spinner label="Escala horizontal" name="bumpyScaleU"/>
+	<spinner label="Escala vertical" name="bumpyScaleV"/>
+	<spinner label="Graus de rotação" name="bumpyRot"/>
+	<spinner label="Offset horizontal" name="bumpyOffsetU"/>
+	<spinner label="Offset vertical" name="bumpyOffsetV"/>
+	<spinner label="Escala horizontal" name="shinyScaleU"/>
+	<spinner label="Escala vertical" name="shinyScaleV"/>
+	<spinner label="Graus de rotação" name="shinyRot"/>
+	<spinner label="Offset horizontal" name="shinyOffsetU"/>
+	<spinner label="Offset vertical" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Alinhar planos planares" name="checkbox planar align" tool_tip="Alinhar texturas de todos os planos selecionados com o plano selecionado por último. Requer mapeamento de textura planar."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
index 1d7878408a..1d7878408a 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..1dfd2a69ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater">
+	<slider label="Master" name="System Volume"/>
+	<slider label="Botões" name="UI Volume"/>
+	<slider label="Ambiente" name="Wind Volume"/>
+	<slider label="Sons" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Ativar sons dos gestos"/>
+	<slider label="Música" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="Ativar streaming de música"/>
+	<slider label="Mídia" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="Ativar mídia em stream"/>
+	<slider label="Voz" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="Ativar bate-papo de voz"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_world_map.xml b/indra/newview/skins/default/xui/pt/panel_world_map.xml
index accab068fd..accab068fd 100644..100755
--- a/indra/newview/skins/default/xui/pt/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
index 21b085431e..e45a3bd21f 100644..100755
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem &amp; opções de rota de TP." name="Parcel Identity">
 		<action description="Alternar &apos;Exibir nos resultados de busca&apos; e selecionar a categoria" longdescription="Alterne entre &apos;Exibir nos resultados de busca&apos; ou não, e selecione a categoria do terreno em &apos;Sobre o terreno&apos;." name="land find places" value="17"/>
-		<action description="Mude o nome, a descrição e a exibição do terreno nos resultados de busca." longdescription="Mude o nome, a descrição e a exibição do terreno nos resultados de busca.  Veja essas opções em Sobre o terreno &gt; guia Opções." name="land change identity" value="18"/>
+		<action description="Alterar nome da parcela, descrição e configurações de &quot;Conteúdo moderado&quot;" longdescription="Altere o nome da parcela, descrição e configurações de &quot;Conteúdo moderado&quot;. Isso é feito em Sobre o terreno &gt; guia Opções." name="land change identity" value="18"/>
 		<action description="Definir ponto de aterrissagem e rota de teletransporte" longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno &gt; aba Opções." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Estas habilidade incluem poderes que afetam opções de parcela, como &apos;Criar objetos&apos;, &apos;Editar terreno&apos; e música &amp; configurações de mídia." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
index a5048e63b2..a5048e63b2 100644..100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
index 7908ea5f3a..7908ea5f3a 100644..100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
index e6370ea830..d3cb087108 100644..100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(desconhecido)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(desconhecido / múltiplo)
+	</panel.string>
 	<panel.string name="public">
 		(público)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index 8092e6c145..f0fd438cef 100644..100755
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Você não pode modificar estes objetos
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Não é possível modificar este objeto através de uma demarcação da região
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Não é possível modificar estes objetos através de uma demarcação da região
+	</panel.string>
 	<panel.string name="text modify warning">
 		O objeto contém links ligando suas partes
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Comprar objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
+			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Preço: L$" name="Edit Cost"/>
 		<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
+		<text name="pathfinding_attributes_label">
+			Atributos do pathfinding:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 342a52356b..2eb4c0a02e 100644..100755
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,10 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=pt-BR
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -400,6 +403,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="SLappAgentRequestFriend">
 		Pedido de amizade
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Remoção de amigo
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Fechar (⌘W)
 	</string>
@@ -571,8 +577,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AvatarAway">
 		Distante
 	</string>
-	<string name="AvatarBusy">
-		Ocupado
+	<string name="AvatarDoNotDisturb">
+		Não perturbe
 	</string>
 	<string name="AvatarMuted">
 		Mudo
@@ -787,6 +793,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="multiple_textures">
 		Múltiplo
 	</string>
+	<string name="use_texture">
+		Usar textura
+	</string>
 	<string name="texture_loading">
 		Carregando...
 	</string>
@@ -808,6 +817,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ST_NO_JOINT">
 		Não é possível encontrar a raiz (ROOT) ou junção (JOINT).
 	</string>
+	<string name="NearbyChatTitle">
+		Bate-papo local
+	</string>
+	<string name="NearbyChatLabel">
+		(Bate-papo local)
+	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -835,6 +850,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OBJECTNAME]&apos;, um objeto de  &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Se você permitir acesso à sua conta, o objeto também poderá:
+	</string>
 	<string name="ScriptTakeMoney">
 		Tomar linden dólares (L$) de você
 	</string>
@@ -868,6 +886,27 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
+	<string name="AgentNameSubst">
+		(Você)
+	</string>
+	<string name="TeleportYourAgent">
+		Teletransportá-lo
+	</string>
+	<string name="JoinAnExperience">
+		Participar de uma experiência
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Suprimir alertas ao gerenciar listas de acesso ao terreno
+	</string>
+	<string name="OverrideYourAnimations">
+		Substituir suas animações padrão
+	</string>
+	<string name="ScriptReturnObjects">
+		Retornar objetos em seu nome
+	</string>
+	<string name="UnknownScriptPermission">
+		(desconhecido)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Público geral
 	</string>
@@ -946,17 +985,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="script_files">
 		Scripts
 	</string>
-	<string name="AvatarSetNotAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetAway">
-		deixar como ausente
-	</string>
-	<string name="AvatarSetNotBusy">
-		deixar como não ocupado
-	</string>
-	<string name="AvatarSetBusy">
-		Deixar como ocupado
+	<string name="dictionary_files">
+		Dicionários
 	</string>
 	<string name="shape">
 		Silhueta
@@ -1190,7 +1220,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1345,6 +1375,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="InvFolder favorite">
 		Meus favoritos
 	</string>
+	<string name="InvFolder Favorites">
+		Meus favoritos
+	</string>
+	<string name="InvFolder favorites">
+		Meus favoritos
+	</string>
 	<string name="InvFolder Current Outfit">
 		Look atual
 	</string>
@@ -1360,6 +1396,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="InvFolder Meshes">
 		Meshes:
 	</string>
+	<string name="InvFolder Received Items">
+		Itens recebidos
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Caixa de saída do lojista
+	</string>
 	<string name="InvFolder Friends">
 		Amigos
 	</string>
@@ -1890,6 +1932,12 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		HUD direito inferior
 	</string>
+	<string name="ATTACH_NECK">
+		Pescoço
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Centro do avatar
+	</string>
 	<string name="CursorPos">
 		Linha [LINE], Coluna [COLUMN]
 	</string>
@@ -1902,8 +1950,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="PanelContentsNewScript">
 		Novo Script
 	</string>
-	<string name="BusyModeResponseDefault">
-		O residente para o qual escreveu está no modo &apos;ocupado&apos;, ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
+	<string name="DoNotDisturbModeResponseDefault">
+		Este residente ativou o &quot;Não perturbe&quot; e verá sua mensagem mais tarde.
 	</string>
 	<string name="MuteByName">
 		(por nome)
@@ -2016,9 +2064,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Conteúdo
-	</string>
 	<string name="AcquiredItems">
 		Itens adquiridos
 	</string>
@@ -2879,6 +2924,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="Hip Width">
 		Largura do quadril
 	</string>
+	<string name="Hover">
+		Pairar
+	</string>
 	<string name="In">
 		Dentro
 	</string>
@@ -3732,7 +3780,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Região em geral
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatar visíveis e bate-papo permitido fora deste terreno
+		Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		O pathfinding dinâmico não está habilitado nesta região.
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Atualização
@@ -3803,6 +3857,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Para visualizar esta mensagem, você deve desmarcar &quot;Apenas amigos e grupos podem me ligar ou enviar MIs&quot; em Preferências/Privacidade.
 	</string>
+	<string name="OnlineStatus">
+		Conectado
+	</string>
+	<string name="OfflineStatus">
+		Desconectado
+	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
@@ -3812,6 +3872,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Você entrou na ligação
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Você recusou automaticamente a chamada de voz enquanto &quot;Não perturbe&quot; estava ativado.
+	</string>
 	<string name="name_started_call">
 		[NAME] iniciou uma ligação de voz
 	</string>
@@ -3824,6 +3887,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Saiu da ligação de voz
 	</string>
+	<string name="conference-title">
+		Bate-papo com várias pessoas
+	</string>
 	<string name="conference-title-incoming">
 		Conversa com [AGENT_NAME]
 	</string>
@@ -4699,6 +4765,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Label">
 		Bate-papo
 	</string>
+	<string name="Command_Conversations_Label">
+		Conversas
+	</string>
 	<string name="Command_Compass_Label">
 		Bússola
 	</string>
@@ -4774,6 +4843,9 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Tooltip">
 		Bater papo com pessoas próximas usando texto
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Conversar com todos
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Bússola
 	</string>
@@ -4867,6 +4939,21 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Nenhum
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Afeta o navmesh
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personagem
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Múltiplo)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Muito baixo
 	</string>
@@ -4882,4 +4969,22 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="snapshot_quality_very_high">
 		Muito alto
 	</string>
+	<string name="TeleportMaturityExceeded">
+		O residente não pode visitar a região.
+	</string>
+	<string name="UserDictionary">
+		[Usuário]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
+	</string>
+	<string name="loading_chat_logs">
+		Carregando...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 3fb77a02d2..40fb4caebf 100644..100755
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -43,6 +43,9 @@ Vá para a &apos;Ilha Welcome Pública&apos; para repetir o tutorial.
 		<message name="no_inventory_host">
 			O sistema de inventário está indisponível no momento.
 		</message>
+		<message name="MustGetAgeRegion">
+			Você deve ter 18 anos ou mais para acessar esta região.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -78,5 +81,8 @@ Vá para a &apos;Ilha Welcome Pública&apos; para repetir o tutorial.
 		<message name="requesting">
 			Solicitando teletransporte...
 		</message>
+		<message name="pending">
+			Teletransporte pendente...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/pt/xui_version.xml b/indra/newview/skins/default/xui/pt/xui_version.xml
index 0e777751d3..0e777751d3 100644..100755
--- a/indra/newview/skins/default/xui/pt/xui_version.xml
+++ b/indra/newview/skins/default/xui/pt/xui_version.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_aaa.xml b/indra/newview/skins/default/xui/ru/floater_aaa.xml
index aa18a4a4a3..aa18a4a4a3 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/ru/floater_aaa.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 119f104906..9494106e96 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -8,7 +8,9 @@
 		Использован компилятор [COMPILER], версия [COMPILER_VERSION]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Вы в точке [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Вы в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(глобальные координаты [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -62,27 +64,26 @@
 		</panel>
 		<panel label="Лицензии" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK (C) 1992-2007 3Dconnexion
-        APR (C) 2000-2004 The Apache Software Foundation
-        Collada DOM (C) 2005 Sony Computer Entertainment Inc.
-        cURL (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK (C) 1992-2009 3Dconnexion
+        APR (C) 2011 The Apache Software Foundation
+        Collada DOM (C) 2006 Sony Computer Entertainment Inc.
+        cURL (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib (C) 2002, 2003  CodeFactory AB / (C) 2003, 2004 Red Hat, Inc.
         expat (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType (C) 1996-2002, 2006 David Turner, Robert Wilhelm и Werner Lemberg.
         GL (C) 1999-2004 Brian Paul.
         GLOD (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Университет Джона Гопкинса и David Luebke, Brenden Schubert, Университет Вирджинии.
         google-perftools (c) 2005, Google Inc.
         Havok.com(TM) (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 (C) 2001, David Taubman, Университет Нового Южного Уэльса (UNSW)
         jpeglib (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis (C) 2001, Xiphophorus
-        OpenSSL (C) 1998-2002 The OpenSSL Project.
-        PCRE (c) 1997-2008, Кембриджский университет
+        ogg/vorbis (C) 2002, Xiphophorus
+        OpenSSL (C) 1998-2008 The OpenSSL Project.
+        PCRE (c) 1997-2012, Кембриджский университет
         SDL (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi (C) 2000 Epinions, Inc.
-        zlib (C) 1995-2002 Jean-loup Gailly и Mark Adler.
-        google-perftools (c) 2005, Google Inc.
+        zlib (C) 1995-2012 Jean-loup Gailly и Mark Adler.
 
         В клиенте Second Life используется технология Havok (TM) Physics. (C) 1999-2010 Havok.com Inc. (и лицензиары компании). Все права защищены. Подробнее см. веб-сайт www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
index ee74aad5cc..12691df684 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -451,7 +451,7 @@
 				Разрешить доступ только таким жителям:
 			</text>
 			<check_box label="Зарегистрирована информация об оплате [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Для доступа к этому участку у жителя должна быть зарегистрирована информация об оплате.  Более подробная информация находится здесь: [SUPPORT_SITE]."/>
-			<check_box label="Подтвержден возраст [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Для доступа к этому участку житель должен подтвердить свой возраст. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
+			<check_box label="18 лет и старше [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Доступ к этому участку имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
 			<check_box label="Разрешить доступ группе: [GROUP]" name="GroupCheck" tool_tip="Группа устанавливается на основной вкладке."/>
 			<check_box label="Продать доступ:" name="PassCheck" tool_tip="Разрешить временный доступ к участку."/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/ru/floater_activeim.xml b/indra/newview/skins/default/xui/ru/floater_activeim.xml
index adfa277822..adfa277822 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/ru/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml
index 711afc2717..711afc2717 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
index 8ad9d8657a..8ad9d8657a 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_preview.xml
deleted file mode 100644
index b7075fbf97..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_animation_preview.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		Невозможно инициализировать движение
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Длина файла анимации: [LENGTH] с.
-Максимальная длина анимации: [MAX_LENGTH] с.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Невозможно прочитать файл анимации.
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		ОК
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Преждевременный конец файла.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Не могу прочитать определение ограничений.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Не удалось открыть BVH-файл.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Неправильный заголовок HIERARCHY.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Не удалось найти ROOT или JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Не удалось получить имя JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Не удалось найти OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Не удалось найти CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Не удалось получить порядок вращения.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Не удалось получить оси вращения.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Не удалось найти MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Не удалось получить количество кадров.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Не удалось получить время кадра.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Не удалось получить значения position.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Не удалось получить значения rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Не удалось открыть файл перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Не удалось прочитать заголовок перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Не удалось прочитать имена перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Не удалось прочитать значение перевода ignore.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Не удалось прочитать значение перевода relative.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Не удалось прочитать значение перевода outname.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Не удалось прочитать матрицу перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Не удалось получить имя mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Не удалось получить имя mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Не удалось получить значение priority.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Не удалось получить значение loop.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Не удалось получить значения easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Не удалось получить значения easeOut.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Не удалось получить значение hand morph.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Не удалось прочитать имя emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Неверное имя корневого соединения, должно быть «hip».
-	</floater.string>
-	<text name="name_label">
-		Название:
-	</text>
-	<text name="description_label">
-		Описание:
-	</text>
-	<spinner label="Приоритет" name="priority" tool_tip="Управляет тем, как другие анимации могут перекрываться этой"/>
-	<check_box label="Цикл" name="loop_check" tool_tip="Делает анимацию зацикленной"/>
-	<spinner label="Начало(%)" name="loop_in_point" tool_tip="Устанавливает точку возврата цикла"/>
-	<spinner label="Конец(%)" name="loop_out_point" tool_tip="Устанавливает точку конца цикла"/>
-	<text name="hand_label">
-		Положение пальцев
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Контролирует положение пальцев во время анимации">
-		<combo_box.item label="Разведены" name="Spread"/>
-		<combo_box.item label="Расслаблены" name="Relaxed"/>
-		<combo_box.item label="Указывают" name="PointBoth"/>
-		<combo_box.item label="Сжаты в кулаки" name="Fist"/>
-		<combo_box.item label="Левые расслаблены" name="RelaxedLeft"/>
-		<combo_box.item label="Левые указывают" name="PointLeft"/>
-		<combo_box.item label="Левые в кулак" name="FistLeft"/>
-		<combo_box.item label="Правые расслаблены" name="RelaxedRight"/>
-		<combo_box.item label="Правые указывают" name="PointRight"/>
-		<combo_box.item label="Правые в кулак" name="FistRight"/>
-		<combo_box.item label="Правые в приветствии" name="SaluteRight"/>
-		<combo_box.item label="Печатают" name="Typing"/>
-		<combo_box.item label="Правые «V»" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Выражение лица
-	</text>
-	<combo_box name="emote_combo" tool_tip="Контролирует выражение лица во время анимации">
-		<item label="(нет)" name="[None]" value=""/>
-		<item label="Ааааах" name="Aaaaah" value="Ааааах"/>
-		<item label="Боится" name="Afraid" value="Боится"/>
-		<item label="Злится" name="Angry" value="Злится"/>
-		<item label="Широко улыбается" name="BigSmile" value="Широко улыбается"/>
-		<item label="Скучает" name="Bored" value="Скучает"/>
-		<item label="Плачет" name="Cry" value="Плачет"/>
-		<item label="Презирает" name="Disdain" value="Презирает"/>
-		<item label="Смущается" name="Embarrassed" value="Смущается"/>
-		<item label="Хмурится" name="Frown" value="Хмурится"/>
-		<item label="Целует" name="Kiss" value="Целует"/>
-		<item label="Смеется" name="Laugh" value="Смеется"/>
-		<item label="Дразнится" name="Plllppt" value="Дразнится"/>
-		<item label="Не соглашается" name="Repulsed" value="Не соглашается"/>
-		<item label="Грустит" name="Sad" value="Грустит"/>
-		<item label="Не понимает" name="Shrug" value="Не понимает"/>
-		<item label="Улыбается" name="Smile" value="Улыбается"/>
-		<item label="Удивляется" name="Surprise" value="Удивляется"/>
-		<item label="Подмигивает" name="Wink" value="Подмигивает"/>
-		<item label="Беспокоится" name="Worry" value="Беспокоится"/>
-	</combo_box>
-	<text name="preview_label">
-		Просмотр во время
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Просмотр вашей анимации во время выполнения аватаром действий.">
-		<item label="Стояние" name="Standing" value="Стояние"/>
-		<item label="Ходьба" name="Walking" value="Ходьба"/>
-		<item label="Сидение" name="Sitting" value="Сидение"/>
-		<item label="Полет" name="Flying" value="Полет"/>
-	</combo_box>
-	<spinner label="Вход (сек.)" name="ease_in_time" tool_tip="Количество времени (в секундах) для входа в стартовое положение"/>
-	<spinner label="Выход (сек.)" name="ease_out_time" tool_tip="Количество времени (в секундах) для выхода из анимации"/>
-	<button name="play_btn" tool_tip="Проиграть анимацию"/>
-	<button name="pause_btn" tool_tip="Приостановить анимацию"/>
-	<button name="stop_btn" tool_tip="Остановить проигрывание анимации"/>
-	<text name="bad_animation_text">
-		Невозможно прочитать файл анимации.
-Рекомендуется использовать BVH-файлы, экспортированные из Poser 4.
-	</text>
-	<button label="Передать (L$[AMOUNT])" name="ok_btn"/>
-	<button label="Отмена" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml
index d84dc2e941..105c75c919 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_auction.xml
+++ b/indra/newview/skins/default/xui/ru/floater_auction.xml
@@ -3,7 +3,7 @@
 	<floater.string name="already for sale">
 		Нельзя выставить на аукцион участки, которые уже продаются.
 	</floater.string>
-	<check_box initial_value="истина" label="Включая желтую ограду вокруг выбранного участка" name="fence_check"/>
+	<check_box initial_value="true" label="Включая желтую ограду вокруг выбранного участка" name="fence_check"/>
 	<button label="Снимок" label_selected="Снимок" name="snapshot_btn"/>
 	<button label="Купить может каждый" label_selected="Купить может каждый" name="sell_to_anyone_btn"/>
 	<button label="Очистить настройки" label_selected="Очистить настройки" name="reset_parcel_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
new file mode 100755
index 0000000000..6827931e5d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Настройки автозамены">
+	<check_box label="Включить автозамену" name="autoreplace_enable" tool_tip="В чате по мере ввода текста ключевые слова будут заменяться соответствующими заменителями"/>
+	<button label="Импорт списка..." name="autoreplace_import_list" tool_tip="Загрузить ранее экспортированный список из файла."/>
+	<button label="Экспорт списка..." name="autoreplace_export_list" tool_tip="Сохранить выбранный список в файл для последующего распространения."/>
+	<button label="Новый список..." name="autoreplace_new_list" tool_tip="Создать новый список."/>
+	<button label="Удалить список" name="autoreplace_delete_list" tool_tip="Удалить выбранный список."/>
+	<button name="autoreplace_list_up" tool_tip="Повысить приоритет списка."/>
+	<button name="autoreplace_list_down" tool_tip="Понизить приоритет списка."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Ключевое слово" name="keyword"/>
+		<scroll_list.columns label="Замена" name="replacement"/>
+	</scroll_list>
+	<button label="Добавить..." name="autoreplace_add_entry"/>
+	<button label="Удалить" name="autoreplace_delete_entry"/>
+	<button label="Сохранить запись" name="autoreplace_save_entry" tool_tip="Сохранить эту запись."/>
+	<button label="Сохранить изменения" name="autoreplace_save_changes" tool_tip="Сохранить все изменения."/>
+	<button label="Отмена" name="autoreplace_cancel" tool_tip="Отменить все изменения."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar.xml b/indra/newview/skins/default/xui/ru/floater_avatar.xml
index b480af9345..b480af9345 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/ru/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
index edcc35d2b9..edcc35d2b9 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml
index cb39f66247..cb39f66247 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ru/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_beacons.xml b/indra/newview/skins/default/xui/ru/floater_beacons.xml
index 38d257ff81..38d257ff81 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ru/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_build_options.xml b/indra/newview/skins/default/xui/ru/floater_build_options.xml
index 9dd01dc823..9dd01dc823 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/ru/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
index ccf13cf02a..304bf97dc1 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="ИЗМЕНИТЬ РАЗРЕШЕНИЯ НА ИСПОЛЬЗОВАНИЕ КОНТЕНТА">
+<floater name="floaterbulkperms" title="НАСТРОИТЬ РАЗРЕШЕНИЯ НА ИСПОЛЬЗОВАНИЕ КОНТЕНТА">
 	<floater.string name="nothing_to_modify_text">
 		В выбранной области нет контента, который можно изменять.
 	</floater.string>
@@ -24,7 +24,7 @@
 	<button label="√ Все" name="check_all"/>
 	<button label="Очистить" label_selected="Нет" name="check_none"/>
 	<text name="newperms">
-		Новые разрешения на контент
+		Настроить разрешения на использование контента:
 	</text>
 	<text name="GroupLabel">
 		Группа:
@@ -39,7 +39,8 @@
 	</text>
 	<check_box label="Изменять" name="next_owner_modify"/>
 	<check_box label="Копировать" name="next_owner_copy"/>
-	<check_box initial_value="истина" label="Передать" name="next_owner_transfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
-	<button label="ОК" name="apply"/>
+	<check_box initial_value="true" label="Передать" name="next_owner_transfer" tool_tip="Следующий владелец может отдать или перепродать объект"/>
+	<button label="OK" name="ok"/>
+	<button label="Применить" name="apply"/>
 	<button label="Отмена" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_bumps.xml b/indra/newview/skins/default/xui/ru/floater_bumps.xml
index f81f728290..f81f728290 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml
index b1d66ae14d..b1d66ae14d 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/ru/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
index 87e8bd524e..87e8bd524e 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/ru/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml
index ac8ad469fb..ac8ad469fb 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_land.xml b/indra/newview/skins/default/xui/ru/floater_buy_land.xml
index 907a795393..907a795393 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_buy_object.xml b/indra/newview/skins/default/xui/ru/floater_buy_object.xml
index d25f9eccc2..d25f9eccc2 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/ru/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_camera.xml b/indra/newview/skins/default/xui/ru/floater_camera.xml
index 52e7c62e06..52e7c62e06 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ru/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
index 79b7b033fb..f6b2fc81e1 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ru/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="ЛОКАЛЬНЫЙ ЧАТ">
+<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
 	<panel name="bottom_panel">
 		<line_editor label="Щелкните здесь для общения." name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
 		<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_choose_group.xml b/indra/newview/skins/default/xui/ru/floater_choose_group.xml
index ab8350f539..ab8350f539 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/ru/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_color_picker.xml b/indra/newview/skins/default/xui/ru/floater_color_picker.xml
index b7034bef0b..b7034bef0b 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/ru/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
new file mode 100644
index 0000000000..090ac7193a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА">
+	<panel name="buttons_panel">
+		<filter_editor label="Фильтр для людей" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
new file mode 100644
index 0000000000..23225fcf56
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="РАЗГОВОР:">
+	<floater.string name="Title">
+		РАЗГОВОР: [NAME]
+	</floater.string>
+	<text name="page_label" value="Страница"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_critical.xml b/indra/newview/skins/default/xui/ru/floater_critical.xml
index bc64f3a83e..bc64f3a83e 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_critical.xml
+++ b/indra/newview/skins/default/xui/ru/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
index 3303a4f4c1..3303a4f4c1 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/ru/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml
index 5ba0841564..5ba0841564 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/ru/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_display_name.xml b/indra/newview/skins/default/xui/ru/floater_display_name.xml
index feb8a2721f..feb8a2721f 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/ru/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
index 61d708c567..61d708c567 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ru/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
index 354120ea72..354120ea72 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/ru/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
index f6def86380..f6def86380 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/ru/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_env_settings.xml b/indra/newview/skins/default/xui/ru/floater_env_settings.xml
deleted file mode 100644
index a3e77d61de..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="РЕДАКТОР СРЕДЫ">
-	<floater.string name="timeStr">
-		[hour,datetime,utc]:[min,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Время суток
-	</text>
-	<text name="EnvTimeText2">
-		12:00
-	</text>
-	<text name="EnvCloudText">
-		Облачность
-	</text>
-	<text name="EnvWaterColorText">
-		Цвет воды
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Щелкните для выбора цвета"/>
-	<text name="EnvWaterFogText">
-		Водный туман
-	</text>
-	<button label="Использовать время в землевладении" name="EnvUseEstateTimeButton"/>
-	<button label="Улучшенное небо" name="EnvAdvancedSkyButton"/>
-	<button label="Улучшенная вода" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
index d752c08cbb..d752c08cbb 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_event.xml b/indra/newview/skins/default/xui/ru/floater_event.xml
index 5c5bcc6d09..5c5bcc6d09 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_event.xml
+++ b/indra/newview/skins/default/xui/ru/floater_event.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
index 20936b8494..20936b8494 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_font_test.xml b/indra/newview/skins/default/xui/ru/floater_font_test.xml
index b51732d3f1..b51732d3f1 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/ru/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_gesture.xml b/indra/newview/skins/default/xui/ru/floater_gesture.xml
index 759d81b2c6..759d81b2c6 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/ru/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_god_tools.xml b/indra/newview/skins/default/xui/ru/floater_god_tools.xml
index 81329475aa..81329475aa 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_goto_line.xml b/indra/newview/skins/default/xui/ru/floater_goto_line.xml
new file mode 100644
index 0000000000..51caaa471d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ПЕРЕЙТИ НА СТРОКУ">
+	<button label="OK" label_selected="OK" name="goto_btn"/>
+	<text name="txt">
+		Перейти на строку
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
index 7400f1df3b..d7da112a27 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
@@ -24,7 +24,11 @@
 	<text name="Enable VBO:">
 		Включить VBO:
 	</text>
-	<check_box initial_value="истина" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение этого параметра на современном оборудовании даст увеличение производительности.  Однако на старом оборудовании это может привести к сбою приложения."/>
+	<check_box initial_value="true" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение этого параметра на современном оборудовании даст увеличение производительности.  Однако на старом оборудовании это может привести к сбою приложения."/>
+	<text name="tc label">
+		Включить S3TC:
+	</text>
+	<check_box initial_value="true" label="Разрешить сжатие текстур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текстур в видеопамяти, что позволяет загружать текстуры большего размера за счет некоторого падения качества цвета."/>
 	<slider label="Память для текстур (Мб):" name="GraphicsCardTextureMemory" tool_tip="Количество памяти, отводимое для текстур. По умолчанию равно памяти видеокарты. Уменьшение поможет увеличить производительность, но текстуры могут стать размытыми."/>
 	<spinner label="Дистанция тумана:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_help_browser.xml b/indra/newview/skins/default/xui/ru/floater_help_browser.xml
index 2f560340ed..2f560340ed 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/ru/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_how_to.xml b/indra/newview/skins/default/xui/ru/floater_how_to.xml
index 52525e5d33..52525e5d33 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/ru/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_hud.xml b/indra/newview/skins/default/xui/ru/floater_hud.xml
index b05113bfe0..b05113bfe0 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ru/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
index b147cfa2b3..eba7a19cd4 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/>
+<multi_floater name="floater_im_box" title="ОБЩЕНИЕ">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/>
+					<button name="add_btn" tool_tip="Начать разговор"/>
+					<button name="speak_btn" tool_tip="Разговаривать через микрофон"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/>
+					<text name="stub_textbox">
+						Разговор отображается в отдельном окне.   [secondlife:/// Вернуть.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index 604d9dc6d3..d4ca04b88b 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Кому" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/>
+	<floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/>
+	<floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/>
+	<floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/>
+	<floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/>
+	<floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<button name="add_btn" tool_tip="Добавить участника в этот разговор"/>
+				<button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/>
+				<button name="close_btn" tool_tip="Завершить этот разговор"/>
+				<button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Переводить чат" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Кому" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_image_preview.xml b/indra/newview/skins/default/xui/ru/floater_image_preview.xml
index dbc4c32b98..dbc4c32b98 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_import_collada.xml b/indra/newview/skins/default/xui/ru/floater_import_collada.xml
index 122315cb26..122315cb26 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/ru/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
index 072c20147d..3f61421d0c 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		анонимно
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		вызывает.
+		вызывает вас.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		теперь участвует в групповом голосовом чате.
@@ -25,9 +25,9 @@
 		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</floater.string>
 	<text name="question">
-		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
+		Если вы ответите, вы покинете текущий голосовой чат.
 	</text>
-	<button label="Принять" label_selected="Принять" name="Accept"/>
-	<button label="Отклонить" label_selected="Отклонить" name="Reject"/>
-	<button label="Начать IM" name="Start IM"/>
+	<button label="Ответить" label_selected="Ответить" name="Accept"/>
+	<button label="Игнорировать" label_selected="Игнорировать" name="Reject"/>
+	<button label="Открыть IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inspect.xml b/indra/newview/skins/default/xui/ru/floater_inspect.xml
index f7bb981575..f7bb981575 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory.xml b/indra/newview/skins/default/xui/ru/floater_inventory.xml
deleted file mode 100644
index 35cbcf177d..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_inventory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="МОЙ ИНВЕНТАРЬ">
-	<panel label="Панель инвентаря" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
index 9021b71fe2..9021b71fe2 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
index 02068c57b8..02068c57b8 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_joystick.xml b/indra/newview/skins/default/xui/ru/floater_joystick.xml
index 66568563da..66568563da 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ru/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
index c420006a03..c420006a03 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ru/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
index 17d347867d..17d347867d 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
index d8047fc045..fb6e747592 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
@@ -10,6 +10,6 @@
 		СКРИПТ: [NAME]
 	</floater.string>
 	<button label="Сброс" label_selected="Сброс" name="Reset"/>
-	<check_box initial_value="истина" label="Выполняется" name="running"/>
-	<check_box initial_value="истина" label="Моно" name="mono"/>
+	<check_box initial_value="true" label="Выполняется" name="running"/>
+	<check_box initial_value="true" label="Моно" name="mono"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml
index 95a3b8b2a0..95a3b8b2a0 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ru/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_map.xml b/indra/newview/skins/default/xui/ru/floater_map.xml
index 59ceb0a773..59ceb0a773 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_map.xml
+++ b/indra/newview/skins/default/xui/ru/floater_map.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_media_browser.xml b/indra/newview/skins/default/xui/ru/floater_media_browser.xml
index d1fc105046..d1fc105046 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ru/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_media_settings.xml b/indra/newview/skins/default/xui/ru/floater_media_settings.xml
index 1515cbb3b8..1515cbb3b8 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml
index 7aa5c27cde..7aa5c27cde 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ru/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
index 332fa3b82f..332fa3b82f 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
index 5bb96b8de4..0c6d41b4ef 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Треугольники" name="triangles" value="Треугольники"/>
 				<text initial_value="Вершины" name="vertices" value="Вершины"/>
 				<text initial_value="Высокий" name="high_label" value="Высокий"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Средний" name="medium_label" value="Средний"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+					<item name="Use LoD above" value="Использовать УД выше"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Низкий" name="low_label" value="Низкий"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+					<item name="Use LoD above" value="Использовать УД выше"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Самый низкий" name="lowest_label" value="Самый низкий"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+					<item name="Use LoD above" value="Использовать УД выше"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Генерировать нормали" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_model_wizard.xml b/indra/newview/skins/default/xui/ru/floater_model_wizard.xml
deleted file mode 100644
index c1a63bf7da..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="ПЕРЕДАТЬ МАСТЕР МОДЕЛИРОВАНИЯ">
-	<button label="5. Передать" name="upload_btn"/>
-	<button label="4. Просмотр" name="review_btn"/>
-	<button label="3. Физика" name="physics_btn"/>
-	<button label="2. Оптимизировать" name="optimize_btn"/>
-	<button label="1. Выбрать файл" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Выберите файл модели
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Пользователям, работающим в расширенном режиме: если вы умеете создавать трехмерные графические объекты, то, возможно, захотите воспользоваться средством Advanced Uploader, которое предоставляет расширенные возможности передачи объектов.
-			</text>
-			<button label="Перейти в расширенный режим" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Выберите файл модели для передачи
-			</text>
-			<button label="Обзор..." label_selected="Обзор..." name="browse"/>
-			<text name="Model types">
-				В Second Life поддерживаются файлы COLLADA (.dae)
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				ВНИМАНИЕ!
-			</text>
-			<text name="warning_text">
-				Вы не сможете завершить передачу этой модели на серверы Second Life. [secondlife:///app/floater/learn_more Узнайте, как] настроить в вашем аккаунте передачу сеточных моделей.
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Оптимизировать модель
-			</text>
-		</panel>
-		<text name="optimize_description">
-			Мы оптимизировали модель для повышения быстродействия. По желанию можно выполнить дополнительную настройку.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Создать уровень детализации: Высокий
-			</text>
-			<text name="medium_detail_text">
-				Создать уровень детализации: Средний
-			</text>
-			<text name="low_detail_text">
-				Создать уровень детализации: Низкий
-			</text>
-			<text name="lowest_detail_text">
-				Создать уровень детализации: Самый низкий
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Пересчитать геометрию" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Просмотр геометрии
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Детализация при предварительном просмотре">
-				<combo_item name="high">
-					Детально
-				</combo_item>
-				<combo_item name="medium">
-					Средняя детализация
-				</combo_item>
-				<combo_item name="low">
-					Мало деталей
-				</combo_item>
-				<combo_item name="lowest">
-					Минимум деталей
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Настроить физические параметры
-			</text>
-		</panel>
-		<text name="physics_description">
-			Мы создадим форму для внешнего каркаса модели. Настройте уровень детализации формы в соответствии с целями, для которых предназначена модель.
-		</text>
-		<panel name="physics_content">
-			<button label="Пересчитать физические данные" name="recalculate_physics_btn"/>
-			<button label="Пересчет..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Просмотр физических данных
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Уровень детализации при предварительном просмотре">
-				<combo_item name="high">
-					Детально
-				</combo_item>
-				<combo_item name="medium">
-					Средняя детализация
-				</combo_item>
-				<combo_item name="low">
-					Мало деталей
-				</combo_item>
-				<combo_item name="lowest">
-					Минимум деталей
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				Просмотр
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Воздействие на участок/регион: эквивалент в примитивах: [EQUIV]
-			</text>
-			<text name="review_fee">
-				За передачу с вашего счета будет снята плата в размере L$[FEE].
-			</text>
-			<text name="review_confirmation">
-				Нажав кнопку «Передать», вы подтверждаете, что у вас есть надлежащие права на все составляющие модели.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Передача завершена
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Ваша модель передана.
-		</text>
-		<text name="inventory_text">
-			Находится в папке «Объекты» вашего инвентаря.
-		</text>
-		<text name="charged_fee">
-			С вашего счета снято: L$[FEE].
-		</text>
-	</panel>
-	<button label="&lt;&lt; Назад" name="back"/>
-	<button label="Далее &gt;&gt;" name="next"/>
-	<button label="Рассчитать вес и плату &gt;&gt;" name="calculate"/>
-	<button label="Расчет..." name="calculating"/>
-	<button label="Передать" name="upload" tool_tip="Передать в симулятор"/>
-	<button label="Отмена" name="cancel"/>
-	<button label="Закрыть" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Неактивно
-	</string>
-	<string name="status_parse_error">
-		Проблема при анализе файла DAE – см. подробности в журнале.
-	</string>
-	<string name="status_reading_file">
-		Загрузка...
-	</string>
-	<string name="status_generating_meshes">
-		Создаются меши...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Ошибка. Число вершин превышает 65534. Прервано.
-	</string>
-	<string name="bad_element">
-		Ошибка: недопустимый элемент
-	</string>
-	<string name="high">
-		высокий
-	</string>
-	<string name="medium">
-		средний
-	</string>
-	<string name="low">
-		низкий
-	</string>
-	<string name="lowest">
-		самый низкий
-	</string>
-	<string name="mesh_status_good">
-		Доставлено!
-	</string>
-	<string name="mesh_status_na">
-		Н/Д
-	</string>
-	<string name="mesh_status_none">
-		Нет
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Отличается число текстурируемых граней на уровнях детализации.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Отличается число экземпляров меша на уровнях детализации.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		Слишком много вершин на уровне детализации.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Отсутствует необходимый уровень детализации.
-	</string>
-	<string name="layer_all">
-		Все
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_moveview.xml b/indra/newview/skins/default/xui/ru/floater_moveview.xml
index cb1fda1a1f..cb1fda1a1f 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_mute_object.xml b/indra/newview/skins/default/xui/ru/floater_mute_object.xml
index 44177acb53..44177acb53 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ru/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml
index b90d80f3fd..b90d80f3fd 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/ru/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml
index 534d2a5774..534d2a5774 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
deleted file mode 100644
index 184c753e40..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
-	<check_box label="Перевод чата" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_notification.xml b/indra/newview/skins/default/xui/ru/floater_notification.xml
index c3e299202c..c3e299202c 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_notification.xml
+++ b/indra/newview/skins/default/xui/ru/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml
index bd836590e1..bd836590e1 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_object_weights.xml b/indra/newview/skins/default/xui/ru/floater_object_weights.xml
index 41e0118732..41e0118732 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/ru/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_openobject.xml b/indra/newview/skins/default/xui/ru/floater_openobject.xml
index 5da308eecb..5da308eecb 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/ru/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml
index 301206e473..301206e473 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/ru/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml
index 5e50a75b85..5e50a75b85 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..ce7ffc3d20
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Персонажи с поиском пути">
+	<floater.string name="messaging_get_inprogress">
+		Опрос персонажей с поиском пути...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Ошибка при опросе персонажей с поиском пути.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Нет персонажей с поиском пути.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Выбрано персонажей: [NUM_SELECTED] из [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] мкс
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Загрузка]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Неизвестно]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[группа]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Имя" name="name"/>
+			<scroll_list.columns label="Описание" name="description"/>
+			<scroll_list.columns label="Владелец" name="owner"/>
+			<scroll_list.columns label="ЦП" name="cpu_time"/>
+			<scroll_list.columns label="Высота" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Персонажи:
+		</text>
+		<button label="Обновить список" name="refresh_objects_list"/>
+		<button label="Выбрать все" name="select_all_objects"/>
+		<button label="Отменить выбор" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Действия с выбранными персонажами:
+		</text>
+		<check_box label="Показать метку" name="show_beacon"/>
+		<check_box label="Показать физическую капсулу" name="show_physics_capsule"/>
+		<button label="Взять" name="take_objects"/>
+		<button label="Сделать копию" name="take_copy_objects"/>
+		<button label="Телепортировать меня туда" name="teleport_me_to_object" tool_tip="Разрешено, только если выбран один персонаж."/>
+		<button label="Возврат" name="return_objects"/>
+		<button label="Удалить" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..fa72df04fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Просмотр/тестирование поиска пути">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Не удалось найти реализацию библиотеки поиска пути
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Ожидание окончания загрузки региона.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Проверка состояния навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Загрузка навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		На сервере изменилась навигационная сетка. Загрузка новой навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Загружена последняя навигационная сетка.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Не удалось загрузить навигационную сетку.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		В навигационной сетке есть незавершенные изменения.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Идет построение навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		В некоторых регионах навигационной сетки есть незавершенные изменения.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Идет построение регионов навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		В некоторых регионах навигационной сетки есть незавершенные изменения, идет построение других регионов.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Навигационная сетка уже обновлена.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Не удалось найти реализацию библиотеки поиска пути
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Выберите начальную и конечную точки.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Выберите начальную точку.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Выберите конечную точку.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Путь показан оранжевым цветом.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Не удалось найти путь между выбранными точками.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Ошибка при создании пути.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Вид" name="view_panel">
+			<text name="show_label">
+				Показать:
+			</text>
+			<check_box label="Мир" name="show_world"/>
+			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
+			<check_box label="Навигационная сетка" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Показать карту проходимости:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Не показывать" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Тип персонажа A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Тип персонажа B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Тип персонажа C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Тип персонажа D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Проходимые места" name="show_walkables"/>
+			<check_box label="Материальные объемы" name="show_material_volumes"/>
+			<check_box label="Статичные препятствия" name="show_static_obstacles"/>
+			<check_box label="Исключающие объемы" name="show_exclusion_volumes"/>
+			<check_box label="Водное зеркало" name="show_water_plane"/>
+			<check_box label="Рентгеновское зрение" name="show_xray"/>
+		</panel>
+		<panel label="Проверить путь" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl-щелчок для выбора начальной точки.
+			</text>
+			<text name="shift_click_label">
+				Shift-щелчок для выбора конечной точки.
+			</text>
+			<text name="character_width_label">
+				Ширина персонажа
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				м
+			</text>
+			<text name="character_type_label">
+				Тип персонажа
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Нет" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Удалить путь" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..db100fa415
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Наборы связей для поиска пути">
+	<floater.string name="messaging_get_inprogress">
+		Запрос наборов связей для поиска пути...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Ошибка при запросе наборов связей для поиска пути.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Изменение выбранных наборов связей для поиска пути...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Ошибка при изменении выбранных наборов связей для поиска пути.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Нет наборов связей для поиска пути.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Выбрано наборов связей: [NUM_SELECTED] из [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Ландшафт]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Загрузка]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Неизвестно]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[группа]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Да
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		Нет
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Неизвестно
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Проходимое место
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Статичное препятствие
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Перемещаемое препятствие
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Материальный объем
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Исключающий объем
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Перемещаемый фантом
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[неизменяемый]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[ограниченный]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[вогнутый]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[ограниченный,вогнутый]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Выберите степень использования наборов связей...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Фильтр по степени использования наборов связей..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Проходимое место" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Статичное препятствие" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Перемещаемое препятствие" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Материальный объем" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Исключающий объем" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Перемещаемый фантом" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Применить" name="apply_filters"/>
+		<button label="Чисто" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Имя (корневой примитив)" name="name"/>
+			<scroll_list.columns label="Описание (корневой примитив)" name="description"/>
+			<scroll_list.columns label="Владелец" name="owner"/>
+			<scroll_list.columns label="Скриптовые" name="scripted"/>
+			<scroll_list.columns label="Воздействие" name="land_impact"/>
+			<scroll_list.columns label="Расстояние" name="dist_from_you"/>
+			<scroll_list.columns label="Использование набора связей" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Наборы связей:
+		</text>
+		<button label="Обновить список" name="refresh_objects_list"/>
+		<button label="Выбрать все" name="select_all_objects"/>
+		<button label="Отменить выбор" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Показать метку" name="show_beacon"/>
+		<button label="Взять" name="take_objects"/>
+		<button label="Сделать копию" name="take_copy_objects"/>
+		<button label="Телепортировать меня туда" name="teleport_me_to_object"/>
+		<button label="Возврат" name="return_objects"/>
+		<button label="Удалить" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Проходимость:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Проходимость для персонажей типа A.  Пример персонажа – гуманоид."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Проходимость для персонажей типа B.  Пример персонажа – существо."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Проходимость для персонажей типа C.  Пример персонажа – механизм."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Проходимость для персонажей типа D.  Пример персонажа – иное."/>
+		<button label="Применить изменения" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Гуманоид)
+		</text>
+		<text name="suggested_use_b_label">
+			(Существо)
+		</text>
+		<text name="suggested_use_c_label">
+			(Механизм)
+		</text>
+		<text name="suggested_use_d_label">
+			(Иное)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pay.xml b/indra/newview/skins/default/xui/ru/floater_pay.xml
index 1471a7e133..1471a7e133 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_pay.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_pay_object.xml b/indra/newview/skins/default/xui/ru/floater_pay_object.xml
index 7d2da44ac1..7d2da44ac1 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_people.xml b/indra/newview/skins/default/xui/ru/floater_people.xml
index 7abc34986a..7abc34986a 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_people.xml
+++ b/indra/newview/skins/default/xui/ru/floater_people.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
index a704b87bd1..626f3c9321 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
@@ -8,7 +8,7 @@
 		</text>
 		<check_box label="изменять" name="next_owner_modify"/>
 		<check_box label="копировать" name="next_owner_copy"/>
-		<check_box initial_value="истина" label="перепродавать/отдавать" name="next_owner_transfer"/>
+		<check_box initial_value="true" label="перепродавать/отдавать" name="next_owner_transfer"/>
 	</panel>
 	<button label="ОК" label_selected="ОК" name="ok"/>
 	<button label="Отмена" label_selected="Отмена" name="cancel"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_picks.xml b/indra/newview/skins/default/xui/ru/floater_picks.xml
index e0ae8d6f03..e0ae8d6f03 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_picks.xml
+++ b/indra/newview/skins/default/xui/ru/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_places.xml b/indra/newview/skins/default/xui/ru/floater_places.xml
index 2a22a855ef..2a22a855ef 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_places.xml
+++ b/indra/newview/skins/default/xui/ru/floater_places.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_post_process.xml b/indra/newview/skins/default/xui/ru/floater_post_process.xml
index ae97670548..ae97670548 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ru/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_postcard.xml b/indra/newview/skins/default/xui/ru/floater_postcard.xml
deleted file mode 100644
index 889d219511..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_postcard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ПОСЛАТЬ СНИМОК ПО EMAIL">
-	<floater.string name="default_subject">
-		Открытка из [SECOND_LIFE].
-	</floater.string>
-	<floater.string name="default_message">
-		Побывай здесь!
-	</floater.string>
-	<floater.string name="upload_message">
-		Отправка...
-	</floater.string>
-	<text name="to_label">
-		Email получателя:
-	</text>
-	<text name="from_label">
-		Ваш Email:
-	</text>
-	<text name="name_label">
-		Ваше имя:
-	</text>
-	<text name="subject_label">
-		Тема:
-	</text>
-	<line_editor label="Введите тему письма." name="subject_form"/>
-	<text name="msg_label">
-		Сообщение:
-	</text>
-	<text_editor name="msg_form">
-		Введите текст письма.
-	</text_editor>
-	<button label="Отмена" name="cancel_btn"/>
-	<button label="Отправить" name="send_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml
index fc244b9d8b..fc244b9d8b 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
index 4eecfedf17..13cff2bcbe 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Proxy Settings Floater" title="Настройки прокси-сервера">
-	<check_box initial_value="ложь" label="Использовать HTTP-прокси для веб-страниц" name="web_proxy_enabled"/>
+	<check_box initial_value="false" label="Использовать HTTP-прокси для веб-страниц" name="web_proxy_enabled"/>
 	<text name="http_proxy_label">
 		HTTP-прокси:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
index 22c6bc5901..22c6bc5901 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
index fde2cea00e..fde2cea00e 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
index 2f39d4a4a4..2f39d4a4a4 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml
index 691b2f3e82..691b2f3e82 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
index c9cb87282a..c9cb87282a 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml
index fd513c8cdb..fd513c8cdb 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/ru/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml
index b9e33d6e22..b9e33d6e22 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/ru/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml
index d413a0bdcc..d413a0bdcc 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_region_info.xml b/indra/newview/skins/default/xui/ru/floater_region_info.xml
index 011b58e385..011b58e385 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ru/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
index 6fdbdacadc..6fdbdacadc 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/ru/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug.xml b/indra/newview/skins/default/xui/ru/floater_script_debug.xml
index b91fc4e4ff..b91fc4e4ff 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_script_limits.xml b/indra/newview/skins/default/xui/ru/floater_script_limits.xml
index 7805eac03b..7805eac03b 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_script_preview.xml b/indra/newview/skins/default/xui/ru/floater_script_preview.xml
index 78cefb7aa7..78cefb7aa7 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_script_queue.xml b/indra/newview/skins/default/xui/ru/floater_script_queue.xml
index 4f2e389b19..4f2e389b19 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_script_search.xml b/indra/newview/skins/default/xui/ru/floater_script_search.xml
index fc040f6593..fc040f6593 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/ru/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_search.xml b/indra/newview/skins/default/xui/ru/floater_search.xml
index 405a6598ac..405a6598ac 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_search.xml
+++ b/indra/newview/skins/default/xui/ru/floater_search.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_select_key.xml b/indra/newview/skins/default/xui/ru/floater_select_key.xml
index 99c2b9a2c4..99c2b9a2c4 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ru/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_sell_land.xml b/indra/newview/skins/default/xui/ru/floater_sell_land.xml
index e15f761101..e15f761101 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml
index 7db014ef53..db78d11e90 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="settings_debug" title="НАСТРОЙКИ ОТЛАДКИ">
 	<radio_group name="boolean_combo">
-		<radio_item label="ИСТИНА" name="TRUE" value="истина"/>
+		<radio_item label="ИСТИНА" name="TRUE" value="true"/>
 		<radio_item label="ЛОЖЬ" name="FALSE" value=""/>
 	</radio_group>
 	<color_swatch label="Цвет" name="val_color_swatch"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_snapshot.xml b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
index 7e88630b32..7e88630b32 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ru/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
index fc8de858cd..fc8de858cd 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml
index 6fdb12b76b..6fdb12b76b 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml
new file mode 100755
index 0000000000..691b4a89c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Настройки проверки правописания">
+	<check_box label="Включить проверку правописания" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Основной словарь:
+	</text>
+	<text label="Журналы:" name="spellcheck_additional">
+		Дополнительные словари:
+	</text>
+	<text name="spellcheck_available">
+		Доступно
+	</text>
+	<text name="spellcheck_active">
+		Активно
+	</text>
+	<button label="Удалить" name="spellcheck_remove_btn"/>
+	<button label="Импорт..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..a01866db73
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Импорт словаря">
+	<button label="Обзор" label_selected="Обзор" name="dictionary_path_browse"/>
+	<button label="Импорт" name="ok_btn"/>
+	<button label="Отмена" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
index b1f60c8029..46426495dc 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="Треугольников в секунду" name="ktrissec"/>
 					<stat_bar label="Всего объектов" name="objs"/>
 					<stat_bar label="Новых объектов" name="newobjs"/>
+					<stat_bar label="Частота попаданий в кэш объектов" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Текстура" name="texture">
+					<stat_bar label="Частота попаданий в кэш" name="texture_cache_hits"/>
+					<stat_bar label="Задержка чтения кэша" name="texture_cache_read_latency"/>
 					<stat_bar label="Количество" name="numimagesstat"/>
 					<stat_bar label="Необраб. изображений" name="numrawimagesstat"/>
 					<stat_bar label="Память GL" name="gltexmemstat"/>
@@ -50,7 +53,13 @@
 				<stat_bar label="Объекты" name="simobjects"/>
 				<stat_bar label="Активные объекты" name="simactiveobjects"/>
 				<stat_bar label="Активные скрипты" name="simactivescripts"/>
+				<stat_bar label="Запущенные скрипты" name="simpctscriptsrun"/>
 				<stat_bar label="События скрипта" name="simscripteps"/>
+				<stat_view label="Поиск пути" name="simpathfinding">
+					<stat_bar label="Время шага ИИ" name="simsimaistepmsec"/>
+					<stat_bar label="Пропущенные силуэтные шаги" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Обновленные персонажи" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Входящие пакеты" name="siminpps"/>
 				<stat_bar label="Исходящие пакеты" name="simoutpps"/>
 				<stat_bar label="Отложенные загрузки" name="simpendingdownloads"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_sys_well.xml b/indra/newview/skins/default/xui/ru/floater_sys_well.xml
index b6975ac9ab..b6975ac9ab 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/ru/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_telehub.xml b/indra/newview/skins/default/xui/ru/floater_telehub.xml
index 799fd57b5b..799fd57b5b 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/ru/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml
index b479d5f6d6..b479d5f6d6 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/ru/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml
index d0bd86160e..d0bd86160e 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/ru/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index d55daea836..c9e117362f 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -9,15 +9,27 @@
 	<text name="Multiple">
 		Несколько текстур
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Инвентарь" name="inventory" value="0"/>
+		<radio_item label="Локально" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Размер: [DIMENSIONS]
 	</text>
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
-	<button label="Нет" label_selected="Нет" name="None"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
-	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
+	<button label="Нет" label_selected="Нет" name="None"/>
+	<check_box initial_value="true" label="Применить сейчас" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
-	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
+	<check_box initial_value="false" label="Показывать папки" name="show_folders_check"/>
+	<button label="Добавить" label_selected="Добавить" name="l_add_btn"/>
+	<button label="Удалить" label_selected="Удалить" name="l_rem_btn"/>
+	<button label="Передать" label_selected="Передать" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Имя" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="ОК" label_selected="ОК" name="Select"/>
 	<button label="Отмена" label_selected="Отмена" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..628e6c5c87
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Отладчик извлечения текстур">
+	<text name="total_num_fetched_label">
+		1, Общее количество извлеченных текстур: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Общее количество запросов на извлечение: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Общее количество попаданий в кэш: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Общее количество видимых текстур: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Общее количество запросов на извлечение видимых текстур: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Общий объем извлеченных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Общий объем видимых данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Общий объем визуализированных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Общее время чтения из кэша: [TIME] с
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Общее время записи в кэш: [TIME] с
+	</text>
+	<text name="total_time_decode_label">
+		11, Общее время декодирования: [TIME] с
+	</text>
+	<text name="total_time_gl_label">
+		12, Общее время создания текстур: [TIME] с
+	</text>
+	<text name="total_time_http_label">
+		13, Общее время HTTP-извлечения: [TIME] с
+	</text>
+	<text name="total_time_fetch_label">
+		14, Общее время полного извлечения: [TIME] с
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Повторное извлечение из кэша, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, Повторное извлечение всех текстур из кэша, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, Повторное извлечение из HTTP, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, Повторное извлечение всех текстур из HTTP, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
+	</text>
+	<spinner label="19, Отношение текселы/пикселы:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, Истояник текстур:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Кэш + HTTP" name="0"/>
+		<radio_item label="Только HTTP" name="1"/>
+	</radio_group>
+	<button label="Пуск" name="start_btn"/>
+	<button label="Сброс" name="clear_btn"/>
+	<button label="Закрыть" name="close_btn"/>
+	<button label="Чтение кэша" name="cacheread_btn"/>
+	<button label="Запись в кэш" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Декодировать" name="decode_btn"/>
+	<button label="Текстура GL" name="gl_btn"/>
+	<button label="Повторно извлечь из кэша" name="refetchviscache_btn"/>
+	<button label="Повторно извлечь все из кэша" name="refetchallcache_btn"/>
+	<button label="Повторно извлечь из HTTP" name="refetchvishttp_btn"/>
+	<button label="Повторно извлечь все из HTTP" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
index 3d7d1198f0..35921d147f 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tools.xml
@@ -76,8 +76,8 @@
 	<text label="Растяжка обеих сторон" name="checkbox uniform label">
 		Растяжка обеих сторон
 	</text>
-	<check_box initial_value="истина" label="Растягивать текстуры" name="checkbox stretch textures"/>
-	<check_box initial_value="истина" label="Привязка" name="checkbox snap to grid"/>
+	<check_box initial_value="true" label="Растягивать текстуры" name="checkbox stretch textures"/>
+	<check_box initial_value="true" label="Привязка" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="Выберите тип линейки сетки для размещения объекта">
 		<combo_box.item label="Мировая" name="World"/>
 		<combo_box.item label="Локальная" name="Local"/>
@@ -101,7 +101,7 @@
 	<button name="ToolGrass" tool_tip="Трава"/>
 	<check_box label="Держать инструмент" name="checkbox sticky"/>
 	<check_box label="Копировать выдел." name="checkbox copy selection"/>
-	<check_box initial_value="истина" label="Центрир. копию" name="checkbox copy centers"/>
+	<check_box initial_value="true" label="Центрир. копию" name="checkbox copy centers"/>
 	<check_box label="Повернуть копию" name="checkbox copy rotates"/>
 	<radio_group name="land_radio_group">
 		<radio_item label="Выбрать землю" name="radio select land"/>
@@ -150,6 +150,12 @@
 			<panel.string name="text modify info 4">
 				Эти объекты нельзя изменять
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Этот объект нельзя изменять через границу региона
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Эти объекты нельзя изменять через границу региона
+			</panel.string>
 			<panel.string name="text modify warning">
 				Чтобы задать права доступа, нужно выделить объект целиком
 			</panel.string>
@@ -199,12 +205,12 @@
 				<combo_box.item label="Увеличение" name="Zoom"/>
 			</combo_box>
 			<check_box label="Для продажи:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Копировать" name="Copy"/>
 				<combo_box.item label="Контент" name="Contents"/>
 				<combo_box.item label="Оригинал" name="Original"/>
 			</combo_box>
-			<spinner label="Цена: L$" name="Edit Cost"/>
 			<check_box label="Показать в поиске" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -240,6 +246,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Атрибуты поиска пути:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Объект" name="Object">
 			<check_box label="Фиксированный" name="checkbox locked" tool_tip="Предотвращение перемещения или удаления объекта. Обычно эта функция полезна во время стройки для избежания нежелательных изменений."/>
@@ -454,16 +465,11 @@
 				<combo_box.item label="присоска" name="suction"/>
 				<combo_box.item label="переплетение" name="weave"/>
 			</combo_box>
-			<check_box initial_value="ложь" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных граних по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
-			<text name="rpt">
-				Повторов на грань
-			</text>
 			<spinner label="По горизонтали (U)" name="TexScaleU"/>
 			<check_box label="Разворот" name="checkbox flip s"/>
 			<spinner label="По вертикали (V)" name="TexScaleV"/>
 			<check_box label="Разворот" name="checkbox flip t"/>
 			<spinner label="Вращение˚" name="TexRot"/>
-			<spinner label="Повторов на метр" name="rptctrl"/>
 			<button label="Применить" label_selected="Применить" name="button apply"/>
 			<text name="tex offset">
 				Сдвиг текстуры
diff --git a/indra/newview/skins/default/xui/ru/floater_top_objects.xml b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
index a6ffe5c030..c7ece5c9c9 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Время
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Время моно
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Лучшие столкновения
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Название" name="name"/>
 		<scroll_list.columns label="Владелец" name="owner"/>
 		<scroll_list.columns label="Место" name="location"/>
+		<scroll_list.columns label="Участок" name="parcel"/>
 		<scroll_list.columns label="Время" name="time"/>
-		<scroll_list.columns label="Время моно" name="mono_time"/>
 		<scroll_list.columns label="URL-адреса" name="URLs"/>
+		<scroll_list.columns label="Память (КБ)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID объекта:
@@ -48,6 +46,10 @@
 		Владелец:
 	</text>
 	<button label="Фильтр" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Участок:
+	</text>
+	<button label="Фильтр" name="filter_parcel_btn"/>
 	<button label="Вернуть выбранное" name="return_selected_btn"/>
 	<button label="Вернуть все" name="return_all_btn"/>
 	<button label="Отключить выбранное" name="disable_selected_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml
index bd72f6b308..bd72f6b308 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_toybox.xml b/indra/newview/skins/default/xui/ru/floater_toybox.xml
index a4754ad7ab..a4754ad7ab 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/ru/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml
index ad280a50dd..ad280a50dd 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_url_entry.xml b/indra/newview/skins/default/xui/ru/floater_url_entry.xml
index 59f8dd0c31..59f8dd0c31 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ru/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..5a7e7a7061
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА">
+	<slider label="Голосовой чат" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
index 2b23086062..2b23086062 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
index 1eb8a94d7a..d3cef042a3 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА">
+<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
 	<string name="no_voice_effect">
 		(Нет изменения голоса)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
new file mode 100644
index 0000000000..aca6bd518a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА">
+	<slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_water.xml b/indra/newview/skins/default/xui/ru/floater_water.xml
deleted file mode 100644
index 5030351f5b..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="РАСШИРЕННЫЙ РЕДАКТОР ВОДЫ">
-	<floater.string name="WLDefaultWaterNames">
-		По умолчанию:глянец:пруд:туман:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Настройки воды:
-	</text>
-	<button label="Создать" label_selected="Создать" name="WaterNewPreset"/>
-	<button label="Сохранить" label_selected="Сохранить" name="WaterSavePreset"/>
-	<button label="Удалить" label_selected="Удалить" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="НАСТРОЙКИ" name="Settings">
-			<text name="BHText">
-				Цвет водного тумана
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Щелкните для выбора цвета"/>
-			<text name="WaterFogDensText">
-				Плотность тумана
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Подводный туман
-			</text>
-			<text name="BDensText">
-				Уровень отражения волн
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Масштаб Френеля
-			</text>
-			<text name="FresnelOffsetText">
-				Сдвиг Френеля
-			</text>
-			<text name="DensMultText">
-				Преломление над водой
-			</text>
-			<text name="WaterScaleBelowText">
-				Преломление под водой
-			</text>
-			<text name="MaxAltText">
-				Коэффициент размытия
-			</text>
-		</panel>
-		<panel label="ИЗОБРАЖЕНИЕ" name="Waves">
-			<text name="BHText">
-				Направление больших волн
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Направление маленьких волн
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Карта поверхности
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_web_content.xml b/indra/newview/skins/default/xui/ru/floater_web_content.xml
index 403ab0ef5d..403ab0ef5d 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/ru/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml
index 811a2756fa..811a2756fa 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ru/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/ru/floater_windlight_options.xml b/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
deleted file mode 100644
index bbb37aaaa0..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="РАСШИРЕННЫЙ РЕДАКТОР НЕБА">
-	<floater.string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Настройки неба:
-	</text>
-	<button label="Новая" label_selected="Новая" name="WLNewPreset"/>
-	<button label="Сохранить" label_selected="Сохранить" name="WLSavePreset"/>
-	<button label="Удалить" label_selected="Удалить" name="WLDeletePreset"/>
-	<button label="Редактор суточных циклов" label_selected="Редактор суточных циклов" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="АТМОСФЕРА" name="Atmosphere">
-			<text name="BHText">
-				Голубой горизонт
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Дымка на горизонте
-			</text>
-			<text name="BDensText2">
-				Насыщенность голубого
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Плотность дымки
-			</text>
-			<text name="DensMultText">
-				Коэффициент плотности
-			</text>
-			<text name="WLDistanceMultText">
-				Коэффициент расстояния
-			</text>
-			<text name="MaxAltText">
-				Максимальная высота
-			</text>
-		</panel>
-		<panel label="ОСВЕЩЕНИЕ" name="Lighting">
-			<text name="SLCText">
-				Цвет солнца/луны
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Положение солнца/луны
-			</text>
-			<text name="WLAmbientText">
-				Рассеянное
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Смещение относительно востока
-			</text>
-			<text name="SunGlowText">
-				Сияние солнца
-			</text>
-			<slider label="Фокус" name="WLGlowB"/>
-			<slider label="Размер" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Гамма-коррекция сцены
-			</text>
-			<text name="WLStarText">
-				Яркость звезд
-			</text>
-		</panel>
-		<panel label="ОБЛАКА" name="Clouds">
-			<text name="WLCloudColorText">
-				Цвет
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Положение и плотность
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				П
-			</text>
-			<text name="WLCloudCoverageText">
-				Облачность
-			</text>
-			<text name="WLCloudScaleText">
-				Размеры
-			</text>
-			<text name="WLCloudDetailText">
-				Детализация (положение/плотность)
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				П
-			</text>
-			<text name="WLCloudScrollXText">
-				Скорость по X
-			</text>
-			<check_box label="На месте" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Скорость по Y
-			</text>
-			<check_box label="На месте" name="WLCloudLockY"/>
-			<check_box label="Создать классические облака" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml
index 24865a6ba5..fbff6a72b2 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ru/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Задать размер окна:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="ширина x высота">
-		<combo_box.item label="1000 x 700 (по умолчанию)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (по умолчанию)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 WXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 UXGA)" name="item12"/>
 	</combo_box>
 	<button label="Задать" name="set_btn"/>
 	<button label="Отмена" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml
index ef8dfe22ae..7d2acfd9a0 100644..100755
--- a/indra/newview/skins/default/xui/ru/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ru/floater_world_map.xml
@@ -35,7 +35,7 @@
 		<text name="pg_label">
 			Общие
 		</text>
-		<check_box initial_value="истина" name="events_mature_chk"/>
+		<check_box initial_value="true" name="events_mature_chk"/>
 		<text name="events_mature_label">
 			Умеренные
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/inspect_avatar.xml b/indra/newview/skins/default/xui/ru/inspect_avatar.xml
index e38ae967cc..e38ae967cc 100644..100755
--- a/indra/newview/skins/default/xui/ru/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/ru/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/ru/inspect_group.xml b/indra/newview/skins/default/xui/ru/inspect_group.xml
index ca600b0a1f..ca600b0a1f 100644..100755
--- a/indra/newview/skins/default/xui/ru/inspect_group.xml
+++ b/indra/newview/skins/default/xui/ru/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/ru/inspect_object.xml b/indra/newview/skins/default/xui/ru/inspect_object.xml
index 1a43357cd3..1a43357cd3 100644..100755
--- a/indra/newview/skins/default/xui/ru/inspect_object.xml
+++ b/indra/newview/skins/default/xui/ru/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml
index eec4817f02..eec4817f02 100644..100755
--- a/indra/newview/skins/default/xui/ru/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/ru/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml
index 786e571527..786e571527 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
index fb1c24448b..76acb32a64 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Заморозить" name="Freeze..."/>
 	<menu_item_call label="Выкинуть" name="Eject..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
 	<menu_item_call label="Заплатить" name="Pay..."/>
 	<menu_item_call label="Профиль объекта" name="Object Inspect"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
index f241b48871..2b1291a8d5 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Мои группы" name="Groups..."/>
 	<menu_item_call label="Мой профиль" name="Profile..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Бросить" name="Drop"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml
index ac2b4be003..ac2b4be003 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
index fb283c9d80..dfe3c2e701 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Заморозить" name="Freeze..."/>
 	<menu_item_call label="Выкинуть" name="Eject..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
 	<menu_item_call label="Заплатить" name="Pay..."/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
index b72f3dcc42..e09117226c 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Мои группы" name="Groups..."/>
 	<menu_item_call label="Мой профиль" name="Profile..."/>
 	<menu_item_call label="Отладка текстур" name="Debug..."/>
+	<menu_item_call label="Вывод XML" name="Dump XML"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_bottomtray.xml b/indra/newview/skins/default/xui/ru/menu_bottomtray.xml
deleted file mode 100644
index fa3558945b..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Кнопка разговора" name="EnableVoiceChat"/>
-	<menu_item_check label="Кнопка жестов" name="ShowGestureButton"/>
-	<menu_item_check label="Кнопка движения" name="ShowMoveButton"/>
-	<menu_item_check label="Кнопка камеры" name="ShowCameraButton"/>
-	<menu_item_check label="Кнопка снимка" name="ShowSnapshotButton"/>
-	<menu_item_check label="Кнопка строительства" name="ShowBuildButton"/>
-	<menu_item_check label="Кнопка поиска" name="ShowSearchButton"/>
-	<menu_item_check label="Кнопка карты" name="ShowWorldMapButton"/>
-	<menu_item_check label="Кнопка миникарты" name="ShowMiniMapButton"/>
-	<menu_item_call label="Вырезать" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Копировать" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Вставить" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Удалить" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Выделить все" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml
index 72d1bc52b5..72d1bc52b5 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml
index ee0a0c70ed..ee0a0c70ed 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml
index bbdf4fd0d4..bbdf4fd0d4 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
index 0332c03a04..b7a32dfd75 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Новая одежда" name="COF.Gear.New_Clothes"/>
-	<menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
new file mode 100644
index 0000000000..4d1240db98
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
+	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
+	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
+	<menu_item_call label="Закрыть выбранные" name="close_selected_conversations"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Удалить друзей" name="remove_friends"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Блокировать голос" name="block_unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+	<menu_item_call label="Профиль группы" name="group_profile"/>
+	<menu_item_call label="Активировать группу" name="activate_group"/>
+	<menu_item_call label="Покинуть группу" name="leave_group"/>
+	<context_menu label="Параметры модератора" name="Moderator Options">
+		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
+		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/>
+		<menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..3fbffbe038
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM..." name="IM"/>
+	<menu_item_call label="Голосовой вызов..." name="Call"/>
+	<menu_item_call label="Открыть журнал чата..." name="Chat history"/>
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="Invite"/>
+	<menu_item_call label="Карта" name="Map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Черный список" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..928146e273
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по дате" name="sort_by_date"/>
+	<menu_item_check label="Сначала друзья" name="sort_by_friends"/>
+	<menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_edit.xml b/indra/newview/skins/default/xui/ru/menu_edit.xml
index 0dddea9c04..0dddea9c04 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_edit.xml
+++ b/indra/newview/skins/default/xui/ru/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_favorites.xml b/indra/newview/skins/default/xui/ru/menu_favorites.xml
index 074be06ba9..074be06ba9 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/ru/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
index d0b68cefbd..d0b68cefbd 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_group_plus.xml b/indra/newview/skins/default/xui/ru/menu_group_plus.xml
index edd012b964..edd012b964 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/ru/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml
index 34e5f4c0e4..34e5f4c0e4 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/ru/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
new file mode 100644
index 0000000000..1db0b8bae3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="Добавить друга" name="Add Friend"/>
+	<menu_item_call label="Удалить друга" name="remove_friend"/>
+	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Журнал чата..." name="chat_history"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Блокировать голос" name="Block/Unblock"/>
+	<menu_item_check label="Блокировать текст" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..35cff8e4bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Компактный вид" name="compact_view"/>
+	<menu_item_check label="Развернутый вид" name="expanded_view"/>
+	<menu_item_check label="Показать время" name="IMShowTime"/>
+	<menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml b/indra/newview/skins/default/xui/ru/menu_im_well_button.xml
deleted file mode 100644
index 5a5bde61b9..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Закрыть все" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml
index 8b60a585ab..8b60a585ab 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml
index 766b3847a7..766b3847a7 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml
index a33f6d5be8..a33f6d5be8 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/ru/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
index 957609a7a3..957609a7a3 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml
index 30953e830b..30953e830b 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
index 901bb615e0..901bb615e0 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml
index 95d162d7fe..95d162d7fe 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory.xml b/indra/newview/skins/default/xui/ru/menu_inventory.xml
index 49f7281b4e..37ee19fc1d 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="Удалить системную папку" name="Delete System Folder"/>
 	<menu_item_call label="Начать конференцию" name="Conference Chat Folder"/>
 	<menu_item_call label="Воспроизвести" name="Sound Play"/>
+	<menu_item_call label="Копировать URL SL" name="url_copy"/>
 	<menu_item_call label="О закладке" name="About Landmark"/>
 	<menu_item_call label="Проиграть для всех" name="Animation Play"/>
 	<menu_item_call label="Проиграть для себя" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml
index 9a240c653e..9a240c653e 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
index 9fc0b6d44e..9fc0b6d44e 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_land.xml b/indra/newview/skins/default/xui/ru/menu_land.xml
index 89889d7bf6..5aa4e6ccd2 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_land.xml
+++ b/indra/newview/skins/default/xui/ru/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Купить пропуск" name="Land Buy Pass"/>
 	<menu_item_call label="Строительство" name="Create"/>
 	<menu_item_call label="Изменить ландшафт" name="Edit Terrain"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_landmark.xml b/indra/newview/skins/default/xui/ru/menu_landmark.xml
index 24b60f9d86..24b60f9d86 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/ru/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 93a5ffbb25..835c4e186e 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Показать лицензионное соглашение" name="TOS"/>
 		<menu_item_call label="Показать сообщение об ошибке" name="Critical"/>
 		<menu_item_call label="Тест отладки плавающего окна с веб-контентом" name="Web Content Floater Debug Test"/>
-		<menu label="Уровень журнала" name="Set Logging Level"/>
+		<menu label="Уровень журнала" name="Set Logging Level">
+			<menu_item_check label="Отладка" name="Debug"/>
+			<menu_item_check label="Информация" name="Info"/>
+			<menu_item_check label="Внимание!" name="Warning"/>
+			<menu_item_check label="Ошибка" name="Error"/>
+			<menu_item_check label="Нет" name="None"/>
+		</menu>
 		<menu_item_check label="Выбор сетки" name="Show Grid Picker"/>
 		<menu_item_call label="Консоль уведомлений" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml
index d7485b02af..d7485b02af 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_mini_map.xml b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
index 6b3db11609..6b3db11609 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/ru/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_mode_change.xml b/indra/newview/skins/default/xui/ru/menu_mode_change.xml
deleted file mode 100644
index 25d6e9af27..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Основной" name="BasicMode"/>
-	<menu_item_check label="Расширенный" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
index 5ae5e7dfbc..5ae5e7dfbc 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_mute_particle.xml b/indra/newview/skins/default/xui/ru/menu_mute_particle.xml
new file mode 100644
index 0000000000..0c5a147419
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_navbar.xml b/indra/newview/skins/default/xui/ru/menu_navbar.xml
index 2dd0c0df36..2dd0c0df36 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/ru/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml
index 4b5346d083..4b5346d083 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
index 4d067e232a..4d067e232a 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/ru/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
index d6abfd12a2..056dab74c1 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object.xml
@@ -8,6 +8,8 @@
 	<menu_item_call label="Встать" name="Object Stand Up"/>
 	<menu_item_call label="Профиль объекта" name="Object Inspect"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
+	<menu_item_call label="Показывать в наборах связей" name="show_in_linksets"/>
+	<menu_item_call label="Показывать в персонажах" name="show_in_characters"/>
 	<context_menu label="Надеть" name="Put On">
 		<menu_item_call label="Надеть" name="Wear"/>
 		<menu_item_call label="Добавить" name="Add"/>
@@ -24,4 +26,5 @@
 	<menu_item_call label="Заплатить" name="Pay..."/>
 	<menu_item_call label="Купить" name="Buy..."/>
 	<menu_item_call label="Удалить" name="Delete"/>
+	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 6229b2e72f..0c50abcfbd 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Профиль объекта..." name="Object Profile"/>
 	<menu_item_call label="Блокировать..." name="Block"/>
+	<menu_item_call label="Показать на карте" name="show_on_map"/>
+	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index 93dbd7d6a7..d379a17216 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Новые волосы" name="New Hair"/>
 		<menu_item_call label="Новые глаза" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Открыть все папки" name="expand"/>
+	<menu_item_call label="Закрыть все папки" name="collapse"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
 	<menu_item_call label="Удалить костюм" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
index 46404195b9..46404195b9 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_list.xml b/indra/newview/skins/default/xui/ru/menu_participant_list.xml
index 932ad5bacf..932ad5bacf 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ru/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
new file mode 100644
index 0000000000..851a42d428
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/>
+	<menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/>
+	<menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/>
+	<menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/>
+	<menu_item_call label="Изменить настройки..." name="chat_preferences"/>
+	<menu_item_call label="Настройки приватности..." name="privacy_preferences"/>
+	<menu_item_check label="Журнал разговора..." name="Conversation"/>
+	<menu_item_check label="Перевести локальный чат" name="Translate_chat"/>
+	<menu_item_check label="Настройки перевода..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..157f2ad5e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Разблокировать" name="unblock"/>
+	<menu_item_call label="Профиль…" name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..f42e8f8609
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/>
+	<menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..8c0150e8ae
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по типу" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
new file mode 100644
index 0000000000..7b2dba0539
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
+	<menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
index 0fa252aa99..0fa252aa99 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
index e734a83ef0..78d73c9d1e 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Информация" name="View Info"/>
 	<menu_item_call label="Чат" name="Chat"/>
-	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Голосовой вызов" name="Call"/>
 	<menu_item_call label="Активация" name="Activate"/>
 	<menu_item_call label="Покинуть" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
new file mode 100644
index 0000000000..cbf1c64774
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
index 0358068db9..0358068db9 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index ebce959044..d05b7e7d01 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="В друзья" name="Add Friend"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Карта" name="Map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Черный список" name="Block/Unblock"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Смотреть профиль" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
+	<menu_item_call label="Голосовой вызов" name="voice_call"/>
+	<menu_item_call label="Посмотреть журнал чата..." name="chat_history"/>
+	<menu_item_call label="Добавить друга" name="add_friend"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
+	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
+	<menu_item_call label="Приблизить" name="zoom_in"/>
+	<menu_item_call label="Карта" name="map"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_check label="Черный список" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
index 0e8e0d4053..88eb56c9f5 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Добавить в друзья" name="Add Friends"/>
-	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="Звонок" name="Call"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
+	<menu_item_call label="Добавить в друзья" name="add_friends"/>
+	<menu_item_call label="Удалить из друзей" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="Звонок" name="call"/>
+	<menu_item_call label="Поделиться" name="share"/>
+	<menu_item_call label="Заплатить" name="pay"/>
+	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..2bc353ad58
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+	<menu_item_check label="Смотреть карту" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
index 4589815f6b..4589815f6b 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
new file mode 100644
index 0000000000..a009cf081f
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Сортировать по времени" name="sort_most"/>
+	<menu_item_check label="Сортировать по имени" name="sort_name"/>
+	<menu_item_check label="Показывать значки людей" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
index 2ac83ffe52..2ac83ffe52 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_picks.xml b/indra/newview/skins/default/xui/ru/menu_picks.xml
index 839c7411a6..839c7411a6 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_picks.xml
+++ b/indra/newview/skins/default/xui/ru/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml
index 1bc4078179..1bc4078179 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/ru/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_place.xml b/indra/newview/skins/default/xui/ru/menu_place.xml
index ee8878c131..ee8878c131 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_place.xml
+++ b/indra/newview/skins/default/xui/ru/menu_place.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
index b1a38fb9eb..b1a38fb9eb 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/ru/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml
index 25df8c5d19..25df8c5d19 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/ru/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
index b1ebd4af83..b1ebd4af83 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/ru/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml
index 1865fead7b..1865fead7b 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/ru/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml
index 88947e1433..88947e1433 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/ru/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml
index 6cacff3870..6cacff3870 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/ru/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_slurl.xml b/indra/newview/skins/default/xui/ru/menu_slurl.xml
index f02549055c..f02549055c 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ru/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml
index 332f2784b9..332f2784b9 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
index 6a22fd00dc..6a22fd00dc 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml
index 9b2434a310..9b2434a310 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/ru/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_text_editor.xml b/indra/newview/skins/default/xui/ru/menu_text_editor.xml
index 113dd85318..0c928308a1 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ru/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(неизвестно)" name="Suggestion 1"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 2"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 3"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 4"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 5"/>
+	<menu_item_call label="Добавить в словарь" name="Add to Dictionary"/>
+	<menu_item_call label="Добавить в список игнорируемых" name="Add to Ignore"/>
 	<menu_item_call label="Вырезать" name="Cut"/>
 	<menu_item_call label="Копировать" name="Copy"/>
 	<menu_item_call label="Вставить" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_toolbars.xml b/indra/newview/skins/default/xui/ru/menu_toolbars.xml
index aa05dbc390..aa05dbc390 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/ru/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml
index 76cadbe5a4..76cadbe5a4 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/ru/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 0ba3ee152a..fcd1fe310d 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать профиль жителя" name="show_agent"/>
+	<menu_item_call label="Смотреть профиль" name="show_agent"/>
+	<menu_item_call label="Отправить сообщение..." name="send_im"/>
+	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
+	<menu_item_call label="Удалить из друзей..." name="remove_friend"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_group.xml b/indra/newview/skins/default/xui/ru/menu_url_group.xml
index f25e2a7eb8..f25e2a7eb8 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_http.xml b/indra/newview/skins/default/xui/ru/menu_url_http.xml
index 781211b16f..781211b16f 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml
index 6127bf9868..6127bf9868 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_map.xml b/indra/newview/skins/default/xui/ru/menu_url_map.xml
index bbf64f20e9..bbf64f20e9 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 6e7800d3f5..4f5361b2e3 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Показать информацию об объекте" name="show_object"/>
+	<menu_item_call label="Профиль объекта..." name="show_object"/>
+	<menu_item_call label="Блокировать..." name="block_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml
index 84a679703a..84a679703a 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml
index 3d582ea2c5..3d582ea2c5 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml
index cbceafea21..cbceafea21 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml
index 2ecde09383..2ecde09383 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 0699314d97..fcb7c4e531 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Статус" name="Status">
-			<menu_item_call label="Нет на месте" name="Set Away"/>
-			<menu_item_call label="Не беспокоить" name="Set Busy"/>
+			<menu_item_check label="Нет на месте" name="Away"/>
+			<menu_item_check label="Не беспокоить" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
@@ -26,17 +26,25 @@
 		<menu_item_call label="Настройки..." name="Preferences"/>
 		<menu_item_call label="Кнопки панели инструментов..." name="Toolbars"/>
 		<menu_item_call label="Скрыть все элементы управления" name="Hide UI"/>
+		<menu_item_check label="Показывать присоединения HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
-		<menu_item_check label="Чат..." name="Nearby Chat"/>
+		<menu_item_check label="Разговоры..." name="Conversations"/>
+		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
-		<menu_item_check label="Настройки голоса..." name="Nearby Voice"/>
-		<menu_item_check label="Изменение голоса..." name="ShowVoice"/>
+		<menu_item_check label="Журнал разговора..." name="Conversation Log..."/>
+		<menu label="Изменение голоса" name="VoiceMorphing">
+			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
+			<menu_item_check label="Просмотр..." name="Preview"/>
+			<menu_item_call label="Подписаться..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Жесты..." name="Gestures"/>
-		<menu_item_call label="Друзья" name="My Friends"/>
-		<menu_item_call label="Группы" name="My Groups"/>
-		<menu_item_call label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_check label="Друзья" name="My Friends"/>
+		<menu_item_check label="Группы" name="My Groups"/>
+		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_call label="Черный список" name="Block List"/>
+		<menu_item_check label="Не беспокоить" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Мир" name="World">
 		<menu_item_call label="Добавить закладку на это место" name="Create Landmark Here"/>
@@ -105,13 +113,13 @@
 			<menu_item_call label="Включить следующую" name="Include Next Part"/>
 			<menu_item_call label="Включить предыдущую" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Наборы связей..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Фокус на выбранном" name="Focus on Selection"/>
 		<menu_item_call label="Приблизить к выбранному" name="Zoom to Selection"/>
 		<menu label="Объект" name="Object">
 			<menu_item_call label="Купить" name="Menu Object Buy"/>
 			<menu_item_call label="Взять" name="Menu Object Take"/>
 			<menu_item_call label="Взять копию" name="Take Copy"/>
-			<menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
 		</menu>
@@ -122,6 +130,11 @@
 			<menu_item_call label="Запустить скрипты" name="Set Scripts to Running"/>
 			<menu_item_call label="Остановить скрипты" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Поиск пути" name="Pathfinding">
+			<menu_item_call label="Наборы связей..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Персонажи..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Просмотр/тестирование..." name="pathfinding_console_menu_item"/>
+		</menu>
 		<menu label="Параметры" name="Options">
 			<menu_item_check label="Показать расширенные разрешения" name="DebugPermissions"/>
 			<menu_item_check label="Выбирать только мои объекты" name="Select Only My Objects"/>
@@ -172,7 +185,6 @@
 			<menu_item_check label="Скрыть частицы" name="Hide Particles"/>
 			<menu_item_check label="Скрыть выбранное" name="Hide Selected"/>
 			<menu_item_check label="Подсветка прозрачного" name="Highlight Transparent"/>
-			<menu_item_check label="Показывать присоединения HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Показывать прицел при обзоре мышью" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Типы визуализации" name="Rendering Types">
@@ -225,11 +237,10 @@
 			<menu_item_check label="Консоль текстур" name="Texture Console"/>
 			<menu_item_check label="Консоль отладки" name="Debug Console"/>
 			<menu_item_call label="Консоль уведомлений" name="Notifications"/>
-			<menu_item_check label="Консоль размера текстуры" name="Texture Size"/>
-			<menu_item_check label="Консоль категории текстуры" name="Texture Category"/>
 			<menu_item_check label="Оперативные таймеры" name="Fast Timers"/>
 			<menu_item_check label="Память" name="Memory"/>
 			<menu_item_check label="Статистика по сцене" name="Scene Statistics"/>
+			<menu_item_call label="Консоль отладки извлечения текстур" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Данные о регионе на консоль отладки" name="Region Info to Debug Console"/>
 			<menu_item_call label="Данны о группе на консоль отладки" name="Group Info to Debug Console"/>
 			<menu_item_call label="Данные о способностях на консоль отладки" name="Capabilities Info to Debug Console"/>
@@ -264,6 +275,7 @@
 			<menu_item_check label="Случайная частота кадров" name="Randomize Framerate"/>
 			<menu_item_check label="Периодическое замедление кадров" name="Periodic Slow Frame"/>
 			<menu_item_check label="Тест кадров" name="Frame Test"/>
+			<menu_item_call label="Профиль кадра" name="Frame Profile"/>
 		</menu>
 		<menu label="Визуализировать метаданные" name="Render Metadata">
 			<menu_item_check label="Рамки" name="Bounding Boxes"/>
@@ -287,14 +299,21 @@
 			<menu_item_check label="Сложность визуализации" name="rendercomplexity"/>
 			<menu_item_check label="Байты присоединения" name="attachment bytes"/>
 			<menu_item_check label="Лепка" name="Sculpt"/>
+			<menu label="Плотность текстуры" name="Texture Density">
+				<menu_item_check label="Нет" name="None"/>
+				<menu_item_check label="Текущая" name="Current"/>
+				<menu_item_check label="Желаемая" name="Desired"/>
+				<menu_item_check label="Полная" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Визуализация" name="Rendering">
 			<menu_item_check label="Оси" name="Axes"/>
 			<menu_item_check label="Касательный базис" name="Tangent Basis"/>
 			<menu_item_call label="Выбранная текстура в основе" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Сведения о выбранном материале" name="Selected Material Info"/>
 			<menu_item_check label="Каркас" name="Wireframe"/>
 			<menu_item_check label="Смыкание объектов" name="Object-Object Occlusion"/>
-			<menu_item_check label="Освещение и тени" name="Lighting and Shadows"/>
+			<menu_item_check label="Расширенная модель освещения" name="Advanced Lighting Model"/>
 			<menu_item_check label="Тени от солнца, луны и прожекторов" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO и сглаживание теней" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="Отладка GL" name="Debug GL"/>
@@ -304,8 +323,6 @@
 			<menu_item_check label="Текстуры анимаций" name="Animation Textures"/>
 			<menu_item_check label="Отключить текстуры" name="Disable Textures"/>
 			<menu_item_check label="Текстуры в полном разрешении" name="Rull Res Textures"/>
-			<menu_item_check label="Проверить текстуры" name="Audit Textures"/>
-			<menu_item_check label="Атлас текстур (экспериментальная функция)" name="Texture Atlas"/>
 			<menu_item_check label="Визуализация присоединенных источников света" name="Render Attached Lights"/>
 			<menu_item_check label="Визуализация присоединенных частиц" name="Render Attached Particles"/>
 			<menu_item_check label="Парящие светящиеся объекты" name="Hover Glow Objects"/>
@@ -341,7 +358,6 @@
 			<menu_item_call label="Вывод средства фокусировки" name="Dump Focus Holder"/>
 			<menu_item_call label="Печать информации о выбранных объектах" name="Print Selected Object Info"/>
 			<menu_item_call label="Печать информации об агенте" name="Print Agent Info"/>
-			<menu_item_call label="Статистическая информация о памяти" name="Memory Stats"/>
 			<menu_item_check label="Консоль отладки региона" name="Region Debug Console"/>
 			<menu_item_check label="Отладка SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Отладка щелчков мышью" name="Debug Clicks"/>
@@ -371,12 +387,10 @@
 				<menu_item_call label="Активировать геометрию персонажа" name="Toggle Character Geometry"/>
 				<menu_item_call label="Проверка мужчины" name="Test Male"/>
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
-				<menu_item_call label="Активировать PG-контент" name="Toggle PG"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
-			<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
 			<menu_item_check label="Показать указание" name="Show Point At"/>
 			<menu_item_check label="Отладка обновленных движений суставов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml
index 2832e17b7d..2832e17b7d 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml
index c2351fbfff..c2351fbfff 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
index f178b39c77..f178b39c77 100644..100755
--- a/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/ru/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/ru/mime_types.xml b/indra/newview/skins/default/xui/ru/mime_types.xml
index 7ed23b5d53..7ed23b5d53 100644..100755
--- a/indra/newview/skins/default/xui/ru/mime_types.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types.xml
diff --git a/indra/newview/skins/default/xui/ru/mime_types_linux.xml b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
index a42b0bb9cc..a42b0bb9cc 100644..100755
--- a/indra/newview/skins/default/xui/ru/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/ru/mime_types_mac.xml b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
index 7ed23b5d53..7ed23b5d53 100644..100755
--- a/indra/newview/skins/default/xui/ru/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/ru/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index b4692385d1..1dc8202b00 100644..100755
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -204,6 +210,14 @@
 Добавить эту способность к роли «[ROLE_NAME]»?
 		<usetemplate name="okcancelbuttons" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Вы собираетесь исключить [AVATAR_NAME] из группы.
+		<usetemplate ignoretext="Подтвердите исключение участника из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Вы собираетесь исключить [COUNT] участников из группы.
+		<usetemplate ignoretext="Подтвердите исключение участников из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Вы собираетесь сбросить свое присоединение.
     Продолжить?
@@ -360,13 +374,19 @@
 
 Для входа в [SECOND_LIFE] нужен аккаунт. Создать его?
 		<url name="url">
-			http://join.secondlife.com/
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Повторить попытку" yestext="Создать новый аккаунт"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Введите имя пользователя или имя и фамилию вашего аватара в поле «Имя пользователя», затем снова войдите в программу.
 	</notification>
+	<notification name="InvalidGrid">
+		«[GRID]» – недопустимый идентификатор сетки.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		В месте старта не указана правильная сетка.
+	</notification>
 	<notification name="DeleteClassified">
 		Удалить рекламу «[NAME]»?
 Плата за нее не будет возвращена.
@@ -472,8 +492,8 @@
 		Ошибка при сохранении скомпилированного скрипта по следующей причине: [REASON].  Попробуйте сохранить скрипт через некоторое время.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Ай-яй-яй, ваш стартовый регион не определен.
-Введите название региона в поле «Место старта» или выберите в качестве места старта «Мое последнее местоположение» или «Мой дом».
+		Ваш стартовый регион не определен.
+Введите название региона в поле «Место старта» или выберите в качестве места старта «Мое последнее место» или «Мой дом».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -495,6 +515,33 @@
 		</url>
 		<usetemplate ignoretext="Оборудование моего компьютера не поддерживается" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://www.intel.com/p/ru_RU/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=ru-ru
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -591,6 +638,9 @@
 
 Убедитесь, что все объекты разблокированы и что вы владеете всеми ими.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Объекты нельзя связывать через границу региона.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Невозможно объединить объекты: не у всех объектов один владелец.
 
@@ -969,6 +1019,41 @@
 			<button name="Cancel" text="Отмена"/>
 		</form>
 	</notification>
+	<notification label="Добавить список автозамены" name="AddAutoReplaceList">
+		Имя нового списка:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Переименовать список автозамены" name="RenameAutoReplaceList">
+		Имя «[DUPNAME]» уже занято.
+    Введите новое уникальное имя:
+		<form name="form">
+			<button name="ReplaceList" text="Заменить текущий список"/>
+			<button name="SetName" text="Использовать новое имя"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Ключевое слово должно быть одним словом, а поле замены не может быть пустым.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Недопустимый список замены.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Следует указать файл, имя и язык.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Словарь [DIC_NAME] не является aff-файлом, т. е. это «вспомогательный» словарь.
+Он может использоваться как дополнительный, но не как основной словарь.
+
+См. https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Невозможно скопировать
+    [FROM_NAME]
+    в
+    [TO_NAME]
+	</notification>
 	<notification label="Сохранить костюм" name="SaveOutfitAs">
 		Сохранить текущую одежду как новый костюм:
 		<form name="form">
@@ -1034,7 +1119,7 @@
 Введите более высокую цену.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Имеется ссылка, указывающая как минимум на один из выбранных вами предметов.  Если удалить этот предмет, его ссылки перестанут работать.  Настоятельно рекомендуется сначала удалить ссылки.
+		По крайней мере у одного предмета есть ссылки, указывающие на него.  Если удалить этот предмет, его ссылки перестанут работать.  Настоятельно рекомендуется сначала удалить ссылки.
 
 Действительно удалить эти предметы?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
@@ -1084,7 +1169,7 @@
 Вы не владеете по крайней мере одним объектом.
 
 Действительно удалить эти предметы?
-		<usetemplate name="okcancelbuttons" notext="отмена" yestext="OK"/>
+		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
 		Как минимум один объект фиксирован.
@@ -1148,7 +1233,7 @@
 Вы перемещены в соседний регион.
 	</notification>
 	<notification name="AvatarMovedLast">
-		Ваше последнее местоположение сейчас недоступно.
+		Требуемое вами местоположение сейчас недоступно.
 Вы перемещены в соседний регион.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1167,7 +1252,6 @@
 		Установка [APP_NAME] завершена.
 
 Если вы используете [SECOND_LIFE] впервые, для входа в программу вам потребуется создать аккаунт.
-Вернуться на [http://join.secondlife.com secondlife.com] для создания аккаунта?
 		<usetemplate name="okcancelbuttons" notext="Продолжить" yestext="Создать аккаунт..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
@@ -1404,13 +1488,43 @@ http://secondlife.com/download.
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
 		Загружено обязательное обновление.
-Версия [VERSION]
+Версия [VERSION]. [[INFO_URL] Сведения об этом обновлении]
 
 Необходимо перезапустить [APP_NAME] для установки обновления.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		Необходимо перезапустить [APP_NAME] для установки обновления.
+[[INFO_URL] Сведения об этом обновлении]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		Загружено обновление для вашей версии [APP_NAME].
+Версия [VERSION] 
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] об этом обновлении]
+		<usetemplate name="okcancelbuttons" notext="Позже..." yestext="Установите обновление и перезапустите [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		Загружено обновление для вашей версии [APP_NAME].
+Версия [VERSION]
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] Сведения об этом обновлении]
+		<usetemplate name="okcancelbuttons" notext="Позже..." yestext="Установите обновление и перезапустите [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Загружено обязательное обновление.
+Версия [VERSION]
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] Сведения об этом обновлении]
+
+Необходимо перезапустить [APP_NAME] для установки обновления.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Необходимо перезапустить [APP_NAME] для установки обновления.
+На замену этой экспериментальной версии клиента предлагается клиент [NEW_CHANNEL];
+см. [[INFO_URL] Сведения об этом обновлении]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1461,6 +1575,10 @@ http://secondlife.com/download.
 Хотите покинуть группу?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Невозможно покинуть группу. Вы не можете покинуть группу, так как вы ее последний владелец. Сначала назначьте владельцем другого участника.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Вы ДЕЙСТВИТЕЛЬНО хотите выбросить всех жителей с сетки?
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="Выбросить всех жителей"/>
@@ -1488,10 +1606,13 @@ http://secondlife.com/download.
 		Сейчас невозможно предложить дружбу. Повторите попытку через минуту.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Установлен режим «Занят».
-Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину.
-		<usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/>
+	<notification name="DoNotDisturbModeSet">
+		Режим «Не беспокоить» включен.  Вы не будете получать уведомлений о входящих вызовах.
+
+- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки &gt; Общие).
+- Предложения телепортации будут отклоняться.
+- Голосовые вызовы будут отклоняться.
+		<usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение.
@@ -1685,83 +1806,128 @@ http://secondlife.com/download.
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости. Возможно, это результат недостатка информации, подтверждающей ваш возраст.
-
-Убедитесь, что у вас установлена последняя версия клиента, и прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости.
-
-Перейти в Базу знаний и ознакомиться с рейтингами зрелости?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Я не могу войти в этот регион из-за ограничений по рейтингу зрелости" name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+		<usetemplate ignoretext="Пересечение региона: вы пытаетесь посетить регион, контент в котором предназначен только для взрослых." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости.
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Вам нельзя быть в этом регионе из-за вашей настройки рейтинга зрелости.
-
-Для входа в желаемый регион измените настройку рейтинга зрелости. После этого вам будет разрешено искать и просматривать контент [REGIONMATURITY]. Для отмены изменений выберите команды «Я &gt; Настройки &gt; Общие».
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Вы можете отказаться от посещения, или ваши настройки будут изменены. После изменения настроек вы можете попробовать войти в регион снова.
+		<form name="form">
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Пересечение региона: вы пытаетесь посетить регион, контент в котором запрещен вашими настройками."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		При телепортации возникли технические проблемы, так как ваши настройки не синхронизированы с сервером.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Телепортация: вы пытаетесь посетить регион, контент в котором предназначен только для взрослых." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Вы можете отказаться от телепортации, или ваши настройки будут изменены.
+		<form name="form">
+			<button name="OK" text="Изменить и продолжить"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Телепортация (возобновляемая): вы пытаетесь посетить регион, контент в котором запрещен вашими настройками."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Вы можете отказаться от телепортации, или ваши настройки будут изменены. После изменения настроек вы можете попробовать телепортироваться снова.
 		<form name="form">
-			<button name="OK" text="Изменить настройку"/>
-			<button name="Cancel" text="Закрыть"/>
-			<ignore name="ignore" text="Выбранная мной настройка рейтинга запрещает мне вход в регион"/>
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Телепортация (невозобновляемая): вы пытаетесь посетить регион, контент в котором запрещен вашими настройками."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		При телепортации возникли технические проблемы, так как ваши настройки не синхронизированы с сервером.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Теперь ваша настройка рейтинга зрелости: [RATING].
+		Вы больше не будете получать уведомлений о посещении региона с контентом рейтинга [RATING].  Настройки для контента можно изменить на будущее с помощью команд меню «Я &gt; Настройки &gt; Общие».
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Не удалось изменить ваши настройки так, чтобы вы могли видеть контент с рейтингом [PREFERRED_MATURITY].  Ваши теперешние настройки разрешают просматривать контент [ACTUAL_MATURITY].  Попробуйте изменить настройки снова с помощью команд меню «Я &gt; Настройки &gt; Общие».
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Вы не можете претендовать на эту землю из-за вашего рейтинга зрелости. Возможно, это результат недостатка информации, подтверждающей ваш возраст.
-
-Убедитесь, что у вас установлена последняя версия клиента, и прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы претендуете на землю, рейтинг зрелости контента на которой не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Вы не можете претендовать на эту землю из-за вашего рейтинга зрелости.
-
-Перейти в Базу знаний и ознакомиться с рейтингами зрелости?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		На эту землю могут претендовать только взрослые.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Я не могу претендовать на эту землю из-за ограничений по рейтингу зрелости" name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+		<usetemplate ignoretext="На эту землю могут претендовать только взрослые." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Вы не можете претендовать на эту землю из-за вашего рейтинга зрелости.
+		Вы претендуете на землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Вы претендуете на землю с контентом [REGIONMATURITY], который предназначен только для взрослых.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Вы не можете претендовать на эту землю из-за вашей настройки рейтинга зрелости.
-
-Нажмите кнопку «Изменить настройку», чтобы повысить свой рейтинг зрелости. После этого вам будет разрешено искать и просматривать контент [REGIONMATURITY]. Если в будущем понадобится отменить это изменение, выберите команды «Я &gt; Настройки &gt; Общие».
-		<usetemplate ignoretext="Выбранная мной настройка рейтинга запрещает мне претендовать на землю" name="okcancelignore" notext="Закрыть" yestext="Изменить настройку"/>
+		Вы претендуете на землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Мы можем изменить ваши настройки, после чего вы сможете претендовать на землю снова.
+		<form name="form">
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Вы претендуете на землю, контент на которой запрещен вашими настройками."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Вы не можете купить эту землю из-за вашего рейтинга зрелости. Возможно, это результат недостатка информации, подтверждающей ваш возраст.
-
-Убедитесь, что у вас установлена последняя версия клиента, и прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы пытаетесь купить землю, рейтинг зрелости контента на которой не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Вы не можете купить эту землю из-за вашего рейтинга зрелости.
-
-Перейти в Базу знаний и ознакомиться с рейтингами зрелости?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Эту землю могут купить только взрослые.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Я не могу купить эту землю из-за ограничений по рейтингу зрелости" name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+		<usetemplate ignoretext="Эту землю могут купить только взрослые." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Вы не можете купить эту землю из-за вашего рейтинга зрелости.
+		Вы пытаетесь купить землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Вы пытаетесь купить землю с контентом [REGIONMATURITY], который предназначен только для взрослых.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Вы не можете купить эту землю из-за выбранного вами рейтинга зрелости.
-
-Нажмите кнопку «Изменить настройку», чтобы повысить свой рейтинг зрелости. После этого вам будет разрешено искать и просматривать контент [REGIONMATURITY]. Если в будущем понадобится отменить это изменение, выберите команды «Я &gt; Настройки &gt; Общие».
-		<usetemplate ignoretext="Выбранная мной настройка рейтинга запрещает мне покупать землю" name="okcancelignore" notext="Закрыть" yestext="Изменить настройку"/>
+		Вы пытаетесь купить землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Мы можем изменить ваши настройки, после чего вы сможете попробовать купить землю снова.
+		<form name="form">
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Вы пытаетесь купить землю, контент на которой запрещен вашими настройками."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Выбрано слишком много примитивов.  Выберите [MAX_PRIM_COUNT] или меньше примитивов и повторите попытку.
@@ -1815,10 +1981,9 @@ http://secondlife.com/download.
 		</form>
 	</notification>
 	<notification label="Изменен рейтинг зрелости региона" name="RegionMaturityChange">
-		Рейтинг зрелости для этого региона будет обновлен.
+		Рейтинг зрелости для этого региона был изменен.
 Отображение этого изменения на карте может занять некоторое время.
-
-Для входа в регионы для взрослых у жителя должен быть подтвержденный аккаунт: либо с подтверждением возраста, либо с подтверждением оплаты.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Несоответствие версии голоса" name="VoiceVersionMismatch">
 		Данная версия [APP_NAME] несовместима с функцией голосового чата в этом регионе. Для правильной работы голосового чата необходимо обновить [APP_NAME].
@@ -1931,6 +2096,10 @@ http://secondlife.com/download.
 		Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта?
 		<usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		При добавлении участника в существующий разговор будет создан новый разговор.  Все участники получат уведомления о новом разговоре.
+		<usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Выйти из программы?
 		<usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/>
@@ -2005,14 +2174,14 @@ http://secondlife.com/download.
 			<button ignore="Не заменять" name="No" text="Отмена"/>
 		</form>
 	</notification>
-	<notification label="Предупреждение о режиме «Занят»" name="BusyModePay">
-		У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж.
+	<notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay">
+		Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж.
 
-Хотите отключить режим «Занят» до завершения этой транзакции?
+Отключить режим «Не беспокоить» перед завершением этой операции?
 		<form name="form">
-			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/>
-			<button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/>
-			<button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/>
+			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/>
+			<button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/>
+			<button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2108,14 +2277,11 @@ http://secondlife.com/download.
 		<usetemplate ignoretext="Надевать одежду, создаваемую при редактировании моей внешности" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Доступ к контенту и областям для взрослых в Second Life разрешен только с 18 лет. Посетите нашу страницу проверки возраста и подтвердите, что вам уже исполнилось 18. 
-Страница будет открыта в браузере.
-
-[_URL]
-		<url name="url">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Мой возраст не подтвержден" name="okcancelignore" notext="Отмена" yestext="Перейти к проверке возраста"/>
+		Вы пытаетесь посетить место, доступ в которое разрешен только жителям 18 лет и старше.
+		<usetemplate ignoretext="Мне еще рано посещать места с ограничениями по возрасту." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Это место разрешено для жителей 18 лет и старше.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Для посещения этой области необходимо зарегистрировать платеж.  Перейти на веб-сайт [SECOND_LIFE] и ввести эту информацию?
@@ -2150,11 +2316,8 @@ http://secondlife.com/download.
 	<notification name="GroupNotice">
 		Раздел: [SUBJECT], сообщение: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; в сети
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; не в сети
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Вы лучше всех, но нельзя добавить в друзья себя самого.
@@ -2275,9 +2438,7 @@ http://secondlife.com/download.
     выбрать команду «Телепортация».)
 	</notification>
 	<notification name="TeleportToPerson">
-		Чтобы обратиться к жителю, например «[NAME]», нажмите кнопку «Люди», выберите жителя в появившемся окне и нажмите кнопку
-    «IM» внизу окна.
-    (Также можно дважды щелкнуть имя жителя в списке или щелкнуть его правой кнопкой мыши и выбрать команду «IM».)
+		Чтобы начать личный разговор, щелкните аватар собеседника правой кнопкой мыши и выберите в меню «IM».
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Нельзя выбрать землю с обеих сторон границы между серверами.
@@ -2377,6 +2538,16 @@ http://secondlife.com/download.
 	<notification name="NoBuild">
 		В этой области запрещено строительство. Здесь вы не сможете строить или выкладывать объекты.
 	</notification>
+	<notification name="PathfindingDirty">
+		В регионе есть незавершенные изменения поиска пути.  Если у вас есть права на строительство, восстановите регион, нажав кнопку «Восстановить регион».
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		В этом регионе не разрешен динамический поиск пути.  Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Произошла ошибка.  Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство.  Иногда для устранения этой проблемы достаточно выйти и снова войти.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="SeeAvatars">
 		На этом участке аватары и текстовый чат скрыты от другого участка.   Жителей за пределами этого участка не будет видно, а они не будут видеть вас.  Обычный текстовый чат на канале 0 также блокируется.
 	</notification>
@@ -2395,9 +2566,7 @@ http://secondlife.com/download.
 		Вы можете претендовать на публичную землю только в регионе, в котором вы находитесь.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости. Подтвердите свой возраст и/или установите последнюю версию клиента.
-
-Прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 	</notification>
 	<notification name="URBannedFromRegion">
 		Вы забанены в регионе.
@@ -2408,11 +2577,11 @@ http://secondlife.com/download.
 	<notification name="ImproperPaymentStatus">
 		У вас нет необходимого статуса оплаты для входа в этот регион.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Для входа в этот регион необходимо подтверждение возраста.
+	<notification name="MustGetAgeRegion">
+		Входить в этот регион могут только жители 18 лет и старше.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Для входа на этот участок необходимо подтверждение возраста.
+		Входить на этот участок могут только жители 18 лет и старше.
 	</notification>
 	<notification name="NoDestRegion">
 		Не найден регион назначения.
@@ -2514,12 +2683,33 @@ http://secondlife.com/download.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] предложил(а) телепортировать вас к себе:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+«[MESSAGE]»
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Телепортация"/>
 			<button name="Cancel" text="Отмена"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:
+
+«[MESSAGE]»
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Этот регион содержит контент с рейтингом [REGION_CONTENT_MATURITY], но ваши настройки не допускают контента [REGION_CONTENT_MATURITY].  Вы можете отказаться от телепортации, или ваши настройки будут изменены.
+		<form name="form">
+			<button name="Teleport" text="Изменить и продолжить"/>
+			<button name="Cancel" text="Отмена"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:
+
+«[MESSAGE]»
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Однако этот регион содержит контент, доступный только для взрослых.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Предложение телепортации отправлено [TO_NAME]
 	</notification>
@@ -2614,16 +2804,21 @@ http://secondlife.com/download.
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;», владелец которого – «[NAME]», желает:
-
-[QUESTIONS]
-Если вы не доверяете этому объекту или его создателю, отклоните запрос.
-
-Принять этот запрос?
+		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
+  
+Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
-			<button name="Grant" text="Принять"/>
+			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
-			<button name="Details" text="Подробности..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		Объект &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» владельца «[NAME]» требует разрешения на выполнение скрипта; разрешение не распознается клиентом и не будет предоставлено
+
+Для получения этого разрешения установите последнюю версию клиента из [DOWNLOADURL].
+		<form name="form">
+			<button name="Deny" text="OK"/>
+			<button name="Mute" text="Заблокировать"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2927,6 +3122,10 @@ http://secondlife.com/download.
 		( [EXISTENCE] сек. жизни )
 Вы локально обновили готовую текстуру [RESOLUTION] для «[BODYREGION]» через [TIME] сек.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Просмотр этой текстуры невозможен, так как запрещено ее копирование и/или перенос.
+		<usetemplate ignoretext="Предупреждать, если режим просмотра вживую недоступен для текстур с запрещенным копированием и/или переносом" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Действительно покинуть этот разговор?
 		<usetemplate ignoretext="Подтверждать перед выходом из разговора" name="okcancelignore" notext="Нет" yestext="Да"/>
@@ -3098,6 +3297,62 @@ http://secondlife.com/download.
 		Это действие приведет к скрытию всех меню и кнопок. Чтобы вернуть их, щелкните [SHORTCUT] снова.
 		<usetemplate ignoretext="Подтверждать перед скрытием интерфейса" name="okcancelignore" notext="Отмена" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		Признак фантомности некоторых выбранных наборов связей будет изменен.
+
+Продолжить?
+		<usetemplate ignoretext="Признак фантомности некоторых выбранных наборов связей будет изменен." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Для некоторых выбранных наборов связей нельзя задать тип «[REQUESTED_TYPE]» из-за ограничений этих наборов.  Эти наборы связей будут иметь тип «[RESTRICTED_TYPE]».
+
+Продолжить?
+		<usetemplate ignoretext="Нельзя задать некоторые выбранные наборы связей из-за ограничений этих наборов." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Для некоторых выбранных наборов связей невозможно задать тип «[REQUESTED_TYPE]», так как фигура не выпуклая.
+
+Продолжить?
+		<usetemplate ignoretext="Нельзя задать некоторые выбранные наборы связей, так как фигура не выпуклая." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		Признак фантомности некоторых выбранных наборов связей будет изменен.
+
+Для некоторых выбранных наборов связей нельзя задать тип «[REQUESTED_TYPE]» из-за ограничений этих наборов.  Эти наборы связей будут иметь тип «[RESTRICTED_TYPE]».
+
+Продолжить?
+		<usetemplate ignoretext="Для некоторых выбранных наборов связей будет изменен признак фантомности, а другие наборы нельзя задать из-за ограничений этих наборов." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		Признак фантомности некоторых выбранных наборов связей будет изменен.
+
+Для некоторых выбранных наборов связей невозможно задать тип «[REQUESTED_TYPE]», так как фигура не выпуклая.
+
+Продолжить?
+		<usetemplate ignoretext="Для некоторых выбранных наборов связей будет изменен признак фантомности, а другие наборы нельзя задать, так как фигура не выпуклая." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Для некоторых выбранных наборов связей нельзя задать тип «[REQUESTED_TYPE]» из-за ограничений этих наборов.  Эти наборы связей будут иметь тип «[RESTRICTED_TYPE]».
+
+Для некоторых выбранных наборов связей невозможно задать тип «[REQUESTED_TYPE]», так как фигура не выпуклая. Тип использования этих наборов связей не изменится.
+
+Продолжить?
+		<usetemplate ignoretext="Нельзя задать некоторые выбранные наборы связей из-за ограничений этих наборов и потому, что фигура не выпуклая." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		Признак фантомности некоторых выбранных наборов связей будет изменен.
+
+Для некоторых выбранных наборов связей нельзя задать тип «[REQUESTED_TYPE]» из-за ограничений этих наборов.  Эти наборы связей будут иметь тип «[RESTRICTED_TYPE]».
+
+Для некоторых выбранных наборов связей невозможно задать тип «[REQUESTED_TYPE]», так как фигура не выпуклая. Тип использования этих наборов связей не изменится.
+
+Продолжить?
+		<usetemplate ignoretext="Для некоторых выбранных наборов связей будет изменен признак фантомности, а другие наборы нельзя задать из-за ограничений этих наборов и потому, что фигура не выпуклая." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		Выбранный объект влияет на навигационную сетку.  Если заменить его на гибкий путь, он будет удален из навигационной сетки.
+		<usetemplate ignoretext="Выбранный объект влияет на навигационную сетку.  Если заменить его на гибкий путь, он будет удален из навигационной сетки." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		По-видимому, ваше оборудование не удовлетворяет требованиям [APP_NAME]. Для работы [APP_NAME] необходима графическая карта OpenGL с поддержкой мультитекстур. Если у вас есть такая карта, убедитесь, что установлены новейшие версии драйверов для нее и пакеты обновлений и исправления для операционной системы.
 
@@ -3122,4 +3377,652 @@ http://secondlife.com/download.
 	<global name="You died and have been teleported to your home location">
 		Вы умерли и были телепортированы в ваше домашнее местоположение.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Не удалось обновить [FNAME]: файл не найден.
+Последующее обновление этого файла запрещается.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		Не удалось открыть или декодировать [FNAME] с [NRETRIES] попыток. Этот файл считается поврежденным.
+Последующее обновление этого файла запрещается.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Попытка добавить недопустимый или нечитаемый файл изображения [FNAME], который не удалось открыть или декодировать.
+Попытка отменена.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Возвращено [NUM_ITEMS] элементов.  Продолжить?
+		<usetemplate ignoretext="Возвратить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
+		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Аватар заморожен.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] разморозил вас.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Аватар разморожен.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Не удалось заморозить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Заморозка кончилась, занимайтесь своим делом.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Невозможно заморозить этого пользователя.
+	</notification>
+	<notification name="NowOwnObject">
+		Вы стали владельцем объекта [OBJECT_NAME]
+	</notification>
+	<notification name="CantRezOnLand">
+		Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли.  Узнать, кто владелец, можно с помощью инструмента «Земля».
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Невозможно выложить объект: слишком много запросов.
+	</notification>
+	<notification name="SitFailCantMove">
+		Нельзя сесть: сейчас вы не можете двигаться.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Вам не разрешено садиться на этой земле.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Попробуйте переместиться ближе.  Нельзя сесть на объект:
+он находится в другом регионе.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Невозможно создать новый объект. Регион уже заполнен.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Вы не можете создавать деревья и траву на чужой земле.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Выбран дубликат без корневых объектов.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Невозможно дублировать объекты: регион заполнен.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Невозможно дублировать объекты: не удалось найти их участок.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Нельзя создать объект: 
+участок уже заполнен.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Не удалось выложить объект.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Невозможно создать элемент, который вызвал проблемы в этом регионе.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Этот предмет инвентаря находится в черном списке.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Поиск по земле заблокирован.
+Вы провели слишком много операций поиска за короткое время.
+Повторите попытку через минуту.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Вы умерли и были телепортированы в ваше домашнее местоположение
+	</notification>
+	<notification name="EjectComingSoon">
+		Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Вам нет доступа в этот регион: 
+серпер переполнен.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Сохранение в инвентаре отключено.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]».
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoTransNoCopy">
+		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется.
+	</notification>
+	<notification name="NoModNoTaking">
+		Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
+	</notification>
+	<notification name="RezDestInternalError">
+		Внутренняя ошибка: неизвестный тип места назначения.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Невозможно удалить: объект не найден
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Невозможно выбросить этого пользователя.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="HomeLocationLimits">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="HomePositionSet">
+		Задано положение дома.
+	</notification>
+	<notification name="AvatarEjected">
+		Аватар выброшен.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Не удалось выбросить: у вас нет прав администратора на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Нельзя переместить объект «[OBJECT_NAME]» в позицию
+[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		У вас нет прав на изменение этого объекта
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Нельзя включить физику для объекта, который относится к навигационной сетке.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Нельзя включить физику для объектов с ключевыми кадрами.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Нельзя включить физику для объекта -- недостаточно земельных ресурсов.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS]
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке.
+	</notification>
+	<notification name="UnableAddItem">
+		Невозможно добавить предмет!
+	</notification>
+	<notification name="UnableEditItem">
+		Редактирование невозможно!
+	</notification>
+	<notification name="NoPermToEdit">
+		Редактирование не разрешено.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Не разрешено копировать этот инвентарь.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Нельзя сохранить в содержимом объекта: предмет уже не существует.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта.
+	</notification>
+	<notification name="TooManyScripts">
+		Слишком много скриптов.
+	</notification>
+	<notification name="UnableAddScript">
+		Невозможно добавить скрипт!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Сервер активов не ответил в заданное время.  Объект возвращен в симулятор.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		В этом регионе не разрешены фигуры с физическими данными.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Нельзя задать свойства физики для объекта этого типа.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Нельзя задать корневой примитив без фигуры.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		В этом регионе не разрешены материалы с физическими данными.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Настройка материалов с физическими данными разрешена только для корневых примитивов.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Присвоение персонажам материалов с физическими данными еще не поддерживается.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Одно или несколько свойств указанного материала с физическими данными недопустимы.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Не разрешается изменять тип стыковки меш-объекта.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Не разрешается изменять форму меш-объекта
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Вам нет доступа в этот регион: \nрегион заполнен.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Связь невозможна -- разные владельцы
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Связь невозможна – нельзя изменять навигационную сетку за пределами региона.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Связь невозможна: у вас нет разрешения на редактирование.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Связь невозможна -- слишком много примитивов
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Связь невозможна -- нельзя связать некопируемый и непереносимый объекты
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Связь невозможна -- нет связываемых объектов.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Связь невозможна -- слишком много персонажей с поиском пути
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Связь невозможна -- недостаточно земельных ресурсов
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Объект использует слишком много ресурсов физики -- динамическое поведение отключено.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		Вы были телепортированы домой объектом «[OBJECT_NAME]»
+	</notification>
+	<notification name="TeleportedByAttachment">
+		Вы были телепортированы прикрепленным объектом [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Невозможно создать запрошенный объект. Регион уже заполнен.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Нельзя присоединить несколько объектов к одной точке.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Здесь нельзя создать несколько объектов.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Невозможно создать запрошенный объект. Объекта нет в базе данных.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Невозможно создать запрошенный объект. Повторите попытку.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Не удалось выложить, загрузка нужного объекта длится слишком долго.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Вам нельзя создавать растения на этой земле.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Невозможно восстановить объект. Не найдена позиция в игровом мире.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Невозможно выложить объект: его данные сетки неверны.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Невозможно выложить объект: в этом регионе уже сликом много скриптов.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Ваши привилегии доступа не разрешают создание объектов на этом месте.
+	</notification>
+	<notification name="CantCreateObject">
+		Сейчас вам не разрешено создавать объекты.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Неверные параметры объекта
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Ваши привилегии доступа не разрешают дублирование объектов на этом месте.
+	</notification>
+	<notification name="CantChangeShape">
+		Вам не разрешено изменять эту фигуру.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Ваши привилегии доступа не разрешают претендовать на объекты на этом месте.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Не удалось передать: вам не разрешено передавать объекты для этой группы.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Ваши привилегии доступа не разрешают покупать объекты на этом месте.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Невозможно присоединить объект: на нем сидит аватар.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Деревья и траву нельзя носить как прикрепленные объекты.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Нельзя присоединять объекты, принадлежащие группе.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Нельзя прикреплять объекты, которыми вы не владеете.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Невозможно присоединить объекты, которые относятся к навигационной сетке.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Нельзя присоединить объект: вам не разрешено его перемещать.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Нельзя сбросить объект здесь.  Участок уже заполнен.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Нельзя коснуться/взять этот объект: вы забанены на этом участке.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Уточните параметры удаления.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Невозможно отправить актив.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Не удалось найти пользователя для телепортации домой
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		режим творца недоступен
+	</notification>
+	<notification name="GenericRequestFailed">
+		не удалось выполнить общий запрос
+	</notification>
+	<notification name="CantUploadPostcard">
+		Невозможно отправить открытку.  Повторите попытку позже.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Невозможно получить данные инвентаря для группового уведомления.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Невозможно отправить групповое уведомление -- не разрешено.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Невозможно отправить групповое уведомление -- не удалось собрать инвентарь.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Невозможно проанализировать инвентарь, указанный в уведомлении.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Не удалось загрузить ландшафт.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Файл ландшафта записан.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Файл ландшафта записан, начинается загрузка...
+	</notification>
+	<notification name="TerrainBaked">
+		Ландшафт готов.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Для покупки этого участка необходимо обновить клиент.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Невозможно купить, этот участок не предназначен для продажи.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Невозможно купить: цена или площадь земли изменились.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Вам не разрешено покупать этот участок.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Здесь нельзя создавать объекты – участок будет переполнен.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Выбрано недостаточно арендуемых участков для вступления.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -&gt; Сообщить об ошибке...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Земля разделена.
+	</notification>
+	<notification name="PassPurchased">
+		Вы приобрели пропуск.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		В регионе не разрешены рекламные объявления.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Ваш пропуск на эту землю скоро закончится.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Здесь нет места, чтобы сесть. Попробуйте в другом месте.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		Невозможно претендовать на объект: у вас нет разрешения
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Невозможно претендовать на объект: у вас не хватает L$.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Нельзя передать землю, принадлежащую группе.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Не удалось купить объект: у вас не хватает L$.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Не удалось купить инвентарь: у вас не хватает L$.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		У вас недостаточно L$, чтобы заплатить за проход на эту землю.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Сейчас нельзя купить пропуск.  Повторите попытку позже.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Невозможно создать объект:\nучасток заполнен.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Не удалось поместить объект в указанное место.  Повторите попытку.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Невозможно создать закладку для события.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Сила творца одолевает заморозку!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Не удалось выполнить запрос на особые способности. Запрос зарегистрирован.
+	</notification>
+	<notification name="ExpireExplanation">
+		Система сейчас не может обработать ваш запрос. Истекло время запроса.
+	</notification>
+	<notification name="DieExplanation">
+		Система не может обработать ваш запрос.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		Недостаточно денег для создания примитива.
+	</notification>
+	<notification name="RezObjectFailure">
+		Недостаточно денег для создания объекта.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Недопустимое домашнее местоположение; восстановлено стандартное местоположение.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
+	</notification>
+	<notification name="SetHomePosition">
+		Домашнее местоположение задано.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Невозможно забрать объект: сбой инвентаря.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Невозможно создать требуемый инвентарь.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Невозможно создать требуемую папку инвентаря.
+	</notification>
+	<notification name="CantCreateInventory">
+		Невозможно создать этот инвентарь.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Невозможно создать закладку.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Сейчас нельзя создать костюм. Попробуйте через минуту.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Инвентарь не для продажи.
+	</notification>
+	<notification name="CantFindInvItem">
+		Не удалось найти предмет из инвентаря.
+	</notification>
+	<notification name="CantFindObject">
+		Не удалось найти объект.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Сейчас в этом регионе запрещен перевод денег на объекты.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Непонятно, кому платить.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Нельзя отдавать L$ за общедоступные объекты.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Не удалось создать инвентарь в объекте игрового мира.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Не удалось обновить клиент из-за внутренней ошибки.  Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Нельзя создавать большие примитивы, которые пересекаются с другими игроками.  Повторите попытку, когда другие игроки уйдут.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов.
+		<usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены.
+		<usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Невозможно переместить файлы. Восстановлен прежний путь.
+		<usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml
index 825f9a6229..825f9a6229 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/ru/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
index ae2240593d..ae2240593d 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/ru/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
index 75e396222f..4866bb7ed6 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/>
 	<icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/>
 	<icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml
index 03c164affd..03c164affd 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
index 214ca8bf3a..70a1b25996 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Черный список
-	</text>
-	<scroll_list name="blocked" tool_tip="Список заблокированных жителей"/>
-	<button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/>
-	<button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/>
-	<button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Фильтр" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/>
+		<menu_button name="view_btn" tool_tip="Параметры сортировки"/>
+		<menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/>
+		<button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Список заблокированных жителей"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml
index 20a99500b6..20a99500b6 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml
index f7d31813f9..f7d31813f9 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray.xml
deleted file mode 100644
index ebf6c4264b..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Включить/выключить микрофон"/>
-	<string name="VoiceControlBtnToolTip" value="Показать/скрыть панель управления голосом"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Говорить" label_selected="Говорить" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Жесты" name="Gesture" tool_tip="Показать/скрыть жесты"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Перемещение" name="movement_btn" tool_tip="Показать/скрыть панель управления движением"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Камера" name="camera_btn" tool_tip="Показать/скрыть управление камерой"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button name="snapshots" tool_tip="Сделать снимок"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Строительство" name="build_btn" tool_tip="Показать/скрыть инструменты"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Поиск" name="search_btn" tool_tip="Показать/скрыть поиск"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Карта" name="world_map_btn" tool_tip="Показать/скрыть карту мира"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Миникарта" name="mini_map_btn" tool_tip="Показать/скрыть миникарту"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Общение"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Уведомления"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml
index bcdff112c5..bcdff112c5 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/ru/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_chat_header.xml b/indra/newview/skins/default/xui/ru/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/ru/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml
index f203ecde4b..f203ecde4b 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_classified_info.xml b/indra/newview/skins/default/xui/ru/panel_classified_info.xml
index c7fd0ad42f..c7fd0ad42f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/ru/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml
index cc3f7feb83..cc3f7feb83 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml
index 98d4fd8b47..98d4fd8b47 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml
index 9e1bc4b5c4..9e1bc4b5c4 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/ru/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..4fdb4f9122
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(загрузка)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..98fe7b99be
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Включая голосовой чат"/>
+	<icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/>
+	<button name="delete_btn" tool_tip="Удалить эту запись"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml
index 762baa2052..762baa2052 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml
index dc9d678edd..dc9d678edd 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
index 7cde4099ef..7cde4099ef 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
index a2f06dbadf..a2f06dbadf 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml
index 84e1204b5d..84e1204b5d 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml
index 561777745e..561777745e 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml
index d5e67ddf87..d5e67ddf87 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml
index 2f5a437e69..2f5a437e69 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml
index 4970c93801..4970c93801 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml
index da4ebb154d..da4ebb154d 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
index 6be1448ac5..6be1448ac5 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
index e9a6a781db..e9a6a781db 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
index 312ad593a1..312ad593a1 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml
index d576a2cd2f..d576a2cd2f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml
index f6d7029108..f6d7029108 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml
index f5a5339afe..f5a5339afe 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml
index 909946e577..909946e577 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml
index 2827fbc028..2827fbc028 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml
index 874d5f8bc4..874d5f8bc4 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml
index f2f6e5e516..f2f6e5e516 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml
index 6f84c6cec2..6f84c6cec2 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml
index 79130a9c80..79130a9c80 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/ru/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
index 2e6f3502b6..2e6f3502b6 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml
index 4d7e1c9fff..ba38dbf89e 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_general.xml
@@ -51,6 +51,6 @@
 			<combo_box.item label="Умеренный контент" name="mature"/>
 			<combo_box.item label="Общий контент" name="pg"/>
 		</combo_box>
-		<check_box initial_value="истина" label="Показать в поиске" name="show_in_group_list" tool_tip="Позволить людям видеть эту группу в результатах поиска"/>
+		<check_box initial_value="true" label="Показать в поиске" name="show_in_group_list" tool_tip="Позволить людям видеть эту группу в результатах поиска"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
index d8cf1b4756..d8cf1b4756 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
index 3041046041..68dac5cd7e 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Несколько выбранных жителей уже состоят в группе. Им приглашения не были отправлены.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Групповые приглашения не отправлены: выбрано слишком много жителей. Групповые приглашения могут охватывать не более 100 пользователей за один запрос.
+	</panel.string>
 	<text name="help_text">
 		Можно выбрать несколько жителей для приглашения в группу. Чтобы начать, щелкните «Выбрать жителей».
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml
index 9235aa2f69..9235aa2f69 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index 7f000fb5a0..b043ffbbe2 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
+	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_notices.xml b/indra/newview/skins/default/xui/ru/panel_group_notices.xml
index 8d20c4a96b..8d20c4a96b 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_group_notify.xml b/indra/newview/skins/default/xui/ru/panel_group_notify.xml
index 1aee7a7f61..1aee7a7f61 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_group_roles.xml b/indra/newview/skins/default/xui/ru/panel_group_roles.xml
index c57f21679f..c57f21679f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
index 2a23cdb800..2a23cdb800 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/ru/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_instant_message.xml b/indra/newview/skins/default/xui/ru/panel_instant_message.xml
index cf9bc7fccb..cf9bc7fccb 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/ru/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml
index f4febd49cd..f4febd49cd 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ru/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_landmarks.xml b/indra/newview/skins/default/xui/ru/panel_landmarks.xml
index 7d684cd479..7d684cd479 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/ru/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_login.xml b/indra/newview/skins/default/xui/ru/panel_login.xml
index 7928191fa6..f0877731c6 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				ВОЙТИ
+			</text>
 			<text name="username_text">
 				Имя пользователя:
 			</text>
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				Пароль:
 			</text>
-			<check_box label="Запомнить пароль" name="remember_check"/>
-			<button label="Войти" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Режим:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Выберите режим. Основной – для быстрого и простого ознакомления с игрой, а также общения. Расширенный – для доступа к более широким возможностям.">
-				<combo_box.item label="Основной" name="Basic"/>
-				<combo_box.item label="Расширенный" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Место старта:
 			</text>
@@ -33,16 +26,21 @@
 				<combo_box.item label="&lt;Введите название региона&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Регистрация
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Нужна помощь при входе?
 			</text>
 			<text name="forgot_password_text">
 				Забыли имя или пароль?
 			</text>
-			<text name="login_help">
-				Нужна помощь при входе?
+			<button label="Войти" name="connect_btn"/>
+			<check_box label="Запомнить пароль" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				СОЗДАЙТЕ СВОЙ АККАУНТ
 			</text>
+			<button label="Начать" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
index 80a67371af..80a67371af 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_me.xml b/indra/newview/skins/default/xui/ru/panel_me.xml
index 21a125af87..21a125af87 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_me.xml
+++ b/indra/newview/skins/default/xui/ru/panel_me.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
index 6dc435db20..d52397832c 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
@@ -15,14 +15,14 @@
 	</text>
 	<text name="current_url" tool_tip="Текущая страница для этого медиа-источника" value=""/>
 	<button label="Сброс" name="current_url_reset_btn"/>
-	<check_box initial_value="ложь" label="Автоматическое зацикливание" name="auto_loop"/>
-	<check_box initial_value="ложь" label="Реакция на первый щелчок" name="first_click_interact"/>
-	<check_box initial_value="ложь" label="Автоувеличение" name="auto_zoom"/>
-	<check_box initial_value="ложь" label="Автоматическое проигрывание" name="auto_play"/>
+	<check_box initial_value="false" label="Автоматическое зацикливание" name="auto_loop"/>
+	<check_box initial_value="false" label="Реакция на первый щелчок" name="first_click_interact"/>
+	<check_box initial_value="false" label="Автоувеличение" name="auto_zoom"/>
+	<check_box initial_value="false" label="Автоматическое проигрывание" name="auto_play"/>
 	<text name="media_setting_note">
 		Примечание. Жители могут переопределять эту настройку.
 	</text>
-	<check_box initial_value="ложь" label="Автомасштабирование на объекте" name="auto_scale"/>
+	<check_box initial_value="false" label="Автомасштабирование на объекте" name="auto_scale"/>
 	<text name="size_label">
 		Размер:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml
index 680cba9c14..cfb006f346 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/ru/panel_media_settings_permissions.xml
@@ -14,16 +14,16 @@
 	<text name="owner_label">
 		Владелец
 	</text>
-	<check_box initial_value="ложь" label="Разрешить навигацию и взаимодействие" name="perms_owner_interact"/>
-	<check_box initial_value="ложь" label="Панель управления видна" name="perms_owner_control"/>
+	<check_box initial_value="false" label="Разрешить навигацию и взаимодействие" name="perms_owner_interact"/>
+	<check_box initial_value="false" label="Панель управления видна" name="perms_owner_control"/>
 	<text name="group_label">
 		Группа:
 	</text>
-	<check_box initial_value="ложь" label="Разрешить навигацию и взаимодействие" name="perms_group_interact"/>
-	<check_box initial_value="ложь" label="Панель управления видна" name="perms_group_control"/>
+	<check_box initial_value="false" label="Разрешить навигацию и взаимодействие" name="perms_group_interact"/>
+	<check_box initial_value="false" label="Панель управления видна" name="perms_group_control"/>
 	<text name="anyone_label">
 		всем
 	</text>
-	<check_box initial_value="ложь" label="Разрешить навигацию и взаимодействие" name="perms_anyone_interact"/>
-	<check_box initial_value="ложь" label="Панель управления видна" name="perms_anyone_control"/>
+	<check_box initial_value="false" label="Разрешить навигацию и взаимодействие" name="perms_anyone_interact"/>
+	<check_box initial_value="false" label="Панель управления видна" name="perms_anyone_control"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml
index 6b30dc799c..bae491472a 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/ru/panel_media_settings_security.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Безопасность" name="Media Settings Security">
-	<check_box initial_value="ложь" label="Разрешить доступ к ссылкам только по шаблону" name="whitelist_enable"/>
+	<check_box initial_value="false" label="Разрешить доступ к ссылкам только по шаблону" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
 		Пункты, не подходящие для домашней страницы, отмечены знаком:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
index 5e3de180f9..5e3de180f9 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
index a8fdfde1c4..a8fdfde1c4 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
index 804ba7def7..395c643b0b 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Щелкните здесь для общения" name="chat_box" tool_tip="Нажмите Enter, чтобы сказать, Ctrl+Enter, чтобы прокричать"/>
 	<button name="show_nearby_chat" tool_tip="Показать/скрыть лог локального чата"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml
index 3b23fc78f5..3b23fc78f5 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ru/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml
index 1ac88a01b3..1ac88a01b3 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/ru/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/ru/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml
index 0095d48af9..0095d48af9 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
index 91c03342a7..91c03342a7 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
index 4d0e13fca2..4d0e13fca2 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml
index 96f4b4a893..96f4b4a893 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml
index 74551e4274..74551e4274 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
index 7ed6bf35c0..7ed6bf35c0 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/ru/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 607921f2d6..9606f0aec1 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -14,81 +14,56 @@
 	<string name="no_filtered_friends_msg">
 		Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском].
 	</string>
-	<string name="people_filter_label" value="Фильтр для людей"/>
-	<string name="groups_filter_label" value="Фильтр для групп"/>
 	<string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/>
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
-	<filter_editor label="Фильтр" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
-		<panel label="МОИ ДРУЗЬЯ" name="friends_panel">
+		<panel label="ДРУЗЬЯ" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Предложить жителю дружбу"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="МОИ ГРУППЫ" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Опции"/>
-				<button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
-				<button name="activate_btn" tool_tip="Активировать выбранную группу"/>
+		<panel label="ГРУППЫ" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Фильтр для групп" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/>
+				<menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
+				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
 			</panel>
+			<text name="groupcount">
+				Вы входите в [COUNT] групп и можете присоединиться еще к [REMAINING].
+			</text>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Опции"/>
-				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Фильтр для людей" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
+				<menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/>
+				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
+				<dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
 			</panel>
 		</panel>
+		<panel label="БЛОКИРОВАН" name="blocked_panel">
+			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_pick_info.xml b/indra/newview/skins/default/xui/ru/panel_pick_info.xml
index 373cf211fb..373cf211fb 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/ru/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_picks.xml b/indra/newview/skins/default/xui/ru/panel_picks.xml
index d6770e0eeb..d6770e0eeb 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_picks.xml
+++ b/indra/newview/skins/default/xui/ru/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_place_profile.xml b/indra/newview/skins/default/xui/ru/panel_place_profile.xml
index b486b918ed..b486b918ed 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_places.xml b/indra/newview/skins/default/xui/ru/panel_places.xml
index 54837d3c0b..54837d3c0b 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_places.xml
+++ b/indra/newview/skins/default/xui/ru/panel_places.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml
index 70587d8090..70587d8090 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/ru/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
index dc9d59008f..dc9d59008f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ru/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
index 7d8ee96924..7d8ee96924 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
index 9d7ae546fd..9d7ae546fd 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index a9d5569c7f..914426c91e 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<text name="font_size">
-		Размер шрифта:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Мелкий" name="radio" value="0"/>
-		<radio_item label="Средний" name="radio2" value="1"/>
-		<radio_item label="Крупный" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
-	<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
-	<check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/>
-	<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Показывать сообщения:
-	</text>
-	<text name="requires_restart_label">
-		(требуется перезапуск)
-	</text>
-	<radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)">
-		<radio_item label="В отдельных окнах" name="radio" value="0"/>
-		<radio_item label="На вкладках" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Включить всплывающие сообщения с новыми репликами в чате:
-	</text>
-	<check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/>
-	<check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/>
-	<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
-	<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
-	<button label="Настройки перевода чата" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
+		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Размер шрифта:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Мелкий" name="Small" value="0"/>
+			<item label="Средний" name="Medium" value="1"/>
+			<item label="Крупный" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			IM друзей:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			IM чужих:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			IM конференции:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Групповой чат:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Локальный чат:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			IM объектов:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
+			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
+			<item label="Без действия" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Звук" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Звук:
+		</text>
+		<check_box label="Новый разговор" name="new_conversation"/>
+		<check_box label="Входящий голосовой вызов" name="incoming_voice_call"/>
+		<check_box label="Предложение телепортации" name="teleport_offer"/>
+		<check_box label="Предложение инвентаря" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Очистить журнал..." name="clear_log"/>
+		<button label="Удалить записи..." name="delete_transcripts"/>
+		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
+	</panel>
+	<button label="Перевод..." name="ok_btn"/>
+	<button label="Автозамена..." name="autoreplace_showgui"/>
+	<button label="Проверка правописания..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
index 48c34fcbb2..48c34fcbb2 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index d1bfedf2d8..62617caed3 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -36,7 +36,7 @@
 		<combo_box.item label="Мое последнее место" name="MyLastLocation"/>
 		<combo_box.item label="Мой дом" name="MyHome"/>
 	</combo_box>
-	<check_box initial_value="истина" label="Показывать на экране входа" name="show_location_checkbox"/>
+	<check_box initial_value="true" label="Показывать на экране входа" name="show_location_checkbox"/>
 	<text name="name_tags_textbox">
 		Теги имен:
 	</text>
@@ -68,9 +68,9 @@
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Ответ в режиме «Занят»:
+		Ответ в режиме «Не беспокоить»:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
index a7e826f5fc..c93955fcdc 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
@@ -25,14 +25,14 @@
 		<text name="ShadersText">
 			Шейдеры:
 		</text>
-		<check_box initial_value="истина" label="Прозрачность воды" name="TransparentWater"/>
-		<check_box initial_value="истина" label="Рельефность и сияние" name="BumpShiny"/>
-		<check_box initial_value="истина" label="Локальный свет" name="LocalLights"/>
-		<check_box initial_value="истина" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение этого параметра может предотвратить зависание некоторых видеокарт"/>
-		<check_box initial_value="истина" label="Атмосферные шейдеры" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="истина" label="Освещение и тени" name="UseLightShaders"/>
-		<check_box initial_value="истина" label="Объемный свет" name="UseSSAO"/>
-		<check_box initial_value="истина" label="Глубина поля" name="UseDoF"/>
+		<check_box initial_value="true" label="Прозрачность воды" name="TransparentWater"/>
+		<check_box initial_value="true" label="Рельефность и сияние" name="BumpShiny"/>
+		<check_box initial_value="true" label="Локальный свет" name="LocalLights"/>
+		<check_box initial_value="true" label="Базовые шейдеры" name="BasicShaders" tool_tip="Отключение этого параметра может предотвратить зависание некоторых видеокарт"/>
+		<check_box initial_value="true" label="Атмосферные шейдеры" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="Расширенная модель освещения" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Объемный свет" name="UseSSAO"/>
+		<check_box initial_value="true" label="Глубина поля" name="UseDoF"/>
 		<text name="shadows_label">
 			Тени:
 		</text>
@@ -95,9 +95,9 @@
 		<text name="AvatarRenderingText">
 			Отрисовка аватара:
 		</text>
-		<check_box initial_value="истина" label="Плоские аватары" name="AvatarImpostors"/>
-		<check_box initial_value="истина" label="Аппаратная отрисовка" name="AvatarVertexProgram"/>
-		<check_box initial_value="истина" label="Одежда аватара" name="AvatarCloth"/>
+		<check_box initial_value="true" label="Плоские аватары" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="Аппаратная отрисовка" name="AvatarVertexProgram"/>
+		<check_box initial_value="true" label="Одежда аватара" name="AvatarCloth"/>
 		<text name="TerrainDetailText">
 			Ландшафт:
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
index a6e9b00f2a..a6e9b00f2a 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
index 20bb839eed..20bb839eed 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index 8e7fc71f0d..1741397a84 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -18,10 +18,10 @@
 		<radio_item label="Использовать мой браузер (IE, Firefox, Safari)" name="external" tool_tip="Будет использоваться браузер, заданный в системе по умолчанию. Не рекомендуется, если [APP_NAME] работает в полноэкранном режиме." value="true"/>
 		<radio_item label="Использовать встроенный браузер" name="internal" tool_tip="Для просмотра справки, ссылок на веб-страницы и т. д. будет использоваться встроенный браузер. Этот браузер открывается как новое окно в [APP_NAME]." value=""/>
 	</radio_group>
-	<check_box initial_value="истина" label="Разрешить плагины" name="browser_plugins_enabled"/>
-	<check_box initial_value="истина" label="Принимать файлы cookie" name="cookies_enabled"/>
-	<check_box initial_value="истина" label="Разрешить Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="ложь" label="Разрешить всплывающие окна" name="media_popup_enabled"/>
+	<check_box initial_value="true" label="Разрешить плагины" name="browser_plugins_enabled"/>
+	<check_box initial_value="true" label="Принимать файлы cookie" name="cookies_enabled"/>
+	<check_box initial_value="true" label="Разрешить Javascript" name="browser_javascript_enabled"/>
+	<check_box initial_value="false" label="Разрешить всплывающие окна" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Обновления ПО:
 	</text>
@@ -29,6 +29,7 @@
 		<combo_box.item label="Устанавливать автоматически" name="Install_automatically"/>
 		<combo_box.item label="Загружать и устанавливать обновления вручную" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Устанавливать бета-версии" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Настройки прокси-сервера:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
index bf673750d2..44f270527c 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_sound.xml
@@ -4,7 +4,7 @@
 		среднюю кнопку мыши
 	</panel.string>
 	<slider label="Общая громкость" name="System Volume"/>
-	<check_box initial_value="истина" name="mute_when_minimized"/>
+	<check_box initial_value="true" name="mute_when_minimized"/>
 	<text name="mute_chb_label">
 		Заглушать, когда свернуто
 	</text>
@@ -17,9 +17,9 @@
 	<check_box label="Включено" name="enable_media"/>
 	<slider label="Голосовой чат" name="Voice Volume"/>
 	<check_box label="Включено" name="enable_voice_check"/>
-	<check_box label="Разрешить автовоспроизведение медиа" name="media_auto_play_btn" tool_tip="Установка флажка позволит вам автоматически воспроизводить медиа" value="истина"/>
-	<check_box label="Воспроизводить медиа, присоединенные к другому аватару" name="media_show_on_others_btn" tool_tip="Снятие флажка скроет медиа, присоединенные к другому аватару" value="истина"/>
-	<check_box label="Сопровождать жесты звуками" name="gesture_audio_play_btn" tool_tip="Установите флажок, чтобы слышать звуки при жестах" value="истина"/>
+	<check_box label="Разрешить автовоспроизведение медиа" name="media_auto_play_btn" tool_tip="Установка флажка позволит вам автоматически воспроизводить медиа" value="true"/>
+	<check_box label="Воспроизводить медиа, присоединенные к другому аватару" name="media_show_on_others_btn" tool_tip="Снятие флажка скроет медиа, присоединенные к другому аватару" value="true"/>
+	<check_box label="Сопровождать жесты звуками" name="gesture_audio_play_btn" tool_tip="Установите флажок, чтобы слышать звуки при жестах" value="true"/>
 	<text name="voice_chat_settings">
 		Настройки голосового чата
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
index 76bb6518e9..76bb6518e9 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml
index 706a38f110..706a38f110 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml
index c21d2d7051..4be1e781fa 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_debug.xml
@@ -30,5 +30,5 @@
 	<button label="Самые активные участники столкновений..." name="top_colliders_btn" tool_tip="Список объектов, для которых столкновения наиболее вероятны"/>
 	<button label="Список лучших скриптов..." name="top_scripts_btn" tool_tip="Объекты, в которых скрипты выполняются дольше всего"/>
 	<button label="Перезагрузить регион" name="restart_btn" tool_tip="Отсчитать 2 минуты и перезагрузить регион"/>
-	<button label="Отложить перезагрузку" name="cancel_restart_btn" tool_tip="Отложить перезагрузку региона на час"/>
+	<button label="Отменить перезапуск" name="cancel_restart_btn" tool_tip="Отменить перезапуск региона"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_environment.xml b/indra/newview/skins/default/xui/ru/panel_region_environment.xml
index 85be8f63bd..85be8f63bd 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
index 93b21704bc..bcfb974fcb 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
@@ -23,7 +23,7 @@
 		Разрешить доступ только таким жителям:
 	</text>
 	<check_box label="Зарегистрирована информация об оплате" name="limit_payment" tool_tip="Для доступа к этому землевладению у жителя должна быть зарегистрирована информация об оплате.  Более подробная информация находится здесь: [SUPPORT_SITE]."/>
-	<check_box label="Подтвержден возраст" name="limit_age_verified" tool_tip="Для доступа к этому землевладению житель должен подтвердить свой возраст. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
+	<check_box label="18 лет и старше" name="limit_age_verified" tool_tip="Доступ к этому землевладению имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
 	<check_box label="Разрешить голосовое общение" name="voice_chat_check"/>
 	<check_box label="Разрешить прямой телепорт" name="allow_direct_teleport"/>
 	<button label="Применить" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_general.xml b/indra/newview/skins/default/xui/ru/panel_region_general.xml
index 8559be6c9e..8559be6c9e 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
index af25565226..af25565226 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_region_texture.xml b/indra/newview/skins/default/xui/ru/panel_region_texture.xml
deleted file mode 100644
index c4b35a536d..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_region_texture.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Текстуры земли" name="Textures">
-	<text name="region_text_lbl">
-		Регион:
-	</text>
-	<text name="region_text">
-		неизвестен
-	</text>
-	<text name="detail_texture_text">
-		Текстуры ландшафта (требования: 512x512, 24-битные TGA-файлы)
-	</text>
-	<text name="height_text_lbl">
-		1 (низ)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (верх)
-	</text>
-	<text name="height_text_lbl5">
-		Диапазон высот текстур
-	</text>
-	<text name="height_text_lbl6">
-		Северо-запад
-	</text>
-	<text name="height_text_lbl7">
-		Северо-восток
-	</text>
-	<spinner label="Низ" name="height_start_spin_1"/>
-	<spinner label="Низ" name="height_start_spin_3"/>
-	<spinner label="Верх" name="height_range_spin_1"/>
-	<spinner label="Верх" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		Юго-запад
-	</text>
-	<text name="height_text_lbl9">
-		Юго-восток
-	</text>
-	<spinner label="Низ" name="height_start_spin_0"/>
-	<spinner label="Низ" name="height_start_spin_2"/>
-	<spinner label="Верх" name="height_range_spin_0"/>
-	<spinner label="Верх" name="height_range_spin_2"/>
-	<text name="height_text_lbl10">
-		Эти значения отображают диапазон перекрытия вышеуказанных текстур.
-	</text>
-	<text name="height_text_lbl11">
-		Измеряется в метрах, значение «Низ» – это МАКСИМАЛЬНАЯ высота текстуры №1, значение «Верх» – это МИНИМАЛЬНАЯ высота текстуры №4.
-	</text>
-	<button label="Применить" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_script_ed.xml b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
index 05ccaeb54b..a9e5d9ef10 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/ru/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Выделить все" name="Select All"/>
 			<menu_item_call label="Снять выделение" name="Deselect"/>
 			<menu_item_call label="Поиск и замена..." name="Search / Replace..."/>
+			<menu_item_call label="Перейти на строку..." name="Go to line..."/>
 		</menu>
 		<menu label="Справка" name="Help">
 			<menu_item_call label="Справка..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml
index a06c465a2b..a06c465a2b 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml
index 189e21fd2f..189e21fd2f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml
index c25f92cb8d..c25f92cb8d 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/ru/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/ru/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray.xml b/indra/newview/skins/default/xui/ru/panel_side_tray.xml
deleted file mode 100644
index 10c5775291..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Открыть/закрыть боковую панель" name="sidebar_openclose" tab_title="Открыть/закрыть боковую панель"/>
-	<sidetray_tab description="Дом." name="sidebar_home" tab_title="Дом">
-		<panel label="дом" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Изменение своего профиля и подборки." name="sidebar_me" tab_title="Мой профиль">
-		<panel_container name="panel_container">
-			<panel label="Я" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Поиск друзей, контактов и находящихся поблизости людей." name="sidebar_people" tab_title="Люди">
-		<panel_container name="panel_container">
-			<panel label="Профиль группы" name="panel_group_info_sidetray"/>
-			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Поиск мест, которые можно было бы посетить или которые вы уже посещали ранее." label="Места" name="sidebar_places" tab_title="Места">
-		<panel label="Места" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Просмотрите свой инвентарь." name="sidebar_inventory" tab_title="Мой инвентарь">
-		<panel label="Изменить инвентарь" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Изменение внешнего вида и текущего образа." name="sidebar_appearance" tab_title="Мой внешний вид">
-		<panel label="Изменить внешний вид" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml
index 1a260dc31f..1a260dc31f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/ru/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
index 53a150c9f9..53a150c9f9 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
index 446b9bb2fd..446b9bb2fd 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
index 250a76cd21..250a76cd21 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
index 47f4caf8e3..47f4caf8e3 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
index 79a9ef58d0..79a9ef58d0 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
index 98dab288a3..98dab288a3 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/ru/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml
index 81a2175fc3..81a2175fc3 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/ru/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_status_bar.xml b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
index 9c84ff1fd8..9c84ff1fd8 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ru/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml
index c457bc2269..c457bc2269 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/ru/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
index 90fb720068..90fb720068 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
new file mode 100644
index 0000000000..1abf729487
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Текстура" name="Texture">
+	<panel.string name="string repeats per meter">
+		Повторений на метр
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Повторений на грань
+	</panel.string>
+	<text name="color label">
+		Цвет
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Щелкните для выбора цвета"/>
+	<text name="color trans">
+		Прозрачность %
+	</text>
+	<text name="glow label">
+		Свечение
+	</text>
+	<check_box label="Собственная яркость" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Материалы" name="Materials"/>
+		<combo_box.item label="Медиа" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Текстура (рассеянная)" name="Texture (diffuse)"/>
+		<combo_box.item label="Шероховатость (обычная)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Блеск (зеркальный)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Текстура" name="texture control" tool_tip="Щелкните для выбора изображения"/>
+	<text name="label alphamode">
+		Альфа-режим
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Нет" name="None"/>
+		<combo_box.item label="Альфа-смешивание" name="Alpha blending"/>
+		<combo_box.item label="Альфа-маскирование" name="Alpha masking"/>
+		<combo_box.item label="Излучающая маска" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Отсечка маски
+	</text>
+	<texture_picker label="Текстура" name="bumpytexture control" tool_tip="Щелкните для выбора изображения"/>
+	<text name="label bumpiness">
+		Рельефность
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Нет" name="None"/>
+		<combo_box.item label="Яркость" name="Brightness"/>
+		<combo_box.item label="По темному" name="Darkness"/>
+		<combo_box.item label="дерево" name="woodgrain"/>
+		<combo_box.item label="кора" name="bark"/>
+		<combo_box.item label="кирпич" name="bricks"/>
+		<combo_box.item label="шахматная доска" name="checker"/>
+		<combo_box.item label="бетон" name="concrete"/>
+		<combo_box.item label="старая плитка" name="crustytile"/>
+		<combo_box.item label="тесаный камень" name="cutstone"/>
+		<combo_box.item label="диски" name="discs"/>
+		<combo_box.item label="гравий" name="gravel"/>
+		<combo_box.item label="чашка Петри" name="petridish"/>
+		<combo_box.item label="сайдинг" name="siding"/>
+		<combo_box.item label="каменная плитка" name="stonetile"/>
+		<combo_box.item label="штукатурка" name="stucco"/>
+		<combo_box.item label="присоска" name="suction"/>
+		<combo_box.item label="переплетение" name="weave"/>
+	</combo_box>
+	<texture_picker label="Текстура" name="shinytexture control" tool_tip="Щелкните для выбора изображения"/>
+	<text name="label shininess">
+		Блеск
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Нет" name="None"/>
+		<combo_box.item label="Низкий" name="Low"/>
+		<combo_box.item label="Средний" name="Medium"/>
+		<combo_box.item label="Высокий" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Глянец
+	</text>
+	<text name="label environment">
+		Среда
+	</text>
+	<text name="label shinycolor">
+		Цвет
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Щелкните для выбора цвета"/>
+	<text name="media_info">
+		URL выбранного медиа (если есть)
+	</text>
+	<button label="Выбрать..." name="add_media" tool_tip="Добавить медиа"/>
+	<button label="Удалить" name="delete_media" tool_tip="Удалить медиа-текстуру"/>
+	<button label="Выровнять" label_selected="Выровнять медиа" name="button align" tool_tip="Масштабирование медиа-текстуры (сначала нужно загрузить)"/>
+	<text name="tex gen">
+		Наложение
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="По умолчанию" name="Default"/>
+		<combo_box.item label="На плоскость" name="Planar"/>
+	</combo_box>
+	<spinner label="Масштаб по горизонтали" name="TexScaleU"/>
+	<spinner label="Масштаб по вертикали" name="TexScaleV"/>
+	<spinner label="Повторений на метр" name="rptctrl"/>
+	<spinner label="Поворот, градусы" name="TexRot"/>
+	<spinner label="Смещение по горизонтали" name="TexOffsetU"/>
+	<spinner label="Смещение по вертикали" name="TexOffsetV"/>
+	<spinner label="Масштаб по горизонтали" name="bumpyScaleU"/>
+	<spinner label="Масштаб по вертикали" name="bumpyScaleV"/>
+	<spinner label="Поворот, градусы" name="bumpyRot"/>
+	<spinner label="Смещение по горизонтали" name="bumpyOffsetU"/>
+	<spinner label="Смещение по вертикали" name="bumpyOffsetV"/>
+	<spinner label="Масштаб по горизонтали" name="shinyScaleU"/>
+	<spinner label="Масштаб по вертикали" name="shinyScaleV"/>
+	<spinner label="Поворот, градусы" name="shinyRot"/>
+	<spinner label="Смещение по горизонтали" name="shinyOffsetU"/>
+	<spinner label="Смещение по вертикали" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
index de0b38198f..de0b38198f 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..fe044cd083
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater">
+	<slider label="Общая" name="System Volume"/>
+	<slider label="Кнопки" name="UI Volume"/>
+	<slider label="Окружающая" name="Wind Volume"/>
+	<slider label="Звуки" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Включить звуки от жестов"/>
+	<slider label="Музыка" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="Включить потоковую музыку"/>
+	<slider label="Медиа" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="Включить потоковое медиа"/>
+	<slider label="Голос" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="Включить голосовой чат"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_world_map.xml b/indra/newview/skins/default/xui/ru/panel_world_map.xml
index 0ab8720185..0ab8720185 100644..100755
--- a/indra/newview/skins/default/xui/ru/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/ru/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/ru/role_actions.xml b/indra/newview/skins/default/xui/ru/role_actions.xml
index b6ba818abd..3f31ecfa10 100644..100755
--- a/indra/newview/skins/default/xui/ru/role_actions.xml
+++ b/indra/newview/skins/default/xui/ru/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="К этим способностям относится изменение названия участка и публикация настроек, поиск видимых каталогов, а также настройки точек и вариантов телепортации." name="Parcel Identity">
 		<action description="Включение-отключение показа места в результатах поиска и настройка категории" longdescription="Включить-отключить показ места в результатах поиска и настроить категорию участка можно в окне «О земле» на вкладке «Параметры»." name="land find places" value="17"/>
-		<action description="Изменение названия или описания участка, настройки «Показать место в поиске»" longdescription="Изменение названия или описания участка, настройки «Показать место в поиске». Это можно выполнить в окне «О земле» на вкладке «Параметры»." name="land change identity" value="18"/>
+		<action description="Изменение названия или описания участка, настройки «Умеренный контент»" longdescription="Изменение названия или описания участка, настройки «Умеренный контент». Это можно выполнить в окне «О земле» на вкладке «Параметры»." name="land change identity" value="18"/>
 		<action description="Установка конечной точки и варианта телепортации" longdescription="Участники роли с этой способностью могут установить конечную точку телепортации на участке группы, а также задать вариант телепортации для усиления контроля. Это можно выполнить в окне «О земле» на вкладке «Параметры»." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="К этим способностям относится изменение настроек участка, в т. ч. «Создать объекты», «Изменить ландшафт», а также настройки музыки и медиа." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
index a23f6134f2..a23f6134f2 100644..100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
index c106c2de79..c106c2de79 100644..100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
index 62095acbaf..0106ed50ac 100644..100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(неизвестно)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(неизвестно/несколько)
+	</panel.string>
 	<panel.string name="public">
 		(публичное)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index 8e56dd80c0..5502530ca4 100644..100755
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Эти объекты нельзя изменять
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Этот объект нельзя изменять через границу региона
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Эти объекты нельзя изменять через границу региона
+	</panel.string>
 	<panel.string name="text modify warning">
 		Этот объект содержит объединенные части
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Купить объект" name="Buyobject"/>
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
+			<combo_box.item label="Приблизить" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Цена: L$" name="Edit Cost"/>
 		<check_box label="Показать в результатах поиска" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
+		<text name="pathfinding_attributes_label">
+			Атрибуты поиска пути:
+		</text>
 		<text name="B:">
 			Н:
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 8dbc4f092d..0f71edcee0 100644..100755
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,10 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
@@ -448,6 +451,9 @@ support@secondlife.com.
 	<string name="SLappAgentRequestFriend">
 		Предложить дружбу
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Удаление друга
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Закрыть (⌘W)
 	</string>
@@ -619,7 +625,7 @@ support@secondlife.com.
 	<string name="AvatarAway">
 		Нет на месте
 	</string>
-	<string name="AvatarBusy">
+	<string name="AvatarDoNotDisturb">
 		Не беспокоить
 	</string>
 	<string name="AvatarMuted">
@@ -835,6 +841,9 @@ support@secondlife.com.
 	<string name="multiple_textures">
 		Несколько
 	</string>
+	<string name="use_texture">
+		Использовать текстуру
+	</string>
 	<string name="texture_loading">
 		Загрузка...
 	</string>
@@ -856,6 +865,12 @@ support@secondlife.com.
 	<string name="ST_NO_JOINT">
 		Не удается найти объект ROOT или JOINT.
 	</string>
+	<string name="NearbyChatTitle">
+		Локальный чат
+	</string>
+	<string name="NearbyChatLabel">
+		(Локальный чат)
+	</string>
 	<string name="whisper">
 		шепчет:
 	</string>
@@ -883,6 +898,9 @@ support@secondlife.com.
 	<string name="ScriptQuestionCautionChatDenied">
 		Объекту «[OBJECTNAME]», который принадлежит пользователю «[OWNERNAME]» и находится в [REGIONPOS] в регионе «[REGIONNAME]», отказано в разрешении: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Разрешив доступ к своему аккаунту, вы также разрешите объекту:
+	</string>
 	<string name="ScriptTakeMoney">
 		У вас берут Linden-деньги
 	</string>
@@ -919,6 +937,27 @@ support@secondlife.com.
 	<string name="NotConnected">
 		Нет подключения
 	</string>
+	<string name="AgentNameSubst">
+		(Вы)
+	</string>
+	<string name="TeleportYourAgent">
+		Телепортировать вас
+	</string>
+	<string name="JoinAnExperience">
+		Присоединитесь
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Отключить извещения при управлении списками доступа к землевладениям
+	</string>
+	<string name="OverrideYourAnimations">
+		Заменить ваши стандартные анимации
+	</string>
+	<string name="ScriptReturnObjects">
+		Вернуть объекты от вашего имени
+	</string>
+	<string name="UnknownScriptPermission">
+		(неизвестно)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -997,17 +1036,8 @@ support@secondlife.com.
 	<string name="script_files">
 		Скрипты
 	</string>
-	<string name="AvatarSetNotAway">
-		На месте
-	</string>
-	<string name="AvatarSetAway">
-		Нет на месте
-	</string>
-	<string name="AvatarSetNotBusy">
-		Не занят(а)
-	</string>
-	<string name="AvatarSetBusy">
-		Не беспокоить
+	<string name="dictionary_files">
+		Словари
 	</string>
 	<string name="shape">
 		Фигура
@@ -1241,7 +1271,7 @@ support@secondlife.com.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1402,6 +1432,12 @@ support@secondlife.com.
 	<string name="InvFolder favorite">
 		Мое избранное
 	</string>
+	<string name="InvFolder Favorites">
+		Мое избранное
+	</string>
+	<string name="InvFolder favorites">
+		Мое избранное
+	</string>
 	<string name="InvFolder Current Outfit">
 		Текущий костюм
 	</string>
@@ -1417,6 +1453,12 @@ support@secondlife.com.
 	<string name="InvFolder Meshes">
 		Меши
 	</string>
+	<string name="InvFolder Received Items">
+		Полученные вещи
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Торговые исходящие
+	</string>
 	<string name="InvFolder Friends">
 		Друзья
 	</string>
@@ -1947,6 +1989,12 @@ support@secondlife.com.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		Данные в игре внизу справа
 	</string>
+	<string name="ATTACH_NECK">
+		Шея
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Центр аватара
+	</string>
 	<string name="CursorPos">
 		Строка [LINE], столбец [COLUMN]
 	</string>
@@ -1965,8 +2013,8 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		Новый скрипт
 	</string>
-	<string name="BusyModeResponseDefault">
-		У адресата вашего сообщения задан статус «Не беспокоить».  Ваше сообщение все равно будет отображено на панели IM для просмотра позже.
+	<string name="DoNotDisturbModeResponseDefault">
+		Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже.
 	</string>
 	<string name="MuteByName">
 		(по имени)
@@ -2079,9 +2127,6 @@ support@secondlife.com.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		Контент
-	</string>
 	<string name="AcquiredItems">
 		Купленные вещи
 	</string>
@@ -2976,6 +3021,9 @@ support@secondlife.com.
 	<string name="Hip Width">
 		Ширина бедер
 	</string>
+	<string name="Hover">
+		Наведите
+	</string>
 	<string name="In">
 		Внутрь
 	</string>
@@ -3850,7 +3898,13 @@ support@secondlife.com.
 		Область общей дозволенности
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Все жители с других участков могут видеть аватары и общаться в чате
+		Аватары на этом участке невидимы и неслышимы для аватаров с других участков
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		В этом регионе не разрешен динамический поиск пути.
 	</string>
 	<string name="UpdaterWindowTitle">
 		Обновление [APP_NAME]
@@ -3921,6 +3975,12 @@ support@secondlife.com.
 	<string name="IM_unblock_only_groups_friends">
 		Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность».
 	</string>
+	<string name="OnlineStatus">
+		Онлайн
+	</string>
+	<string name="OfflineStatus">
+		Оффлайн
+	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
 	</string>
@@ -3930,6 +3990,9 @@ support@secondlife.com.
 	<string name="you_joined_call">
 		Вы присоединились к голосовой беседе
 	</string>
+	<string name="you_auto_rejected_call-im">
+		Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить».
+	</string>
 	<string name="name_started_call">
 		Житель [NAME] начал голосовую беседу
 	</string>
@@ -3946,7 +4009,7 @@ support@secondlife.com.
 		Соединяется...
 	</string>
 	<string name="conference-title">
-		Спонтанная конференция
+		Чат с несколькими участниками
 	</string>
 	<string name="conference-title-incoming">
 		Конференция с жителем [AGENT_NAME]
@@ -4838,6 +4901,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Label">
 		Чат
 	</string>
+	<string name="Command_Conversations_Label">
+		Разговоры
+	</string>
 	<string name="Command_Compass_Label">
 		Компас
 	</string>
@@ -4913,6 +4979,9 @@ support@secondlife.com.
 	<string name="Command_Chat_Tooltip">
 		Обменивайтесь текстовыми репликами с людьми вокруг вас
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Поговорить со всеми
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Компас
 	</string>
@@ -5006,6 +5075,21 @@ support@secondlife.com.
 	<string name="Normal">
 		Нормальный
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Нет
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Влияет на навигационную сетку
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Персонаж
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(несколько)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Очень низкий
 	</string>
@@ -5021,4 +5105,22 @@ support@secondlife.com.
 	<string name="snapshot_quality_very_high">
 		Очень высокий
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Житель не может посетить этот регион.
+	</string>
+	<string name="UserDictionary">
+		[Пользователь]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
+	</string>
+	<string name="loading_chat_logs">
+		Загрузка...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index feff286111..40c9267408 100644..100755
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -45,6 +45,9 @@
 		<message name="no_inventory_host">
 			Система инвентаря сейчас недоступна.
 		</message>
+		<message name="MustGetAgeRegion">
+			Входить в этот регион могут только жители 18 лет и старше.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@
 		<message name="requesting">
 			Запрос телепортации…
 		</message>
+		<message name="pending">
+			Телепортация не закончена...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/tr/floater_aaa.xml b/indra/newview/skins/default/xui/tr/floater_aaa.xml
index d663ec1a5b..d663ec1a5b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/tr/floater_aaa.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 8fa12ea759..7b925e8830 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -8,7 +8,9 @@
 		[COMPILER] [COMPILER_VERSION] sürümü ile oluşturuldu
 	</floater.string>
 	<floater.string name="AboutPosition">
-		&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] konumundasınız
+		&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
+SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+(küresel koordinatlar [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -63,27 +65,26 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
 		</panel>
 		<panel label="Lisanslar" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Telif Hakkı (C) 1992-2007 3Dconnexion
-        APR Telif Hakkı (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Telif Hakkı 2005 Sony Computer Entertainment Inc.
-        cURL Telif Hakkı (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Telif Hakkı (C) 1992-2009 3Dconnexion
+        APR Telif Hakkı (C) 2011 The Apache Software Foundation
+        Collada DOM Telif Hakkı 2006 Sony Computer Entertainment Inc.
+        cURL Telif Hakkı (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Telif Hakkı (C) 2002, 2003  CodeFactory AB / Telif Hakkı (C) 2003, 2004 Red Hat, Inc.
         expat Telif Hakkı (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Telif Hakkı (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Telif Hakkı (C) 1996-2002, 2006 David Turner, Robert Wilhelm ve Werner Lemberg.
         GL Telif Hakkı (C) 1999-2004 Brian Paul.
         GLOD Telif Hakkı (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University ve David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Telif Hakkı (c) 2005, Google Inc.
         Havok.com(TM) Telif Hakkı (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Telif Hakkı (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Telif Hakkı (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Telif Hakkı (C) 2001, Xiphophorus
-        OpenSSL Telif Hakkı (C) 1998-2002 The OpenSSL Project.
-        PCRE Telif Hakkı (c) 1997-2008 University of Cambridge
+        ogg/vorbis Telif Hakkı (C) 2002, Xiphophorus
+        OpenSSL Telif Hakkı (C) 1998-2008 The OpenSSL Project.
+        PCRE Telif Hakkı (c) 1997-2012 University of Cambridge
         SDL Telif Hakkı (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Telif Hakkı (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Telif Hakkı (C) 2000 Epinions, Inc.
-        zlib Telif Hakkı (C) 1995-2002 Jean-loup Gailly ve Mark Adler.
-        google-perftools Telif Hakkı (c) 2005, Google Inc.
+        zlib Telif Hakkı (C) 1995-2012 Jean-loup Gailly ve Mark Adler.
 
         Second Life Görüntüleyicisi Havok (TM) Fizik motorunu kullanmaktadır. (c)Telif Hakkı 1999-2010 Havok.com Inc. (ve Lisans Verenleri). Tüm Hakları Saklıdır. Ayrıntılı bilgi için bkz. www.havok.com
 
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
index a478d347a8..481fc540d0 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -451,7 +451,7 @@ Sadece büyük parseller aramada görünür.
 				Sadece şu Sakinlere erişim izni verin:
 			</text>
 			<check_box label="Ödeme bilgileri kayıtlı [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Sakinlerin bu parsele erişebilmesi için ödeme bilgilerinin kayıtlı olması gerekir.  Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
-			<check_box label="Yaş doğrulaması yapılmış [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Sakinlerin bu parsele erişebilmesi için yaş doğrulamalarının yapılmış olması gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
+			<check_box label="18 veya üzeri bir yaşta [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Sakinlerin bu parsele erişebilmesi için 18 veya üzeri bir yaşta olmaları gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
 			<check_box label="Grup Erişimine İzin Ver: [GROUP]" name="GroupCheck" tool_tip="Genel sekmesinde grup ayarla."/>
 			<check_box label="Geçiş haklr. şuna sat:" name="PassCheck" tool_tip="Bu parsele geçici erişim verir"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/tr/floater_activeim.xml b/indra/newview/skins/default/xui/tr/floater_activeim.xml
index f3f66b942f..f3f66b942f 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/tr/floater_activeim.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml
index a63e1e107e..a63e1e107e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_animation_anim_preview.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
index f8800c674d..f8800c674d 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_animation_bvh_preview.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_preview.xml
deleted file mode 100644
index f8800c674d..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_animation_preview.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		Hareket başlatılamadı
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animasyon dosyası [LENGTH] saniye uzunluğunda.
-
-Maksimum animasyon uzunluğu [LENGTH] saniye.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Animasyon dosyası okunamadı.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Tamam
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Dosyanın zamanından önce sonu.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Kısıtlama tanımı okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH dosyası açılamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Geçersiz HİYERARŞİ üst bilgisi.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		KÖK veya EKLEM bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		EKLEM adı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		OFSET bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		KANALLAR bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Döndürme sırası alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Döndürme ekseni alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		HAREKET bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		kARE SAYISI alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Kare zamanı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Konum değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Döndürme değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Çeviri dosyası açılamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Çeviri üst bilgisi okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Çeviri adları okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Çeviri yoksay değeri okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Çeviri nisbi değeri okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Çeviri çıkış adı değeri okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Çeviri matrisi okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Birleştirme alt birim adı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Birleştirme üst birim adı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Öncelik değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Döngü (tekrar) değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Easln (Yavaş Başlangıç) değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		EaseOut (Yavaş Bitiş) değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		El şekillendirme değeri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Duygu ifadesi adı okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Yanlış kök eklem adı, &quot;kalça&quot; kullanın
-	</floater.string>
-	<text name="name_label">
-		Ad:
-	</text>
-	<text name="description_label">
-		Açıklama:
-	</text>
-	<spinner label="Öncelik" name="priority" tool_tip="Bu animasyonun diğer animasyonları geçersiz kılabileceği kontrolleri"/>
-	<check_box label="Döngü" name="loop_check" tool_tip="Bu animasyonun döngülenmesini (tekrarlanmasını) sağlar"/>
-	<spinner label="İç (%)" name="loop_in_point" tool_tip="Döngünün döndüğü animasyon noktasını belirler"/>
-	<spinner label="Dış (%)" name="loop_out_point" tool_tip="Animasyonda döngünün bittiği noktayı belirler"/>
-	<text name="hand_label">
-		El Duruşu
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Ellerin animasyon sırasında neler yaptığını kontrol eder">
-		<combo_box.item label="Yayılım" name="Spread"/>
-		<combo_box.item label="Rahat" name="Relaxed"/>
-		<combo_box.item label="Her İkisi de İşaret Ediyor" name="PointBoth"/>
-		<combo_box.item label="Yumruk" name="Fist"/>
-		<combo_box.item label="Sol Rahat" name="RelaxedLeft"/>
-		<combo_box.item label="Sol İşaret Ediyor" name="PointLeft"/>
-		<combo_box.item label="Sol Yumruk" name="FistLeft"/>
-		<combo_box.item label="Sağ Rahat" name="RelaxedRight"/>
-		<combo_box.item label="Sağ İşaret Ediyor" name="PointRight"/>
-		<combo_box.item label="Sağ Yumruk" name="FistRight"/>
-		<combo_box.item label="Sağı Selamlıyor" name="SaluteRight"/>
-		<combo_box.item label="Yazı Yazıyor" name="Typing"/>
-		<combo_box.item label="Sağ Barış" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		İfade
-	</text>
-	<combo_box name="emote_combo" tool_tip="Yüzün animasyon sırasındaki ifadesini kontrol eder">
-		<item label="(Hiçbiri)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Korkmuş" name="Afraid" value="Korkmuş"/>
-		<item label="Kızgın" name="Angry" value="Kızgın"/>
-		<item label="Yaygın Gülümseyiş" name="BigSmile" value="Yaygın Gülümseyiş"/>
-		<item label="Canı Sıkılmış" name="Bored" value="Canı Sıkılmış"/>
-		<item label="Ağlama" name="Cry" value="Ağlama"/>
-		<item label="Dudak Bükme" name="Disdain" value="Dudak Bükme"/>
-		<item label="Utanmış" name="Embarrassed" value="Utanmış"/>
-		<item label="Kaş Çatma" name="Frown" value="Kaş Çatma"/>
-		<item label="Öpücük" name="Kiss" value="Öpücük"/>
-		<item label="Gülme" name="Laugh" value="Gülme"/>
-		<item label="Kahkaha" name="Plllppt" value="Kahkaha"/>
-		<item label="Tiksinmiş" name="Repulsed" value="Tiksinmiş"/>
-		<item label="Üzgün" name="Sad" value="Üzgün"/>
-		<item label="Omuz Silkme" name="Shrug" value="Omuz Silkme"/>
-		<item label="Gülümseme" name="Smile" value="Gülümseme"/>
-		<item label="Sürpriz" name="Surprise" value="Sürpriz"/>
-		<item label="Göz Kırpma" name="Wink" value="Göz Kırpma"/>
-		<item label="Endişelenme" name="Worry" value="Endişelenme"/>
-	</combo_box>
-	<text name="preview_label">
-		Şu sırada önizle
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Animasyon davranışınızı avatarınız genel hareketleri yaparken test etmek için bunu kullanın.">
-		<item label="Ayakta Duruyor" name="Standing" value="Ayakta Duruyor"/>
-		<item label="Yürüyor" name="Walking" value="Yürüyor"/>
-		<item label="Oturuyor" name="Sitting" value="Oturuyor"/>
-		<item label="Uçuyor" name="Flying" value="Uçuyor"/>
-	</combo_box>
-	<spinner label="Yavaş Başlangıç (saniye)" name="ease_in_time" tool_tip="Animasyonun kaynaştığı süre (saniye olarak)"/>
-	<spinner label="Yavaş Bitiş (saniye)" name="ease_out_time" tool_tip="Animasyonun ayrıştığı süre (saniye olarak)"/>
-	<button name="play_btn" tool_tip="Animasyonunu oynat"/>
-	<button name="pause_btn" tool_tip="Animasyonunu duraklat"/>
-	<button name="stop_btn" tool_tip="Animasyo oynatmayı durdur"/>
-	<text name="bad_animation_text">
-		Animasyon dosyası okunamadı.
-
-Poser 4&apos;ten aktarılan BHV dosyalarını tavsiye ederiz.
-	</text>
-	<button label="Karşıya Yükle (L$[AMOUNT])" name="ok_btn"/>
-	<button label="İptal" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_auction.xml b/indra/newview/skins/default/xui/tr/floater_auction.xml
index 3c945a9c96..3c945a9c96 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/tr/floater_auction.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
new file mode 100755
index 0000000000..e52e05dc61
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Otomatik Yerine Koyma Ayarları">
+	<check_box label="Otomatik Yerine Koymayı Etkinleştir" name="autoreplace_enable" tool_tip="Siz sohbet metni girdikçe, girilen herhangi bir anahtar kelimenin yerine karşılık gelen değiştirmeyi koyabilirsiniz"/>
+	<button label="Listeyi İçeri Aktar..." name="autoreplace_import_list" tool_tip="Daha önce aktarılan bir listeyi yükler."/>
+	<button label="Listeyi Aktarın..." name="autoreplace_export_list" tool_tip="Seçilen listeyi bir dosyaya kaydederek paylaşın."/>
+	<button label="Yeni Liste..." name="autoreplace_new_list" tool_tip="Yeni bir liste oluşturun."/>
+	<button label="Listeyi Sil" name="autoreplace_delete_list" tool_tip="Seçilen listeyi silin."/>
+	<button name="autoreplace_list_up" tool_tip="Bu listenin önceliğini yükseltin."/>
+	<button name="autoreplace_list_down" tool_tip="Bu listenin önceliğini azaltın."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Anahtar kelime" name="keyword"/>
+		<scroll_list.columns label="Değiştirme" name="replacement"/>
+	</scroll_list>
+	<button label="Ekle..." name="autoreplace_add_entry"/>
+	<button label="Kaldır" name="autoreplace_delete_entry"/>
+	<button label="Girişi Kaydet" name="autoreplace_save_entry" tool_tip="Bu girişi kaydet."/>
+	<button label="Değişiklikleri Kaydet" name="autoreplace_save_changes" tool_tip="Tüm değişiklikleri kaydet."/>
+	<button label="İptal" name="autoreplace_cancel" tool_tip="Tüm değişiklikleri iptal et."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar.xml b/indra/newview/skins/default/xui/tr/floater_avatar.xml
index c6b14ba710..c6b14ba710 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_avatar.xml
+++ b/indra/newview/skins/default/xui/tr/floater_avatar.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
index 99c2aae5a3..99c2aae5a3 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml
index b519cfa1a9..b519cfa1a9 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/tr/floater_avatar_textures.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_beacons.xml b/indra/newview/skins/default/xui/tr/floater_beacons.xml
index 08ebf36be5..08ebf36be5 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/tr/floater_beacons.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_build_options.xml b/indra/newview/skins/default/xui/tr/floater_build_options.xml
index 5e77f6b168..5e77f6b168 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/tr/floater_build_options.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
index 1d929a2dd3..bf4473ce1f 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/tr/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="İÇERİK İZİNLERİNİ DÜZENLE">
+<floater name="floaterbulkperms" title="İÇERİK İZİNLERİNİ AYARLA">
 	<floater.string name="nothing_to_modify_text">
 		Seçim içerisinde düzenlenebilir içerik yok.
 	</floater.string>
@@ -24,7 +24,7 @@
 	<button label="√ Tümü" name="check_all"/>
 	<button label="Temizle" label_selected="Hiçbiri" name="check_none"/>
 	<text name="newperms">
-		Yeni İçerik İzinleri
+		Şunun İçin İçerik İzinlerini Ayarla:
 	</text>
 	<text name="GroupLabel">
 		Grup:
@@ -40,6 +40,7 @@
 	<check_box label="Değiştir" name="next_owner_modify"/>
 	<check_box label="Kopyala" name="next_owner_copy"/>
 	<check_box initial_value="true" label="Aktar" name="next_owner_transfer" tool_tip="Sonraki sahibi bu nesneyi verebilir veya tekrar satabilir"/>
-	<button label="Tamam" name="apply"/>
+	<button label="Tamam" name="ok"/>
+	<button label="Uygula" name="apply"/>
 	<button label="İptal" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_bumps.xml b/indra/newview/skins/default/xui/tr/floater_bumps.xml
index 06ae3a2ec3..06ae3a2ec3 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/tr/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml
index 9012189ce5..9012189ce5 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/tr/floater_buy_contents.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml
index d90985dcff..d90985dcff 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/tr/floater_buy_currency.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml
index 98aaf50db0..98aaf50db0 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_land.xml b/indra/newview/skins/default/xui/tr/floater_buy_land.xml
index 7b43af2ea4..7b43af2ea4 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_buy_land.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_buy_object.xml b/indra/newview/skins/default/xui/tr/floater_buy_object.xml
index 91ef05fb29..91ef05fb29 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/tr/floater_buy_object.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_camera.xml b/indra/newview/skins/default/xui/tr/floater_camera.xml
index 22e2aa52c6..22e2aa52c6 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/tr/floater_camera.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
index 988c845982..cd999b4b7a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
+++ b/indra/newview/skins/default/xui/tr/floater_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="chat_bar" title="YAKINDAKİ SOHBET">
+<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
 	<panel name="bottom_panel">
 		<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
 		<button name="show_nearby_chat" tool_tip="Yakın sohbet günlüğünü gösterir/gizler"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_choose_group.xml b/indra/newview/skins/default/xui/tr/floater_choose_group.xml
index 1bfc772f4a..1bfc772f4a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/tr/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_color_picker.xml b/indra/newview/skins/default/xui/tr/floater_color_picker.xml
index c9465fff83..c9465fff83 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/tr/floater_color_picker.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
new file mode 100644
index 0000000000..5f8dac506f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ">
+	<panel name="buttons_panel">
+		<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+		<menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
new file mode 100644
index 0000000000..84403dfd68
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="KONUŞMA:">
+	<floater.string name="Title">
+		KONUŞMA: [NAME]
+	</floater.string>
+	<text name="page_label" value="Sayfa"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_critical.xml b/indra/newview/skins/default/xui/tr/floater_critical.xml
index 041a303bae..041a303bae 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_critical.xml
+++ b/indra/newview/skins/default/xui/tr/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
index 915770f727..915770f727 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/tr/floater_delete_env_preset.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_destinations.xml b/indra/newview/skins/default/xui/tr/floater_destinations.xml
index 4504366d63..4504366d63 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_destinations.xml
+++ b/indra/newview/skins/default/xui/tr/floater_destinations.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_display_name.xml b/indra/newview/skins/default/xui/tr/floater_display_name.xml
index e39be5a24b..e39be5a24b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/tr/floater_display_name.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
index 4be1068dcc..4be1068dcc 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/tr/floater_edit_day_cycle.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
index 0e9f86148d..0e9f86148d 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/tr/floater_edit_sky_preset.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
index 2ddee32bad..2ddee32bad 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/tr/floater_edit_water_preset.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_env_settings.xml b/indra/newview/skins/default/xui/tr/floater_env_settings.xml
deleted file mode 100644
index d53629f6fe..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ÇEVRE DÜZENLEYİCİ">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Günün Saati
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Bulut Örtüsü
-	</text>
-	<text name="EnvWaterColorText">
-		Su Rengi
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Renk seçiciyi açmak için tıklayın"/>
-	<text name="EnvWaterFogText">
-		Su Sisi
-	</text>
-	<button label="Gayrimenkul Saati Kullan" name="EnvUseEstateTimeButton"/>
-	<button label="Gelişmiş Gökyüzü" name="EnvAdvancedSkyButton"/>
-	<button label="Gelişmiş Su" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
index e702da7e1b..e702da7e1b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_environment_settings.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_event.xml b/indra/newview/skins/default/xui/tr/floater_event.xml
index 60dece124b..60dece124b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_event.xml
+++ b/indra/newview/skins/default/xui/tr/floater_event.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
index 5736bda45e..5736bda45e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_font_test.xml b/indra/newview/skins/default/xui/tr/floater_font_test.xml
index 5371d5d2a4..5371d5d2a4 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/tr/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_gesture.xml b/indra/newview/skins/default/xui/tr/floater_gesture.xml
index 5f5d28ad6c..5f5d28ad6c 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/tr/floater_gesture.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_god_tools.xml b/indra/newview/skins/default/xui/tr/floater_god_tools.xml
index 26e5ebd18b..26e5ebd18b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_god_tools.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_goto_line.xml b/indra/newview/skins/default/xui/tr/floater_goto_line.xml
new file mode 100644
index 0000000000..673fe553cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="ŞU SATIRA GİT:">
+	<button label="Tamam" label_selected="Tamam" name="goto_btn"/>
+	<text name="txt">
+		Şu satıra git:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
index 8e056b9b0d..b204389083 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		VBO Etkinleştir:
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex Tampon Nesnelerini Etkinleştir" name="vbo" tool_tip="Modern donanımlarda bunun etkinleştirilmesi performans artışı sağlar.  Ancak, eski donanımlardaki VBO uygulamaları yetersizdir ve etkinleştirildiğinde bilgisayarınız çökebilir."/>
+	<text name="tc label">
+		S3TC&apos;ü Etkinleştir:
+	</text>
+	<check_box initial_value="true" label="Doku Sıkıştırmasını Etkinleştir (yeniden başlatma gerektirir)" name="texture compression" tool_tip="Video bellekteki dokuları sıkıştırır, renk kalitesinde bazı kayıplar olmasına karşın daha yüksek çözünürlükte dokuların yüklenmesine imkan tanır."/>
 	<slider label="Doku Belleği (MB):" name="GraphicsCardTextureMemory" tool_tip="Dokular için tahsis edilecek bellek miktarı. Varsayılan değer video kartı belleğidir. Bu değerin küçültülmesi performansı artırabilir, ama ayrıca dokuları bulanıklaştırabilir."/>
 	<spinner label="Sis Mesafe Oranı:" name="fog"/>
 	<button label="Tamam" label_selected="Tamam" name="OK"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_help_browser.xml b/indra/newview/skins/default/xui/tr/floater_help_browser.xml
index 695f838936..695f838936 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/tr/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_how_to.xml b/indra/newview/skins/default/xui/tr/floater_how_to.xml
index a42fe0b122..a42fe0b122 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/tr/floater_how_to.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_hud.xml b/indra/newview/skins/default/xui/tr/floater_hud.xml
index 09f119bbc1..09f119bbc1 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_hud.xml
+++ b/indra/newview/skins/default/xui/tr/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
index 4451d1d309..6504430b3c 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="SOHBETLER"/>
+<multi_floater name="floater_im_box" title="SOHBETLER">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+					<button name="add_btn" tool_tip="Yeni bir sohbet başlat"/>
+					<button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/>
+					<text name="stub_textbox">
+						Sohbet ayrı bir pencerede.   [secondlife:/// Bunu geri getir.]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index bed08b36c6..52a10feeef 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="Kime" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/>
+	<floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/>
+	<floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/>
+	<floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/>
+	<floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<button name="add_btn" tool_tip="Bu sohbete birini ekle"/>
+				<button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/>
+				<button name="close_btn" tool_tip="Bu sohbeti bitir"/>
+				<button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="Kime" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_image_preview.xml b/indra/newview/skins/default/xui/tr/floater_image_preview.xml
index a5963bdf63..a5963bdf63 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_image_preview.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_import_collada.xml b/indra/newview/skins/default/xui/tr/floater_import_collada.xml
index 1e77d1b376..1e77d1b376 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_import_collada.xml
+++ b/indra/newview/skins/default/xui/tr/floater_import_collada.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
index adb03c2dff..0f2b27241e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonim
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		arıyor.
+		sizi arıyor.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		bir Sesli Sohbet aramasına bir konferans araması ile katıldı.
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</floater.string>
 	<text name="question">
-		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
+		Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek.
 	</text>
-	<button label="Kabul Et" label_selected="Kabul Et" name="Accept"/>
-	<button label="Reddet" label_selected="Reddet" name="Reject"/>
-	<button label="Aİ Başlat" name="Start IM"/>
+	<button label="Yanıtla" label_selected="Yanıtla" name="Accept"/>
+	<button label="Yok say" label_selected="Yok say" name="Reject"/>
+	<button label="Bunun yerine Aİ aç" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inspect.xml b/indra/newview/skins/default/xui/tr/floater_inspect.xml
index 09130a31f3..09130a31f3 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inspect.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory.xml b/indra/newview/skins/default/xui/tr/floater_inventory.xml
deleted file mode 100644
index cfb12d4b68..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_inventory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="ENVANTERİM">
-	<panel label="Envanter Paneli" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
index e49fef1f46..e49fef1f46 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_item_properties.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
index 9d1a556751..9d1a556751 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_joystick.xml b/indra/newview/skins/default/xui/tr/floater_joystick.xml
index 4a27aac3c1..4a27aac3c1 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/tr/floater_joystick.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
index 736c50be90..736c50be90 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/tr/floater_lagmeter.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml
index a075a93c1e..a075a93c1e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_land_holdings.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
index 34c3e28a0b..34c3e28a0b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/tr/floater_live_lsleditor.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml
index 0b898d6032..0b898d6032 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/tr/floater_lsl_guide.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_map.xml b/indra/newview/skins/default/xui/tr/floater_map.xml
index 7d6c314f04..7d6c314f04 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_map.xml
+++ b/indra/newview/skins/default/xui/tr/floater_map.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_media_browser.xml b/indra/newview/skins/default/xui/tr/floater_media_browser.xml
index 6cce4d59b8..6cce4d59b8 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/tr/floater_media_browser.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_media_settings.xml b/indra/newview/skins/default/xui/tr/floater_media_settings.xml
index 4205a0dbef..4205a0dbef 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_media_settings.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml
index ba87ee99a4..ba87ee99a4 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/tr/floater_mem_leaking.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
index 325d1d9ed9..325d1d9ed9 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
index 0c7cabc6ea..c00cadd3bd 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Üçgenler" name="triangles" value="Üçgenler"/>
 				<text initial_value="Köşeler" name="vertices" value="Köşeler"/>
 				<text initial_value="Yüksek" name="high_label" value="Yüksek"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Orta" name="medium_label" value="Orta"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+					<item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Düşük" name="low_label" value="Düşük"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+					<item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="En Düşük" name="lowest_label" value="En Düşük"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+					<item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Normalleri Oluştur" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_model_wizard.xml b/indra/newview/skins/default/xui/tr/floater_model_wizard.xml
deleted file mode 100644
index 9d8b982c24..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_model_wizard.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Model Wizard" title="KARŞIYA MODEL YÜKLEME SİHİRBAZI">
-	<button label="5. Karşıya Yükle" name="upload_btn"/>
-	<button label="4. İncele" name="review_btn"/>
-	<button label="3. Fizik" name="physics_btn"/>
-	<button label="2. Optimize et" name="optimize_btn"/>
-	<button label="1. Dosya Seç" name="choose_file_btn"/>
-	<panel name="choose_file_panel">
-		<panel name="choose_file_header_panel">
-			<text name="choose_file_header_text">
-				Model dosyasını seçin
-			</text>
-		</panel>
-		<panel name="choose_file_content">
-			<text name="advanced_users_text">
-				Gelişmiş kullanıcılar: Eğer 3B içerik oluşturma araçlarını kullanmayı biliyorsanız, Gelişmiş Karşıya Yükleyiciyi kullanmak isteyebilirsiniz.
-			</text>
-			<button label="Gelişmişe geç" name="switch_to_advanced"/>
-			<text name="Cache location">
-				Karşıya yüklenecek model dosyasını seçin
-			</text>
-			<button label="Gözat..." label_selected="Gözat..." name="browse"/>
-			<text name="Model types">
-				Second Life, COLLADA (.dae) dosyalarını destekler
-			</text>
-			<text name="dimensions">
-				X         Y         Z
-			</text>
-			<text name="warning_label">
-				UYARI:
-			</text>
-			<text name="warning_text">
-				Bu modelin Second Life sunucularına nihai karşıya yükleme adımını tamamlayamayacaksınız. Hesabınızı örgü modellerinin karşıya yüklenmesi için ayarlamanın [secondlife:///app/floater/learn_more nasıl yapılacağını öğrenin].
-			</text>
-		</panel>
-	</panel>
-	<panel name="optimize_panel">
-		<panel name="optimize_header_panel">
-			<text name="optimize_header_text">
-				Modeli optimize et
-			</text>
-		</panel>
-		<text name="optimize_description">
-			Modeli performans için optimize ettik. İstiyorsanız daha da ayarlayabilirsiniz.
-		</text>
-		<panel name="optimize_content">
-			<text name="high_detail_text">
-				Ayrıntı Seviyesi Oluştur: Yüksek
-			</text>
-			<text name="medium_detail_text">
-				Ayrıntı Seviyesi Oluştur: Orta
-			</text>
-			<text name="low_detail_text">
-				Ayrıntı Seviyesi Oluştur: Düşük
-			</text>
-			<text name="lowest_detail_text">
-				Ayrıntı Seviyesi Oluştur: En Düşük
-			</text>
-		</panel>
-		<panel name="content2">
-			<button label="Geometri hesaplarını tekrar yap" name="recalculate_geometry_btn"/>
-			<text name="lod_label">
-				Geometri önizleme
-			</text>
-			<combo_box name="preview_lod_combo" tool_tip="Önizleme işlemesinde görülecek ayrıntı seviyesi">
-				<combo_item name="high">
-					Çok ayrıntı
-				</combo_item>
-				<combo_item name="medium">
-					Orta düzey ayrıntı
-				</combo_item>
-				<combo_item name="low">
-					Az ayrıntı
-				</combo_item>
-				<combo_item name="lowest">
-					En az ayrıntı
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="physics_panel">
-		<panel name="physics_header_panel">
-			<text name="physics_header_text">
-				Fizik ayarlarını yap
-			</text>
-		</panel>
-		<text name="physics_description">
-			Modelin dış gövdesi için bir şekil oluşturacağız. Modelinizin amacına uygun olarak şeklin ayrıntı seviyesini belirleyin.
-		</text>
-		<panel name="physics_content">
-			<button label="Fizik hesaplarını tekrar yap" name="recalculate_physics_btn"/>
-			<button label="Tekrar hesaplanıyor..." name="recalculating_physics_btn"/>
-			<text name="lod_label">
-				Fizik önizleme
-			</text>
-			<combo_box name="preview_lod_combo2" tool_tip="Önizleme işlemesinde görülecek ayrıntı seviyesi">
-				<combo_item name="high">
-					Çok ayrıntı
-				</combo_item>
-				<combo_item name="medium">
-					Orta düzey ayrıntı
-				</combo_item>
-				<combo_item name="low">
-					Az ayrıntı
-				</combo_item>
-				<combo_item name="lowest">
-					En az ayrıntı
-				</combo_item>
-			</combo_box>
-		</panel>
-	</panel>
-	<panel name="review_panel">
-		<panel name="review_header_panel">
-			<text name="review_header_text">
-				İncele
-			</text>
-		</panel>
-		<panel name="review_content">
-			<text name="review_prim_equiv">
-				Parsele/bölgeye etkisi: [EQUIV] prim eşdeğerleri
-			</text>
-			<text name="review_fee">
-				Hesabınızdan L$ [FEE] karşıya yükleme ücreti düşülecektir.
-			</text>
-			<text name="review_confirmation">
-				Karşıya yükleme düğmesine tıkladığınızda, modelde yer alan malzeme için ilgili haklara sahip olduğunuzu teyid edersiniz.
-			</text>
-		</panel>
-	</panel>
-	<panel name="upload_panel">
-		<panel name="upload_header_panel">
-			<text name="upload_header_text">
-				Karşıya yükleme bitti
-			</text>
-		</panel>
-		<text name="model_uploaded_text">
-			Modeliniz karşıya yüklendi.
-		</text>
-		<text name="inventory_text">
-			Bunu, envanterinizdeki Nesneler klasöründe bulacaksınız.
-		</text>
-		<text name="charged_fee">
-			Hesabınızdan L$ [FEE] düşüldü.
-		</text>
-	</panel>
-	<button label="&lt;&lt; Geri" name="back"/>
-	<button label="Sonraki &gt;&gt;" name="next"/>
-	<button label="Ağırlıkları ve ücreti hesapla &gt;&gt;" name="calculate"/>
-	<button label="Hesaplanıyor..." name="calculating"/>
-	<button label="Karşıya Yükle" name="upload" tool_tip="Simülatöre karşıya yükle"/>
-	<button label="İptal" name="cancel"/>
-	<button label="Kapat" name="close"/>
-	<spinner name="import_scale" value="1.0"/>
-	<string name="status_idle">
-		Boşta
-	</string>
-	<string name="status_parse_error">
-		Dae ayrıştırma sorunu - ayrıntılar için günlüğe bakın.
-	</string>
-	<string name="status_reading_file">
-		Yükleniyor...
-	</string>
-	<string name="status_generating_meshes">
-		Örgüler Oluşturuluyor...
-	</string>
-	<string name="status_vertex_number_overflow">
-		Hata: Köşe numarası 65534&apos;ten fazla, işlem durduruldu!
-	</string>
-	<string name="bad_element">
-		Hata: Öğe geçersiz
-	</string>
-	<string name="high">
-		Yüksek
-	</string>
-	<string name="medium">
-		Orta
-	</string>
-	<string name="low">
-		Düşük
-	</string>
-	<string name="lowest">
-		En Düşük
-	</string>
-	<string name="mesh_status_good">
-		Uygula!
-	</string>
-	<string name="mesh_status_na">
-		G/D
-	</string>
-	<string name="mesh_status_none">
-		Hiçbiri
-	</string>
-	<string name="mesh_status_submesh_mismatch">
-		Ayrıntı seviyelerinde farklı sayıda dokulanabilir yüz var.
-	</string>
-	<string name="mesh_status_mesh_mismatch">
-		Ayrıntı seviyelerinde farklı sayıda örgü örneği var.
-	</string>
-	<string name="mesh_status_too_many_vertices">
-		Ayrıntı seviyesinde fazla sayıda köşe var.
-	</string>
-	<string name="mesh_status_missing_lod">
-		Gereken ayrıntı seviyesi eksik.
-	</string>
-	<string name="layer_all">
-		Tümü
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_moveview.xml b/indra/newview/skins/default/xui/tr/floater_moveview.xml
index 9226218a24..9226218a24 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_moveview.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_mute_object.xml b/indra/newview/skins/default/xui/tr/floater_mute_object.xml
index becad38a8e..becad38a8e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/tr/floater_mute_object.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml
index 4d71187a1f..4d71187a1f 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_my_appearance.xml
+++ b/indra/newview/skins/default/xui/tr/floater_my_appearance.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml
index 8c62692a88..8c62692a88 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_my_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/floater_my_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
deleted file mode 100644
index 6b12ad0ef5..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
-	<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_notification.xml b/indra/newview/skins/default/xui/tr/floater_notification.xml
index 89a56348f6..89a56348f6 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_notification.xml
+++ b/indra/newview/skins/default/xui/tr/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml
index e4eaf2cf9e..e4eaf2cf9e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_object_weights.xml b/indra/newview/skins/default/xui/tr/floater_object_weights.xml
index b57943f666..b57943f666 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_object_weights.xml
+++ b/indra/newview/skins/default/xui/tr/floater_object_weights.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_openobject.xml b/indra/newview/skins/default/xui/tr/floater_openobject.xml
index 9980aee97f..9980aee97f 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/tr/floater_openobject.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml
index 7a9f507c93..7a9f507c93 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/tr/floater_outfit_save_as.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml
index 7ba4580f4f..7ba4580f4f 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_outgoing_call.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..f38d8c84c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Yol bulma karakterleri">
+	<floater.string name="messaging_get_inprogress">
+		Yol bulma karakterleri için sorgulama yapılıyor ...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Yol bulma karakterleri için sorgulama yapılırken hata saptandı.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Yol bulma karakterleri yok.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Toplam [NUM_TOTAL] karakter içerisinden [NUM_SELECTED] adet seçildi.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Yükleniyor]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Bilinmiyor]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[grup]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Ad" name="name"/>
+			<scroll_list.columns label="Açıklama" name="description"/>
+			<scroll_list.columns label="Sahip" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="İrtifa" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Karakterler:
+		</text>
+		<button label="Listeyi yenile" name="refresh_objects_list"/>
+		<button label="Tümünü seç" name="select_all_objects"/>
+		<button label="Hiçbirini seçme" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Seçilen karakterler üzerinde eylemler:
+		</text>
+		<check_box label="İşareti göster" name="show_beacon"/>
+		<check_box label="Fizik kapsülünü göster" name="show_physics_capsule"/>
+		<button label="Al" name="take_objects"/>
+		<button label="Kopya al" name="take_copy_objects"/>
+		<button label="Beni ona ışınla" name="teleport_me_to_object" tool_tip="Sadece bir karakter seçildiğinde etkindir."/>
+		<button label="İade Et" name="return_objects"/>
+		<button label="Sil" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..6eecc7fb77
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Yol bulma görüntüleme / test">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Yol bulma kütüphanesi uygulaması bulunamıyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Bölgenin yüklenmesinin bitmesi bekleniyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Navigasyon örgüsünün durumu kontrol ediliyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Navigasyon örgüsü indiriliyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Sunucudaki navigasyon örgüsü değişti. En son navigasyon örgüsü indiriliyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		En son navigasyon örgüsü indirildi.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Navigasyon örgüsü başarıyla indirilemedi.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Navigasyon örgüsünde bekleyen değişiklikler var.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Navigasyon örgüsü oluşturuluyor.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Bazı navigasyon örgüsü bölgelerinde bekleyen değişiklikler var.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Bazı navigasyon örgüsü bölgeleri oluşturuluyor.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Bazı navigasyon örgüsü bölgelerinde bekleyen değişiklikler var, bazıları ise oluşturuluyor.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Navigasyon örgüsü güncel.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Yol bulma kütüphanesi uygulaması bulunamıyor.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Lütfen başlangıç ve bitim noktalarını seçin.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Lütfen başlangıç noktasını seçin.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Lütfen bitim noktasını seçin.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Yol turuncu olarak gösterilmiştir.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Seçilen noktalar arasında bir yol bulunamıyor.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Yol oluşturma sırasında bir hata meydana geldi.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Görünüm" name="view_panel">
+			<text name="show_label">
+				Göster:
+			</text>
+			<check_box label="Dünya" name="show_world"/>
+			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
+			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				Yürüyebilirlik haritasını göster:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Gösterme" name="show_heatmap_mode_none"/>
+				<combo_box.item label="A karakter tipi" name="show_heatmap_mode_a"/>
+				<combo_box.item label="B karakter tipi" name="show_heatmap_mode_b"/>
+				<combo_box.item label="C karakter tipi" name="show_heatmap_mode_c"/>
+				<combo_box.item label="D karakter tipi" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Yürüyebilirler" name="show_walkables"/>
+			<check_box label="Maddi hacimler" name="show_material_volumes"/>
+			<check_box label="Statik engeller" name="show_static_obstacles"/>
+			<check_box label="Hariç tutma hacimleri" name="show_exclusion_volumes"/>
+			<check_box label="Su düzlemi" name="show_water_plane"/>
+			<check_box label="X-ışını görünümü ile" name="show_xray"/>
+		</panel>
+		<panel label="Yolu test et" name="test_panel">
+			<text name="ctrl_click_label">
+				Başlangıç noktasını seçmek için Ctrl tuşuna basarak tıklayın.
+			</text>
+			<text name="shift_click_label">
+				Bitim noktasını seçmek için Shift tuşuna basarak tıklayın.
+			</text>
+			<text name="character_width_label">
+				Karakter genişliği
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Karakter tipi
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Hiçbiri" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Yolu temizle" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..2e416c9311
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Yol bulma bağlantı kümeleri">
+	<floater.string name="messaging_get_inprogress">
+		Yol bulma bağlantı kümeleri için sorgulama yapılıyor ...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Yol bulma bağlantı kümeleri için sorgulama yapılırken hata saptandı.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Seçilen yol bulma bağlantı kümeleri değiştiriliyor ...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Seçilen yol bulma bağlantı kümeleri değiştirilirken hata saptandı.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Yol bulma bağlantı kümeleri yok.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Toplam [NUM_TOTAL] bağlantı kümesi içerisinden [NUM_SELECTED] adet seçildi.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Yüzey]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Yükleniyor]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Bilinmiyor]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[grup]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		Evet
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		Hayır
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		Bilinmiyor
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Yürüyebilir
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Statik engel
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Hareket ettirilebilir engel
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Maddi hacim
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Hariç tutma hacmi
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Hareket ettirilebilir fantom
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[değiştirilemez]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[kısıtlı]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[konkav]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[kısıtlı, konkav]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Bağlantı kümesi kullanımını seç...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Bağlantı kümesi kullanımına göre filtrele..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Yürüyebilir" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Statik engel" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Hareket ettirilebilir engel" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Maddi hacim" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Hariç tutma hacmi" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Hareket ettirilebilir fantom" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Uygula" name="apply_filters"/>
+		<button label="Temizle" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Ad (kök prim)" name="name"/>
+			<scroll_list.columns label="Açıklama (kök prim)" name="description"/>
+			<scroll_list.columns label="Sahip" name="owner"/>
+			<scroll_list.columns label="Komut Dosyalı" name="scripted"/>
+			<scroll_list.columns label="Etki" name="land_impact"/>
+			<scroll_list.columns label="Mesafe" name="dist_from_you"/>
+			<scroll_list.columns label="Bağlantı kümesi kullanımı" name="linkset_use"/>
+			<scroll_list.columns label="% A" name="a_percent"/>
+			<scroll_list.columns label="% B" name="b_percent"/>
+			<scroll_list.columns label="% C" name="c_percent"/>
+			<scroll_list.columns label="% D" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Bağlantı kümeleri:
+		</text>
+		<button label="Listeyi yenile" name="refresh_objects_list"/>
+		<button label="Tümünü seç" name="select_all_objects"/>
+		<button label="Hiçbirini seçme" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="İşareti göster" name="show_beacon"/>
+		<button label="Al" name="take_objects"/>
+		<button label="Kopya al" name="take_copy_objects"/>
+		<button label="Beni ona ışınla" name="teleport_me_to_object"/>
+		<button label="İade Et" name="return_objects"/>
+		<button label="Sil" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Yürüyebilirlik:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="A tipi karakterleri için yürüyebilirlik. Örnek karakter tipi humanoiddir."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="B tipi karakterleri için yürüyebilirlik. Örnek karakter tipi yaratıktır."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="C tipi karakterleri için yürüyebilirlik. Örnek karakter tipi mekaniktir."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="D tipi karakterleri için yürüyebilirlik. Örnek karakter tipi diğerdir."/>
+		<button label="Değişiklikleri uygula" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoid)
+		</text>
+		<text name="suggested_use_b_label">
+			(Yaratık)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mekanik)
+		</text>
+		<text name="suggested_use_d_label">
+			(Diğer)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pay.xml b/indra/newview/skins/default/xui/tr/floater_pay.xml
index 6604e5c37a..6604e5c37a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pay.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_pay_object.xml b/indra/newview/skins/default/xui/tr/floater_pay_object.xml
index 7772d3b101..7772d3b101 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pay_object.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_people.xml b/indra/newview/skins/default/xui/tr/floater_people.xml
index 94a27bff57..94a27bff57 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_people.xml
+++ b/indra/newview/skins/default/xui/tr/floater_people.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
index 669b833c26..669b833c26 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/tr/floater_perm_prefs.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_picks.xml b/indra/newview/skins/default/xui/tr/floater_picks.xml
index 513a2e319a..513a2e319a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_picks.xml
+++ b/indra/newview/skins/default/xui/tr/floater_picks.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_places.xml b/indra/newview/skins/default/xui/tr/floater_places.xml
index 4e09a699f6..4e09a699f6 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_places.xml
+++ b/indra/newview/skins/default/xui/tr/floater_places.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_post_process.xml b/indra/newview/skins/default/xui/tr/floater_post_process.xml
index 5e419f8ffa..5e419f8ffa 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/tr/floater_post_process.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_postcard.xml b/indra/newview/skins/default/xui/tr/floater_postcard.xml
deleted file mode 100644
index ef11c68afe..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_postcard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ANLIK GÖRÜNTÜYÜ E-POSTAYLA GÖNDER">
-	<floater.string name="default_subject">
-		SECOND_LIFE]&apos;dan posta kartı.
-	</floater.string>
-	<floater.string name="default_message">
-		Buna bakın!
-	</floater.string>
-	<floater.string name="upload_message">
-		Gönderiyor...
-	</floater.string>
-	<text name="to_label">
-		Alıcının E-postası:
-	</text>
-	<text name="from_label">
-		E-postanız:
-	</text>
-	<text name="name_label">
-		Adınız:
-	</text>
-	<text name="subject_label">
-		Konu:
-	</text>
-	<line_editor label="Konunuzu buraya yazın." name="subject_form"/>
-	<text name="msg_label">
-		İleti:
-	</text>
-	<text_editor name="msg_form">
-		İletinizi buraya yazın.
-	</text_editor>
-	<button label="İptal" name="cancel_btn"/>
-	<button label="Gönder" name="send_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences.xml b/indra/newview/skins/default/xui/tr/floater_preferences.xml
index edb3c19b81..edb3c19b81 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preferences.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml
index 1c462e6ebf..1c462e6ebf 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preferences_proxy.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
index 23b4848333..23b4848333 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_animation.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
index dc6f66f657..dc6f66f657 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_gesture.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
index 23391249d1..23391249d1 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml
index 50874f024a..50874f024a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_sound.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
index 79e184130a..79e184130a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/tr/floater_preview_texture.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml
index 5cdd25b64c..5cdd25b64c 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/tr/floater_price_for_listing.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml
index 572892667b..572892667b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/tr/floater_publish_classified.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml
index e2a5e8e86a..e2a5e8e86a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_region_info.xml b/indra/newview/skins/default/xui/tr/floater_region_info.xml
index 2b2e00161b..2b2e00161b 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/tr/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
index c5765883c4..c5765883c4 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/tr/floater_report_abuse.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug.xml b/indra/newview/skins/default/xui/tr/floater_script_debug.xml
index baf0aabd85..baf0aabd85 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_script_limits.xml b/indra/newview/skins/default/xui/tr/floater_script_limits.xml
index 875599bde3..875599bde3 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_script_preview.xml b/indra/newview/skins/default/xui/tr/floater_script_preview.xml
index e193f7c1af..e193f7c1af 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_preview.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_script_queue.xml b/indra/newview/skins/default/xui/tr/floater_script_queue.xml
index c1d98b717a..c1d98b717a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_queue.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_script_search.xml b/indra/newview/skins/default/xui/tr/floater_script_search.xml
index 54b1d20c8c..54b1d20c8c 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/tr/floater_script_search.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_search.xml b/indra/newview/skins/default/xui/tr/floater_search.xml
index 08c1e5162c..08c1e5162c 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_search.xml
+++ b/indra/newview/skins/default/xui/tr/floater_search.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_select_key.xml b/indra/newview/skins/default/xui/tr/floater_select_key.xml
index b828672ec2..b828672ec2 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/tr/floater_select_key.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_sell_land.xml b/indra/newview/skins/default/xui/tr/floater_sell_land.xml
index 9bea1e120e..9bea1e120e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_sell_land.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml
index 65264c57d7..65264c57d7 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/tr/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_snapshot.xml b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
index fa51f15d16..fa51f15d16 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/tr/floater_snapshot.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
index 470a222d7e..470a222d7e 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
+++ b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml
index 1938f184b3..1938f184b3 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml
new file mode 100755
index 0000000000..f5f0ba8fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Yazım Denetimcisi Ayarları">
+	<check_box label="Yazım denetimcisini etkinleştir" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Ana sözlük :
+	</text>
+	<text label="Günlükler:" name="spellcheck_additional">
+		İlave sözlükler :
+	</text>
+	<text name="spellcheck_available">
+		Mevcut
+	</text>
+	<text name="spellcheck_active">
+		Etkin
+	</text>
+	<button label="Kaldır" name="spellcheck_remove_btn"/>
+	<button label="İçeri Aktar..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..ded71cad40
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Sözlüğü İçeri Aktar">
+	<button label="Gözat" label_selected="Gözat" name="dictionary_path_browse"/>
+	<button label="İçeri Aktar" name="ok_btn"/>
+	<button label="İptal" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
index 17f1166c46..afce87bdaa 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="Saniyede Bir Çizilen Üçgenler" name="ktrissec"/>
 					<stat_bar label="Toplam Nesne" name="objs"/>
 					<stat_bar label="Yeni Nesne" name="newobjs"/>
+					<stat_bar label="Nesne Önbellek İsabet Oranı" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Doku" name="texture">
+					<stat_bar label="Önbellek İsabet Oranı" name="texture_cache_hits"/>
+					<stat_bar label="Önbellek Okuma Gecikme Süresi" name="texture_cache_read_latency"/>
 					<stat_bar label="Sayım" name="numimagesstat"/>
 					<stat_bar label="Ham Sayım" name="numrawimagesstat"/>
 					<stat_bar label="GL Belleği" name="gltexmemstat"/>
@@ -50,7 +53,13 @@
 				<stat_bar label="Nesneler" name="simobjects"/>
 				<stat_bar label="Etkin Nesneler" name="simactiveobjects"/>
 				<stat_bar label="Etkin Komut Dosyaları" name="simactivescripts"/>
+				<stat_bar label="Çalıştırılan Komut Dosyaları" name="simpctscriptsrun"/>
 				<stat_bar label="Komut Dosyası Etkinlikleri" name="simscripteps"/>
+				<stat_view label="Yol bulma" name="simpathfinding">
+					<stat_bar label="Yapay Zeka Adım Süresi" name="simsimaistepmsec"/>
+					<stat_bar label="Atlanan Siluet Adımları" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Güncellenen Karakterler" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Gelen Paketler" name="siminpps"/>
 				<stat_bar label="Giden Paketler" name="simoutpps"/>
 				<stat_bar label="Bekleyen Karşıdan Yüklemeler" name="simpendingdownloads"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_sys_well.xml b/indra/newview/skins/default/xui/tr/floater_sys_well.xml
index 301d9af063..301d9af063 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/tr/floater_sys_well.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_telehub.xml b/indra/newview/skins/default/xui/tr/floater_telehub.xml
index 2cdb464ed0..2cdb464ed0 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/tr/floater_telehub.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml
index b479d5f6d6..b479d5f6d6 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/tr/floater_test_layout_stacks.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml
index fcb7d87287..fcb7d87287 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml
+++ b/indra/newview/skins/default/xui/tr/floater_test_text_vertical_aligment.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 4ef789f585..42483c09e1 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -9,15 +9,27 @@
 	<text name="Multiple">
 		Birden çok doku
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Envanter" name="inventory" value="0"/>
+		<radio_item label="Yerel" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Büyüklük: [DIMENSIONS]
 	</text>
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
-	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
+	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
 	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="Önizleme Devre Dışı"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
+	<button label="Ekle" label_selected="Ekle" name="l_add_btn"/>
+	<button label="Kaldır" label_selected="Kaldır" name="l_rem_btn"/>
+	<button label="Karşıya Yükle" label_selected="Karşıya Yükle" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Ad" name="unit_name"/>
+		<column label="Kimlik" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="Tamam" label_selected="Tamam" name="Select"/>
 	<button label="İptal" label_selected="İptal" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..42426225c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Doku Alımı Hata Ayıklayıcı">
+	<text name="total_num_fetched_label">
+		1, Alınan dokuların toplam sayısı: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Toplam alım talebi sayısı: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Toplam önbellek isabet sayısı: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Görünür dokuların toplam sayısı: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Görünür dokuların alınması için toplam talep sayısı: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Alınan verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Görünür verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, İşlenen verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Önbellek okunması için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Önbellek yazılması için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_decode_label">
+		11, Şifre çözülmesi için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_gl_label">
+		12, GL doku oluşturma için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_http_label">
+		13, HTTP alımı için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tüm alımlar için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Görünür dokuların önbellekten tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16, Tüm dokuların önbellekten tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17, Görünür dokuların HTTP&apos;den tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18, Tüm dokuların HTTP&apos;den tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
+	</text>
+	<spinner label="19, Teksel/Piksel Oranı:" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20, Doku Kaynağı:
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="Önbellek + HTTP" name="0"/>
+		<radio_item label="Sadece HTTP" name="1"/>
+	</radio_group>
+	<button label="Başla" name="start_btn"/>
+	<button label="Sıfırla" name="clear_btn"/>
+	<button label="Kapat" name="close_btn"/>
+	<button label="Önbellek Okunması" name="cacheread_btn"/>
+	<button label="Önbellek Yazılması" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Şifre Çöz" name="decode_btn"/>
+	<button label="GL Dokusu" name="gl_btn"/>
+	<button label="Görünür Dokuları Önbellekten Tekrar Al" name="refetchviscache_btn"/>
+	<button label="Tüm Önbelleği Tekrar Al" name="refetchallcache_btn"/>
+	<button label="Görünür Dokuları HTTP&apos;den Tekrar Al" name="refetchvishttp_btn"/>
+	<button label="Tüm HTTP&apos;yi Tekrar Al" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
index b0c59ced42..39a3569efa 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -150,6 +150,12 @@
 			<panel.string name="text modify info 4">
 				Bu nesneleri değiştiremezsiniz
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz
+			</panel.string>
 			<panel.string name="text modify warning">
 				İzinleri ayarlamak için tüm nesneyi seçmelisiniz
 			</panel.string>
@@ -199,12 +205,12 @@
 				<combo_box.item label="Yakınlaştır" name="Zoom"/>
 			</combo_box>
 			<check_box label="Satılık:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Kopyala" name="Copy"/>
 				<combo_box.item label="İçerik" name="Contents"/>
 				<combo_box.item label="Orijinal" name="Original"/>
 			</combo_box>
-			<spinner label="Fiyat: L$" name="Edit Cost"/>
 			<check_box label="Aramada göster" name="search_check" tool_tip="Kişiler arama sonuçlarında bu nesneyi görebilsin"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -240,6 +246,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Yol bulma özellikleri:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Nesne" name="Object">
 			<check_box label="Kilitli" name="checkbox locked" tool_tip="Nesnenin hareket ettirilmesini veya silinmesini engeller. Arzulanmayan düzenlemelerden kaçınmak için inşa işlemleri sırasında oldukça faydalıdır."/>
@@ -454,16 +465,11 @@
 				<combo_box.item label="vakum" name="suction"/>
 				<combo_box.item label="örgü" name="weave"/>
 			</combo_box>
-			<check_box initial_value="false" label="Planar yüzleri hizala" name="checkbox planar align" tool_tip="Tüm seçili yüzeylerdeki dokuları son seçili yüzdekiyle hizalar. Planar doku eşleştirmesi gerektirir."/>
-			<text name="rpt">
-				Tekrarlar / Yüz
-			</text>
 			<spinner label="Yatay (U)" name="TexScaleU"/>
 			<check_box label="Çevir" name="checkbox flip s"/>
 			<spinner label="Dikey (V)" name="TexScaleV"/>
 			<check_box label="Çevir" name="checkbox flip t"/>
 			<spinner label="Döndürme*" name="TexRot"/>
-			<spinner label="Tekrarlar / Metre" name="rptctrl"/>
 			<button label="Uygula" label_selected="Uygula" name="button apply"/>
 			<text name="tex offset">
 				Doku Dengeleyicisi
diff --git a/indra/newview/skins/default/xui/tr/floater_top_objects.xml b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
index e726f583cc..19420c68e3 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Süre
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Mono Süre
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		En Çok Çarpışanlar
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Ad" name="name"/>
 		<scroll_list.columns label="Sahip" name="owner"/>
 		<scroll_list.columns label="Konum" name="location"/>
+		<scroll_list.columns label="Parsel" name="parcel"/>
 		<scroll_list.columns label="Süre" name="time"/>
-		<scroll_list.columns label="Mono Süre" name="mono_time"/>
 		<scroll_list.columns label="URL&apos;ler" name="URLs"/>
+		<scroll_list.columns label="Bellek (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		Nesne Kimliği:
@@ -48,6 +46,10 @@
 		Sahip:
 	</text>
 	<button label="Filtrele" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parsel:
+	</text>
+	<button label="Filtrele" name="filter_parcel_btn"/>
 	<button label="Seçileni İade Et" name="return_selected_btn"/>
 	<button label="Tümünü İade Et" name="return_all_btn"/>
 	<button label="Seçileni Devre Dışı Bırak" name="disable_selected_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml
index 7ff0001ddd..7ff0001ddd 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tos.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_toybox.xml b/indra/newview/skins/default/xui/tr/floater_toybox.xml
index e60e176643..e60e176643 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/tr/floater_toybox.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml
index 33ce76bd9a..33ce76bd9a 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_translation_settings.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_url_entry.xml b/indra/newview/skins/default/xui/tr/floater_url_entry.xml
index 54c5b047a8..54c5b047a8 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/tr/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..ec350bee60
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ">
+	<slider label="Sesli Sohbet" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
index 5ff0804f17..5ff0804f17 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_controls.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
index 3534a3fe90..7a157244cd 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME">
+<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
 	<string name="no_voice_effect">
 		(Ses Şekillendirme Yok)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
new file mode 100644
index 0000000000..acf99d6199
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="SES DÜZEYİ">
+	<slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_water.xml b/indra/newview/skins/default/xui/tr/floater_water.xml
deleted file mode 100644
index 66d6c1e30d..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="GELİŞMİŞ SU DÜZENLEYİCİ">
-	<floater.string name="WLDefaultWaterNames">
-		Varsayılan:Camsı:Havuz:çamurlu:İkinci Veba:YILAN!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Su Ön Ayarları:
-	</text>
-	<button label="Yeni" label_selected="Yeni" name="WaterNewPreset"/>
-	<button label="Kaydet" label_selected="Kaydet" name="WaterSavePreset"/>
-	<button label="Sil" label_selected="Sil" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="AYARLAR" name="Settings">
-			<text name="BHText">
-				Su Sisi Rengi
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Renk seçiciyi açmak için tıklayın"/>
-			<text name="WaterFogDensText">
-				Su Yoğunluk Üssü
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Sualtı Sis Değiştiricisi
-			</text>
-			<text name="BDensText">
-				Yansıma Dalgacığı Ölçeği
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel Ölçeği
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel Dengeleyicisi
-			</text>
-			<text name="DensMultText">
-				Yukarıdan Kırılma Ölçeği
-			</text>
-			<text name="WaterScaleBelowText">
-				Aşağıdan Kırılma Ölçeği
-			</text>
-			<text name="MaxAltText">
-				Bulanıklaştırma Çarpanı
-			</text>
-		</panel>
-		<panel label="GÖRÜNTÜ" name="Waves">
-			<text name="BHText">
-				Büyük Dalga Yönü
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Küçük Dalga Yönü
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal Harita
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_web_content.xml b/indra/newview/skins/default/xui/tr/floater_web_content.xml
index 93491b80fb..93491b80fb 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/tr/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml
index 1a9f731af0..1a9f731af0 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/tr/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/tr/floater_windlight_options.xml b/indra/newview/skins/default/xui/tr/floater_windlight_options.xml
deleted file mode 100644
index 6c5fba374c..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="GELİŞMİŞ GÖKYÜZÜ DÜZENLEYİCİ">
-	<floater.string name="WLDefaultSkyNames">
-		A-12:A-24:A-3:A-15:A-16.30:A-6:A-18:A-9:A-21:Barselona:Tipi:Mavi Gün Ortası:Sahilde Öğleden Sonra:Sahilde Gün Batımı:Varsayılan:Çölde Gün Batımı:Güzel Bir Gün:Kabarık Büyük Bulutlar:Sisli:Şık Şık:Şık Şık Şık:Dondurma:Hayalet:Uygunsuz Gerçekler:Gün Ortası1:Gün Ortası 2:Gün Ortası 3:Gün Ortası 4:Gece:Korsan:Mor:Denizcinin Keyfi:Saf Tensel
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Gökyüzü Ön Ayarları:
-	</text>
-	<button label="Yeni" label_selected="Yeni" name="WLNewPreset"/>
-	<button label="Kaydet" label_selected="Kaydet" name="WLSavePreset"/>
-	<button label="Sil" label_selected="Sil" name="WLDeletePreset"/>
-	<button label="Gün Döngüsü Düzenleyici" label_selected="Gün Döngüsü Düzenleyici" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFER" name="Atmosphere">
-			<text name="BHText">
-				Mavi Ufuk
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Puslu Ufuk
-			</text>
-			<text name="BDensText2">
-				Mavi Yoğunluğu
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Pus Yoğunluğu
-			</text>
-			<text name="DensMultText">
-				Yoğunluk Çarpanı
-			</text>
-			<text name="WLDistanceMultText">
-				Mesafe Çarpanı
-			</text>
-			<text name="MaxAltText">
-				Maks İrtifa
-			</text>
-		</panel>
-		<panel label="AYDINLATMA" name="Lighting">
-			<text name="SLCText">
-				Güneş/Ay Rengi
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Güneş/Ay Konumu
-			</text>
-			<text name="WLAmbientText">
-				Ortam
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Doğu Açısı
-			</text>
-			<text name="SunGlowText">
-				Güneş Parıltısı
-			</text>
-			<slider label="Odak" name="WLGlowB"/>
-			<slider label="Büyüklük" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Sahne Gaması
-			</text>
-			<text name="WLStarText">
-				Yıldız Parlaklığı
-			</text>
-		</panel>
-		<panel label="BULUTLAR" name="Clouds">
-			<text name="WLCloudColorText">
-				Bulut Rengi
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Bulut XY/Yoğunluğu
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Bulut Örtüsü
-			</text>
-			<text name="WLCloudScaleText">
-				Bulut Yüksekliği
-			</text>
-			<text name="WLCloudDetailText">
-				Bulut Ayrıntısı (XY/Yoğunluğu)
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Bulut Kaydırma X
-			</text>
-			<check_box label="Kilitle" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Bulut Kaydırma Y
-			</text>
-			<check_box label="Kilitle" name="WLCloudLockY"/>
-			<check_box label="Klasik Bulutlar Çiz" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml
index acc2cc3376..aff20e7960 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/tr/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Pencere büyüklüğünü ayarla:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="genişlik x yükseklik">
-		<combo_box.item label="1000 x 700 (varsayılan)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (varsayılan)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Ayarla" name="set_btn"/>
 	<button label="İptal" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_world_map.xml b/indra/newview/skins/default/xui/tr/floater_world_map.xml
index e4729c2aed..e4729c2aed 100644..100755
--- a/indra/newview/skins/default/xui/tr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/tr/floater_world_map.xml
diff --git a/indra/newview/skins/default/xui/tr/inspect_avatar.xml b/indra/newview/skins/default/xui/tr/inspect_avatar.xml
index cb3c7e9282..cb3c7e9282 100644..100755
--- a/indra/newview/skins/default/xui/tr/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/tr/inspect_avatar.xml
diff --git a/indra/newview/skins/default/xui/tr/inspect_group.xml b/indra/newview/skins/default/xui/tr/inspect_group.xml
index 9b130c9ef6..9b130c9ef6 100644..100755
--- a/indra/newview/skins/default/xui/tr/inspect_group.xml
+++ b/indra/newview/skins/default/xui/tr/inspect_group.xml
diff --git a/indra/newview/skins/default/xui/tr/inspect_object.xml b/indra/newview/skins/default/xui/tr/inspect_object.xml
index bd09267319..bd09267319 100644..100755
--- a/indra/newview/skins/default/xui/tr/inspect_object.xml
+++ b/indra/newview/skins/default/xui/tr/inspect_object.xml
diff --git a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml
index 4b696b2ae5..4b696b2ae5 100644..100755
--- a/indra/newview/skins/default/xui/tr/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/tr/inspect_remote_object.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml
index dcb4629259..dcb4629259 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
index 9ba214ff31..0cb233a657 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="Dondur" name="Freeze..."/>
 	<menu_item_call label="Çıkar" name="Eject..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
 	<menu_item_call label="Öde" name="Pay..."/>
 	<menu_item_call label="Nesne Profili" name="Object Inspect"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
index 16d1e3f356..ff7c718979 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_self.xml
@@ -12,5 +12,7 @@
 	<menu_item_call label="Gruplarım" name="Groups..."/>
 	<menu_item_call label="Profilim" name="Profile..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Bırak" name="Drop"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml
index d3ef490735..d3ef490735 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
index 7d691d2ac5..0da328a894 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -11,6 +11,8 @@
 	<menu_item_call label="Dondur" name="Freeze..."/>
 	<menu_item_call label="Çıkar" name="Eject..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
 	<menu_item_call label="Öde" name="Pay..."/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
index c520aff521..6996dc612f 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_self.xml
@@ -29,4 +29,6 @@
 	<menu_item_call label="Gruplarım" name="Groups..."/>
 	<menu_item_call label="Profilim" name="Profile..."/>
 	<menu_item_call label="Dokularda Hata Ayıkla" name="Debug..."/>
+	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_bottomtray.xml b/indra/newview/skins/default/xui/tr/menu_bottomtray.xml
deleted file mode 100644
index f17c0f9971..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Konuşma Düğmesi" name="EnableVoiceChat"/>
-	<menu_item_check label="Mimik düğmesi" name="ShowGestureButton"/>
-	<menu_item_check label="Taşıma düğmesi" name="ShowMoveButton"/>
-	<menu_item_check label="Görüntüleme düğmesi" name="ShowCameraButton"/>
-	<menu_item_check label="Anlık görüntü düğmesi" name="ShowSnapshotButton"/>
-	<menu_item_check label="İnşa Et düğmesi" name="ShowBuildButton"/>
-	<menu_item_check label="Arama düğmesi" name="ShowSearchButton"/>
-	<menu_item_check label="Harita düğmesi" name="ShowWorldMapButton"/>
-	<menu_item_check label="Mini-harita düğmesi" name="ShowMiniMapButton"/>
-	<menu_item_call label="Kes" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Kopyala" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Yapıştır" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Sil" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Tümünü Seç" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml
index d57c43f6c1..d57c43f6c1 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml
index 31f77d834a..31f77d834a 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml
index 784d809d70..784d809d70 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
index f910e1fe91..9480d30029 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/>
-	<menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/>
+	<menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
new file mode 100644
index 0000000000..c2773cdc26
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
+	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
+	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
+	<menu_item_call label="Seçileni Kapat" name="close_selected_conversations"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Arkadaş ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Arkadaşları çıkar" name="remove_friends"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Sesi Engelle" name="block_unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+	<menu_item_call label="Grup Profili" name="group_profile"/>
+	<menu_item_call label="Grubu Etkinleştir" name="activate_group"/>
+	<menu_item_call label="Gruptan Ayrıl" name="leave_group"/>
+	<context_menu label="Moderatör Seçenekleri" name="Moderator Options">
+		<menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/>
+		<menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/>
+		<menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..9e91780eb8
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="Aİ..." name="IM"/>
+	<menu_item_call label="Sesli arama..." name="Call"/>
+	<menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/>
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="Invite"/>
+	<menu_item_call label="Harita" name="Map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..9a77eaadd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Tarihe göre sırala" name="sort_by_date"/>
+	<menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/>
+	<menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_edit.xml b/indra/newview/skins/default/xui/tr/menu_edit.xml
index 81cd270af0..81cd270af0 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_edit.xml
+++ b/indra/newview/skins/default/xui/tr/menu_edit.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_favorites.xml b/indra/newview/skins/default/xui/tr/menu_favorites.xml
index 7bb2ed1ddc..7bb2ed1ddc 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/tr/menu_favorites.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml
index cb9b678fdd..cb9b678fdd 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_gesture_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_group_plus.xml b/indra/newview/skins/default/xui/tr/menu_group_plus.xml
index 82cf7dcf74..82cf7dcf74 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/tr/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml
index d1f213516b..d1f213516b 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/tr/menu_hide_navbar.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
new file mode 100644
index 0000000000..3b9738edce
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
+	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
+	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Sesi Engelle" name="Block/Unblock"/>
+	<menu_item_check label="Metni Engelle" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..c4d4357ac9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="Daraltılmış görünüm" name="compact_view"/>
+	<menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/>
+	<menu_item_check label="Zamanı göster" name="IMShowTime"/>
+	<menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml b/indra/newview/skins/default/xui/tr/menu_im_well_button.xml
deleted file mode 100644
index c3e559a723..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="Tümünü Kapat" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml
index 0396ad8fb5..0396ad8fb5 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml
index 60a50b114e..60a50b114e 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml
index 0ef4471088..0ef4471088 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/tr/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
index 69432e967b..69432e967b 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inspect_avatar_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml
index d1d3f9ac8d..d1d3f9ac8d 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inspect_object_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
index 0655db8196..0655db8196 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml
index 2e2b17491a..2e2b17491a 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory.xml b/indra/newview/skins/default/xui/tr/menu_inventory.xml
index 170cdebd24..51049427af 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inventory.xml
@@ -68,6 +68,7 @@
 	<menu_item_call label="Sistem Klasörünü Sil" name="Delete System Folder"/>
 	<menu_item_call label="Konferans Sohbeti Başlat" name="Conference Chat Folder"/>
 	<menu_item_call label="Oyna" name="Sound Play"/>
+	<menu_item_call label="SLurl&apos;i Kopyala" name="url_copy"/>
 	<menu_item_call label="Yer İmi Hakkında" name="About Landmark"/>
 	<menu_item_call label="SL Dünyasında Oynat" name="Animation Play"/>
 	<menu_item_call label="Yerel Olarak Oynat" name="Animation Audition"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml
index db2a9a2c8c..db2a9a2c8c 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inventory_add.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
index 5f3e4e8789..5f3e4e8789 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/tr/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_land.xml b/indra/newview/skins/default/xui/tr/menu_land.xml
index db65f1af1e..d6d8dbf730 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_land.xml
+++ b/indra/newview/skins/default/xui/tr/menu_land.xml
@@ -6,4 +6,5 @@
 	<menu_item_call label="Geçiş Hakkı Satın Al" name="Land Buy Pass"/>
 	<menu_item_call label="İnşa Et" name="Create"/>
 	<menu_item_call label="Yüzeyi Düzenle" name="Edit Terrain"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_landmark.xml b/indra/newview/skins/default/xui/tr/menu_landmark.xml
index c68a2f6a90..c68a2f6a90 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/tr/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
index f27908bf7a..79c95407e8 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_login.xml
+++ b/indra/newview/skins/default/xui/tr/menu_login.xml
@@ -18,7 +18,13 @@
 		<menu_item_call label="Hizmet Şartlarını Göster" name="TOS"/>
 		<menu_item_call label="Kritik İletiyi Göster" name="Critical"/>
 		<menu_item_call label="Web İçeriği Gezdiricisi Hata Ayıklama Testi" name="Web Content Floater Debug Test"/>
-		<menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level"/>
+		<menu label="Günlük Tutma Seviyesini Seç" name="Set Logging Level">
+			<menu_item_check label="Hata ayıkla" name="Debug"/>
+			<menu_item_check label="Bilgi" name="Info"/>
+			<menu_item_check label="Uyarı" name="Warning"/>
+			<menu_item_check label="Hata" name="Error"/>
+			<menu_item_check label="Hiçbiri" name="None"/>
+		</menu>
 		<menu_item_check label="Izgara Seçiciyi Göster" name="Show Grid Picker"/>
 		<menu_item_call label="Bildirimler Konsolunu Göster" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml
index 8d04e645fd..8d04e645fd 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/menu_media_ctrl.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_mini_map.xml b/indra/newview/skins/default/xui/tr/menu_mini_map.xml
index 9abe78931e..9abe78931e 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/tr/menu_mini_map.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_mode_change.xml b/indra/newview/skins/default/xui/tr/menu_mode_change.xml
deleted file mode 100644
index 678950b633..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Temel" name="BasicMode"/>
-	<menu_item_check label="Gelişmiş" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml
index 51cf29a4de..51cf29a4de 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml
+++ b/indra/newview/skins/default/xui/tr/menu_model_import_gear_default.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_mute_particle.xml b/indra/newview/skins/default/xui/tr/menu_mute_particle.xml
new file mode 100644
index 0000000000..a05a745ed0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_navbar.xml b/indra/newview/skins/default/xui/tr/menu_navbar.xml
index b05b816e64..b05b816e64 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/tr/menu_navbar.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml
index b76a736979..b76a736979 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/tr/menu_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
index 39c66268f5..39c66268f5 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/tr/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml
index d60c68e5e9..2f8b5c0362 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_object.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object.xml
@@ -8,6 +8,8 @@
 	<menu_item_call label="Kalk" name="Object Stand Up"/>
 	<menu_item_call label="Nesne Profili" name="Object Inspect"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
+	<menu_item_call label="Bağlantı kümelerinde göster" name="show_in_linksets"/>
+	<menu_item_call label="Karakterlerde göster" name="show_in_characters"/>
 	<context_menu label="Üzerine Koy" name="Put On">
 		<menu_item_call label="Giy" name="Wear"/>
 		<menu_item_call label="Ekle" name="Add"/>
@@ -24,4 +26,5 @@
 	<menu_item_call label="Öde" name="Pay..."/>
 	<menu_item_call label="Satın Al" name="Buy..."/>
 	<menu_item_call label="Sil" name="Delete"/>
+	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 34a2661d8a..3d5c68d9d3 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,4 +2,6 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Nesne Profili..." name="Object Profile"/>
 	<menu_item_call label="Engelle..." name="Block"/>
+	<menu_item_call label="Haritada Göster" name="show_on_map"/>
+	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index d2e7e7107a..674041e9c9 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -23,6 +23,8 @@
 		<menu_item_call label="Yeni Saç" name="New Hair"/>
 		<menu_item_call label="Yeni Gözler" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="Tüm klasörleri genişlet" name="expand"/>
+	<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
 	<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
 	<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml
index a48529e462..a48529e462 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_list.xml b/indra/newview/skins/default/xui/tr/menu_participant_list.xml
index 1d56105e1e..1d56105e1e 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/tr/menu_participant_list.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
new file mode 100644
index 0000000000..e9411ff350
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/>
+	<menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/>
+	<menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/>
+	<menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/>
+	<menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/>
+	<menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/>
+	<menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/>
+	<menu_item_check label="Sohbet günlüğü..." name="Conversation"/>
+	<menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/>
+	<menu_item_check label="Çeviri ayarları..." name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..2bf1101b48
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
+	<menu_item_call label="Profil..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a869e2ae7d
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/>
+	<menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..14b3de3a9f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="Türe göre sırala" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
new file mode 100644
index 0000000000..609584d6a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
+	<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
index 404fab17e6..404fab17e6 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
index 9f2946e310..743b01844d 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Bilgileri Görüntüle" name="View Info"/>
 	<menu_item_call label="Sohbet" name="Chat"/>
-	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Sesli arama" name="Call"/>
 	<menu_item_call label="Etkinleştir" name="Activate"/>
 	<menu_item_call label="Ayrıl" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
new file mode 100644
index 0000000000..e550b20add
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
index a1e5ad9a50..a1e5ad9a50 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index ee859a9450..2d61461c91 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Harita" name="Map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Profili Göster" name="view_profile"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
+	<menu_item_call label="Sesli arama" name="voice_call"/>
+	<menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
+	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
+	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
+	<menu_item_call label="Harita" name="map"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
index 5c89f87906..20695d98e8 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Arkadaş Ekle" name="Add Friends"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
-	<menu_item_call label="Aİ" name="IM"/>
-	<menu_item_call label="Ara" name="Call"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="add_friends"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/>
+	<menu_item_call label="Aİ" name="im"/>
+	<menu_item_call label="Ara" name="call"/>
+	<menu_item_call label="Paylaş" name="share"/>
+	<menu_item_call label="Öde" name="pay"/>
+	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..59ea7c145f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+	<menu_item_check label="Haritayı Göster" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
index 0ff2111e9e..0ff2111e9e 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_view_sort.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
new file mode 100644
index 0000000000..02be715ed2
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
+	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
+	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
index adfba50138..adfba50138 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_picks.xml b/indra/newview/skins/default/xui/tr/menu_picks.xml
index 3e5375ecc0..3e5375ecc0 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_picks.xml
+++ b/indra/newview/skins/default/xui/tr/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml
index d9c4fefc97..d9c4fefc97 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/tr/menu_picks_plus.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_place.xml b/indra/newview/skins/default/xui/tr/menu_place.xml
index ad167a328a..ad167a328a 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_place.xml
+++ b/indra/newview/skins/default/xui/tr/menu_place.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
index 8e52b3f7f2..8e52b3f7f2 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/tr/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml
index b3a2986160..b3a2986160 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/tr/menu_places_gear_folder.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
index 939ee2c7cb..939ee2c7cb 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/tr/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml
index ed60dec63a..ed60dec63a 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/tr/menu_profile_overflow.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml
index b28488fe30..b28488fe30 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/tr/menu_save_outfit.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml
index 7c1cefc2d1..7c1cefc2d1 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/tr/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_slurl.xml b/indra/newview/skins/default/xui/tr/menu_slurl.xml
index 73ac068b26..73ac068b26 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/tr/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml
index b08423be18..b08423be18 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
index 93984162e7..93984162e7 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml
index b1e801c123..b1e801c123 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/tr/menu_teleport_history_tab.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_text_editor.xml b/indra/newview/skins/default/xui/tr/menu_text_editor.xml
index ffbf309e84..76c7b43e1e 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/tr/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 1"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 2"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 3"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 4"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 5"/>
+	<menu_item_call label="Sözlüğe Ekle" name="Add to Dictionary"/>
+	<menu_item_call label="Yok saya ekle" name="Add to Ignore"/>
 	<menu_item_call label="Kes" name="Cut"/>
 	<menu_item_call label="Kopyala" name="Copy"/>
 	<menu_item_call label="Yapıştır" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_toolbars.xml b/indra/newview/skins/default/xui/tr/menu_toolbars.xml
index c8523a6ec9..c8523a6ec9 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_toolbars.xml
+++ b/indra/newview/skins/default/xui/tr/menu_toolbars.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml
index d9b8d50f18..d9b8d50f18 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/tr/menu_topinfobar.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index d82b52aea8..109cd62495 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Sakin Profilini Göster" name="show_agent"/>
+	<menu_item_call label="Profili Göster" name="show_agent"/>
+	<menu_item_call label="Aİ Gönder..." name="send_im"/>
+	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
+	<menu_item_call label="Arkadaşı Çıkar..." name="remove_friend"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_group.xml b/indra/newview/skins/default/xui/tr/menu_url_group.xml
index 40fa13b4cf..40fa13b4cf 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_http.xml b/indra/newview/skins/default/xui/tr/menu_url_http.xml
index fee8eba150..fee8eba150 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_http.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml
index 3b22c5afec..3b22c5afec 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_map.xml b/indra/newview/skins/default/xui/tr/menu_url_map.xml
index 770e330516..770e330516 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index d55e34c11c..ae68669605 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/>
+	<menu_item_call label="Nesne Profili..." name="show_object"/>
+	<menu_item_call label="Engelle..." name="block_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml
index eac1d743c3..eac1d743c3 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml
index a2ecfc6a48..a2ecfc6a48 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_slapp.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml
index 3f4e51b36c..3f4e51b36c 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml
index b7035a4d8f..b7035a4d8f 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index d7b20bac4b..4236f91636 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -17,8 +17,8 @@
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
 		<menu label="Durum" name="Status">
-			<menu_item_call label="Uzakta" name="Set Away"/>
-			<menu_item_call label="Meşgul" name="Set Busy"/>
+			<menu_item_check label="Uzakta" name="Away"/>
+			<menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
 		</menu>
 		<menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/>
 		<menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/>
@@ -26,17 +26,25 @@
 		<menu_item_call label="Tercihler..." name="Preferences"/>
 		<menu_item_call label="Araç çubuğu düğmeleri..." name="Toolbars"/>
 		<menu_item_call label="Tüm denetimleri sakla" name="Hide UI"/>
+		<menu_item_check label="BÜG Aksesuarlarını Göster" name="Show HUD Attachments"/>
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
-		<menu_item_check label="Sohbet..." name="Nearby Chat"/>
+		<menu_item_check label="Sohbetler..." name="Conversations"/>
+		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
-		<menu_item_check label="Ses ayarları..." name="Nearby Voice"/>
-		<menu_item_check label="Ses şekillendirme..." name="ShowVoice"/>
+		<menu_item_check label="Sohbet Günlüğü..." name="Conversation Log..."/>
+		<menu label="Ses şekillendirme" name="VoiceMorphing">
+			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
+			<menu_item_check label="Önizleme..." name="Preview"/>
+			<menu_item_call label="Abone ol..." name="Subscribe"/>
+		</menu>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
-		<menu_item_call label="Arkadaşlar" name="My Friends"/>
-		<menu_item_call label="Gruplar" name="My Groups"/>
-		<menu_item_call label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_check label="Arkadaşlar" name="My Friends"/>
+		<menu_item_check label="Gruplar" name="My Groups"/>
+		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_call label="Engelleme Listesi" name="Block List"/>
+		<menu_item_check label="Rahatsız Etme" name="Do Not Disturb"/>
 	</menu>
 	<menu label="Dünya" name="World">
 		<menu_item_call label="Bu Yeri Yer İmlerine Ekle" name="Create Landmark Here"/>
@@ -105,13 +113,13 @@
 			<menu_item_call label="Sonraki Parçayı Dahil Et" name="Include Next Part"/>
 			<menu_item_call label="Önceki Parçayı Dahil Et" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="Seçime Odaklan" name="Focus on Selection"/>
 		<menu_item_call label="Seçimi Yakınlaştır" name="Zoom to Selection"/>
 		<menu label="Nesne" name="Object">
 			<menu_item_call label="Satın Al" name="Menu Object Buy"/>
 			<menu_item_call label="Al" name="Menu Object Take"/>
 			<menu_item_call label="Kopya Al" name="Take Copy"/>
-			<menu_item_call label="Envanterime Geri Kaydet" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Nesne İçeriklerine Geri Kaydet" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Nesneyi İade Et" name="Return Object back to Owner"/>
 		</menu>
@@ -122,6 +130,12 @@
 			<menu_item_call label="Komut Dosyalarını Çalışıyor Olarak Ayarla" name="Set Scripts to Running"/>
 			<menu_item_call label="Komut Dosyalarını Çalışmıyor Olarak Ayarla" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Yol bulma" name="Pathfinding">
+			<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="Karakterler..." name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="Görüntüleme / test..." name="pathfinding_console_menu_item"/>
+			<menu_item_call label="Bölgeyi tekrar kaydet" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="Seçenklr." name="Options">
 			<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
 			<menu_item_check label="Sadece Nesnelerimi Seç" name="Select Only My Objects"/>
@@ -150,6 +164,13 @@
 	<menu label="Yardım" name="Help">
 		<menu_item_call label="Nasıl yapılır..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/>
+		<menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/>
+		<menu_item_call label="Bilgi Bankası" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Topluluk Forumları" name="Community Forums"/>
+		<menu_item_call label="Destek portalı" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] Haberleri" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/>
 		<menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/>
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
@@ -172,7 +193,6 @@
 			<menu_item_check label="Parçacıkları Gizle" name="Hide Particles"/>
 			<menu_item_check label="Seçilenleri Gizle" name="Hide Selected"/>
 			<menu_item_check label="Saydamı Vurgula" name="Highlight Transparent"/>
-			<menu_item_check label="BÜG Aksesuarlarını Göster" name="Show HUD Attachments"/>
 			<menu_item_check label="Fare Üzerinden Görünüm Artı İşaretini Göster" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="İşleme Türleri" name="Rendering Types">
@@ -225,11 +245,10 @@
 			<menu_item_check label="Doku Konsolu" name="Texture Console"/>
 			<menu_item_check label="Hata Ayıklama Konsolu" name="Debug Console"/>
 			<menu_item_call label="Bildirimler Konsolu" name="Notifications"/>
-			<menu_item_check label="Doku Büyüklüğü Konsolu" name="Texture Size"/>
-			<menu_item_check label="Doku Kategorisi Konsolu" name="Texture Category"/>
 			<menu_item_check label="Hızlı Zamanlayıcılar" name="Fast Timers"/>
 			<menu_item_check label="Bellek" name="Memory"/>
 			<menu_item_check label="Sahne İstatistikleri" name="Scene Statistics"/>
+			<menu_item_call label="Doku Alınması Hata Ayıklama Konsolu" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Hata Ayıklama Konsoluna giden Bölge Bilgisi" name="Region Info to Debug Console"/>
 			<menu_item_call label="Hata Ayıklama Konsoluna giden Grup Bilgisi" name="Group Info to Debug Console"/>
 			<menu_item_call label="Hata Ayıklama Konsoluna giden Özellikler Bilgisi" name="Capabilities Info to Debug Console"/>
@@ -264,6 +283,7 @@
 			<menu_item_check label="Çerçeve Hızını Rastgele Seç" name="Randomize Framerate"/>
 			<menu_item_check label="Düzenli Yavaş Çerçeve" name="Periodic Slow Frame"/>
 			<menu_item_check label="Çerçeve Testi" name="Frame Test"/>
+			<menu_item_call label="Çerçeve Profili..." name="Frame Profile"/>
 		</menu>
 		<menu label="Meta Verileri İşle" name="Render Metadata">
 			<menu_item_check label="Sınırlama Kutuları" name="Bounding Boxes"/>
@@ -287,14 +307,21 @@
 			<menu_item_check label="İşleme Karmaşıklığı" name="rendercomplexity"/>
 			<menu_item_check label="Aksesuar Bayt Büyüklüğü" name="attachment bytes"/>
 			<menu_item_check label="Şekillendir" name="Sculpt"/>
+			<menu label="Doku Yoğunluğu" name="Texture Density">
+				<menu_item_check label="Yok" name="None"/>
+				<menu_item_check label="Mevcut" name="Current"/>
+				<menu_item_check label="Arzulanan" name="Desired"/>
+				<menu_item_check label="Tam" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="İşleme" name="Rendering">
 			<menu_item_check label="Eksenler" name="Axes"/>
 			<menu_item_check label="Tanjant Temeli" name="Tangent Basis"/>
 			<menu_item_call label="Seçilen Doku Bilgi Temeli" name="Selected Texture Info Basis"/>
+			<menu_item_call label="Seçilen Malzeme Bilgisi" name="Selected Material Info"/>
 			<menu_item_check label="Telkafes" name="Wireframe"/>
 			<menu_item_check label="Görünen Nesneler İçin Gölgeleme" name="Object-Object Occlusion"/>
-			<menu_item_check label="Işıklandırma ve Gölgeler" name="Lighting and Shadows"/>
+			<menu_item_check label="Gelişmiş Aydınlatma Modeli" name="Advanced Lighting Model"/>
 			<menu_item_check label="Güneş/Ay/Projektörlerden Gelen Gölgeler" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="SSAO ve Gölge Yumuşatma" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL Hata Ayıklama" name="Debug GL"/>
@@ -304,8 +331,6 @@
 			<menu_item_check label="Animasyon Dokuları" name="Animation Textures"/>
 			<menu_item_check label="Dokuları Devre Dışı Bırak" name="Disable Textures"/>
 			<menu_item_check label="Tam Çöz. Dokular" name="Rull Res Textures"/>
-			<menu_item_check label="Dokuları Denetle" name="Audit Textures"/>
-			<menu_item_check label="Doku Atlas (deneysel)" name="Texture Atlas"/>
 			<menu_item_check label="Eklenmiş Işıkları İşle" name="Render Attached Lights"/>
 			<menu_item_check label="Eklenmiş Parçacıkları İşle" name="Render Attached Particles"/>
 			<menu_item_check label="Parıldayan Nesneler Üzerine Gel" name="Hover Glow Objects"/>
@@ -341,7 +366,6 @@
 			<menu_item_call label="Odaklayıcı Tutucunun Dökümünü Al" name="Dump Focus Holder"/>
 			<menu_item_call label="Seçilen Nesne Bilgisini Yazdır" name="Print Selected Object Info"/>
 			<menu_item_call label="Aracı Bilgisini Yazdır" name="Print Agent Info"/>
-			<menu_item_call label="Bellek İstatistikleri" name="Memory Stats"/>
 			<menu_item_check label="Bölge Hata Ayıklama Konsolu" name="Region Debug Console"/>
 			<menu_item_check label="SelectMgr İçin Hata Ayıklama" name="Debug SelectMgr"/>
 			<menu_item_check label="Tıklamalar İçin Hata Ayıklama" name="Debug Clicks"/>
@@ -371,12 +395,16 @@
 				<menu_item_call label="Karakter Geometrisini Aç/Kapa" name="Toggle Character Geometry"/>
 				<menu_item_call label="Test Erkeği" name="Test Male"/>
 				<menu_item_call label="Test Dişisi" name="Test Female"/>
-				<menu_item_call label="PG&apos;yi Aç/Kapa" name="Toggle PG"/>
 				<menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="Animasyon Hızı" name="Animation Speed">
+				<menu_item_call label="Tüm Animasyonlar %10 Daha Hızlı" name="All Animations 10 Faster"/>
+				<menu_item_call label="Tüm Animasyonlar %10 Daha Yavaş" name="All Animations 10 Slower"/>
+				<menu_item_call label="Tüm Animasyon Hızlarını Sıfırla" name="Reset All Animation Speed"/>
+				<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/>
 			<menu_item_check label="Animasyon Bilgisi" name="Animation Info"/>
-			<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
 			<menu_item_check label="Şuraya Bak&apos;ı Göster" name="Show Look At"/>
 			<menu_item_check label="Şuraya İşaret Et&apos;i Göster" name="Show Point At"/>
 			<menu_item_check label="Eklem Güncelleştirmeleri İçin Hata Ayıklama" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml
index 448202df87..448202df87 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/menu_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml
index 438e580cd3..438e580cd3 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_wearing_gear.xml
diff --git a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
index 9796546559..9796546559 100644..100755
--- a/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/tr/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/tr/mime_types.xml b/indra/newview/skins/default/xui/tr/mime_types.xml
index c37f872a65..c37f872a65 100644..100755
--- a/indra/newview/skins/default/xui/tr/mime_types.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types.xml
diff --git a/indra/newview/skins/default/xui/tr/mime_types_linux.xml b/indra/newview/skins/default/xui/tr/mime_types_linux.xml
index c37f872a65..c37f872a65 100644..100755
--- a/indra/newview/skins/default/xui/tr/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types_linux.xml
diff --git a/indra/newview/skins/default/xui/tr/mime_types_mac.xml b/indra/newview/skins/default/xui/tr/mime_types_mac.xml
index c37f872a65..c37f872a65 100644..100755
--- a/indra/newview/skins/default/xui/tr/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/tr/mime_types_mac.xml
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 6681cdac7a..492178ab82 100644..100755
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -204,6 +210,14 @@ Bu Yetenek &apos;[ROLE_NAME]&apos; rolüne eklensin mi?
 Bu Yetenek &apos;[ROLE_NAME]&apos; rolüne eklensin mi?
 		<usetemplate name="okcancelbuttons" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		Gruptan [AVATAR_NAME] adlı üyeyi çıkarmak üzeresiniz.
+		<usetemplate ignoretext="Gruptan bir katılımcının çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		Gruptan [COUNT] üyeyi çıkarmak üzeresiniz.
+		<usetemplate ignoretext="Gruptan birden çok üyenin çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Aksesuarınızı çıkarmak üzeresiniz.
     Devam etmek istediğinize emin misiniz?
@@ -360,13 +374,19 @@ Avatarınızın Kullanıcı adını girmeniz gerekmektedir.
 
 [SECOND_LIFE]&apos;a giriş yapmak için bir hesabınız olması gerekir. Şimdi bir hesap oluşturmak ister misiniz?
 		<url name="url">
-			http://join.secondlife.com/
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="Tekrar dene" yestext="Yeni bir hesap oluştur"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
 		Kullanıcı adı alanına Avatarınızın Kullanıcı adını ya da Ad ve Soyadını girmeniz ve yeniden oturum açmanız gerekmektedir.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; geçerli bir ağ tanımlayıcısı değil.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Başlangıç konumunuz için geçerli bir ağ belirtilmedi.
+	</notification>
 	<notification name="DeleteClassified">
 		&apos;[NAME]&apos; ilanı silinsin mi?
 Ödenen ücretler iade edilmeyecektir.
@@ -472,8 +492,8 @@ Nesne aralık dışında ya da silinmiş olabilir.
 		Aşağıdaki nedenden dolayı, derlenen komut dosyası kaydedilirken bir sorun oluştu: [REASON].  Lütfen komut dosyasını kaydetmeyi daha sonra tekrar deneyin.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Hata. Başlangıç Bölgeniz tanımlanmamış.
-Lütfen Başlangıç Konumu kutusuna Bölge adını yazın ya da Son Konumum veya Ana Konumumu Başlangıç Konumu olarak seçin.
+		Başlangıç Bölgeniz tanımlanmamış.
+Lütfen Başlangıç Konumu kutusuna Bölge adını yazın ya da Son Bulunduğum Konum veya Ana Konumumu Başlangıç Konumu olarak seçin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -495,6 +515,33 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Bilgisayar donanımım desteklenmiyor" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://www.intel.com/p/en_US/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=en-us
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -591,6 +638,9 @@ En fazla [MAX] nesneyi birbirine bağlayabilirsiniz.
 
 Lütfen hiçbirinin kilitli olmadığından ve hepsine sahip olduğunuzdan emin olun.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Nesneler bölge sınırları üzerinden bağlantılandırılamaz.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Nesnelerin hepsinin sahibi aynı olmadığı için nesneler birbirine bağlanamıyor.
 
@@ -969,6 +1019,41 @@ Etkin grubunuz adına arazi satın almak için gerekli izne sahip değilsiniz.
 			<button name="Cancel" text="İptal"/>
 		</form>
 	</notification>
+	<notification label="Otomatik Yerine Koyma Listesine Ekle" name="AddAutoReplaceList">
+		Yeni liste için isim:
+		<form name="form">
+			<button name="SetName" text="Tamam"/>
+		</form>
+	</notification>
+	<notification label="Otomatik Yerine Koyma Listesinin Adını Değiştir" name="RenameAutoReplaceList">
+		&apos;[DUPNAME]&apos; adı kullanılıyor
+    Benzersiz yeni bir ad girin:
+		<form name="form">
+			<button name="ReplaceList" text="Mevcut Listenin Yerine Koy"/>
+			<button name="SetName" text="Yeni Adı Kullan"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Anahtar kelime tek bir kelime olmalıdır; değiştirme boş olamaz.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Bu değiştirme listesi geçerli değil.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Bir dosya, ad ve dil belirtmelisiniz.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		[DIC_NAME] sözlüğünde bir &quot;aff&quot; dosyası yok gibi görünüyor; bu da &quot;ikincil&quot; bir sözlük olduğu anlamına gelir.
+İlave bir sözlük olarak kullanılabilir; ancak Ana sözlüğünüz olarak kullanılamaz.
+
+Bkz. https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Şu kopyalama yapılamıyor:
+    [FROM_NAME]
+    kaynağından şuraya:
+    [TO_NAME]
+	</notification>
 	<notification label="Dış Görünümü Kaydet" name="SaveOutfitAs">
 		Üzerimdekileri yeni bir Dış Görünüm olarak kaydet:
 		<form name="form">
@@ -1034,7 +1119,7 @@ bu simdeki TÜM ARAZİLERDEN SİLMEK istediğinize emin misiniz?
 Lütfen daha yüksek bir tutar girin.
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		Seçtiğiniz öğelerden en az birinin kendisine işaret eden bağlantılı öğeler var.  Bu öğeyi silerseniz, bağlantıları kalıcı olarak çalışmaz hale gelecek.  Önce bağlantıları silmeniz önemle tavsiye edilir.
+		Öğelerden en az birinde kendisine işaret eden bağlantılar var.  Bu öğeyi silerseniz, bağlantıları kalıcı olarak çalışmaz hale gelecek.  Önce bağlantıları silmeniz önemle tavsiye edilir.
 
 Bu öğeleri silmek istediğinize emin misiniz?
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
@@ -1148,7 +1233,7 @@ sonraki: &apos;[THIS_GPU]&apos;
 Yakınındaki başka bir bölgeye taşındınız.
 	</notification>
 	<notification name="AvatarMovedLast">
-		Son konumunuz şu anda kullanılamıyor.
+		Talep ettiğiniz konum şu anda kullanılamıyor.
 Yakınındaki başka bir bölgeye taşındınız.
 	</notification>
 	<notification name="AvatarMovedHome">
@@ -1164,11 +1249,10 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz.
 		</form>
 	</notification>
 	<notification name="FirstRun">
-		[APP_NAME] kurulumu tamamlandı.
+		[APP_NAME] yüklemesi tamamlandı.
 
 [SECOND_LIFE]&apos;ı ilk kez kullanıyorsanız, oturum açmadan önce bir hesap oluşturmalısınız.
-Yeni bir hesap oluşturmak için [http://join.secondlife.com secondlife.com] adresine dönülsün mü?
-		<usetemplate name="okcancelbuttons" notext="Devam" yestext="Yeni Hesap..."/>
+		<usetemplate name="okcancelbuttons" notext="Devam" yestext="Hesap Oluştur..."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
 		Bağlantıda sorun yaşıyoruz. İnternet bağlantınızda ya da [SECOND_LIFE_GRID] uygulamasında bir problem olabilir.
@@ -1403,14 +1487,44 @@ Sürüm [VERSION] [[RELEASE_NOTES_FULL_URL] Bu güncelleme hakkında ayrıntıl�
 		<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi kur ve [APP_NAME] uygulamasını yeniden başlat"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
-		Gerekli bir yazılım güncellemesini karşıdan yükledik.
-Sürüm [VERSION]
+		Gerekli bir yazılım güncellemesi indirdik.
+Sürüm [VERSION] [[INFO_URL] Bu güncelleme hakkında ayrıntılı bilgi]
 
-Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
-		Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+		Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+[[INFO_URL] Bu güncelleme hakkında bilgi]
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		[APP_NAME] kurulumunuz için bir güncelleme indirdik.
+Sürüm [VERSION] 
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [bu güncelleme hakkında bilgi için [INFO_URL]]
+		<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi yükle ve [APP_NAME] uygulamasını yeniden başlat"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		[APP_NAME] kurulumunuz için bir güncelleme indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
+		<usetemplate name="okcancelbuttons" notext="Sonra..." yestext="Şimdi yükle ve [APP_NAME] uygulamasını yeniden başlat"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		Gerekli bir yazılım güncellemesi indirdik.
+Sürüm [VERSION]
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
+
+Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		Güncellemeyi yüklemek için [APP_NAME] uygulamasını yeniden başlatmalısınız.
+Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
+bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
@@ -1461,6 +1575,10 @@ Güncellemeyi kurmak için [APP_NAME] uygulamasını yeniden başlatmalısınız
 Gruptan ayrılmak istiyor musunuz?
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		Gruptan ayrılınamıyor. Gruptan ayrılamazsınız çünkü grubun son sahibisiniz. Lütfen önce sahip rolüne başka bir üye atayın.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmKick">
 		Tüm Sakinleri GERÇEKTEN ağ dışına çıkarmak istiyor musunuz?
 		<usetemplate name="okcancelbuttons" notext="İptal Et" yestext="Tüm Sakinleri Çıkar"/>
@@ -1488,10 +1606,13 @@ Gruptan ayrılmak istiyor musunuz?
 		Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Durumunuz Meşgul olarak ayarlandı.
-Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek.
-		<usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/>
+	<notification name="DoNotDisturbModeSet">
+		Rahatsız Etme açık.  Gelen iletişimlerle ilgili size bilgi verilmeyecek.
+
+- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler &gt; Genel içerisinde ayarlanır).
+- Işınlanma teklifleri reddedilecektir.
+- Sesli aramalar reddedilecektir.
+		<usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin.
@@ -1685,83 +1806,128 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu Bölgeye giremezsiniz. Bu sorun yaşınızı doğrulamak için gerekli bilgilerin eksik olmasından kaynaklanabilir.
-
-Lütfen en son Görüntüleyicinin yüklü olduğunu doğrulayın ve bu erişkinlik seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;nı ziyaret edin.
+		Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu bölgeye giremezsiniz.
-
-Erişkinlik Seviyeleri hakkında daha fazla bilgi edinmek için Bilgi Bankası&apos;nı ziyaret etmek ister misiniz?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Erişkinlik Seviyesi ile ilgili kısıtlamalardan dolayı bu Bölgeye giremiyorum" name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+		<usetemplate ignoretext="Bölge geçişi: Ziyaret etmeye çalıştığınız bölge, sadece yetişkinlerin erişebileceği içeriğe sahip." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu bölgeye giremezsiniz.
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Erişkinlik Seviyesi tercihlerinizden dolayı bu Bölgeye giremezsiniz.
-
-İstenilen bölgeye girmek için, lütfen erişkinlik Seviyesi tercihinizi değiştirin. Bu tercih [REGIONMATURITY] içerikli alanlar içinde arama yapabilmenizi ve bu alanlara erişebilmenizi sağlayacak. Değişiklikleri geri almak için, Ben &gt; Tercihler &gt; Genel sekmesine gidin.
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz veya iptal edebilirsiniz. Tercihleriniz değiştikten sonra bölgeye tekrar girmeye çalışabilirsiniz.
 		<form name="form">
-			<button name="OK" text="Tercihi Değiştir"/>
-			<button name="Cancel" text="Kapat"/>
-			<ignore name="ignore" text="Seçtiğim Seviye tercihleri bir bölgeye girmemi engelliyor"/>
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Bölge geçişi: Ziyaret etmeye çalıştığınız bölge, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Tercihleriniz ile sunucu arasında senkronizasyon eksikliği olduğu için ışınlama işleminizde teknik sorunlar yaşanıyoruz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Işınla: Ziyaret etmeye çalıştığınız bölge, sadece yetişkinlerin erişebileceği içeriğe sahip." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz ve ışınlamaya devam edebilirsiniz veya bu ışınlama işlemini iptal edebilirsiniz.
+		<form name="form">
+			<button name="OK" text="Değiştir ve devam et"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Işınlama (yeniden başlatılabilir): Ziyaret etmeye çalıştığınız bölge, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz veya ışınlamayı iptal edebilirsiniz. Tercihleriniz değiştikten sonra ışınlamayı tekrar yapmaya kalkışmanız gerekecek.
+		<form name="form">
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Işınlama (yeniden başlatılamaz): Ziyaret etmeye çalıştığınız bölge, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Tercihleriniz ile sunucu arasında senkronizasyon eksikliği olduğu için ışınlama işleminizde teknik sorunlar yaşanıyoruz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Erişkinlik Seviyesi tercihiniz artık [RATING].
+		[RATING] içeriğine sahip bir bölgeyi ziyaret edeceğiniz hakkında başka bildirim almayacaksınız.  Daha sonra menü çubuğunda Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Şu anda [PREFERRED_MATURITY] içeriğini görüntüleyecek şekilde tercihlerinizi değiştiremedik.  Tercihleriniz, [ACTUAL_MATURITY] içeriğini görüntüleyecek şekilde sıfırlandı.  Menü çubuğunda Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi tekrar değiştirmeyi deneyebilirsiniz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu arazi üzerinde hak talebinde bulunamazsınız. Bu sorun yaşınızı doğrulamak için gerekli bilgilerin eksik olmasından kaynaklanabilir.
-
-Lütfen en son Görüntüleyicinin yüklü olduğunu doğrulayın ve bu erişkinlik seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;nı ziyaret edin.
+		Hak talebinde bulunduğunuz arazinin erişkinlik seviyesi mevcut tercihlerinizi aşıyor.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu arazi üzerinde hak talebinde bulunamazsınız.
-
-Erişkinlik Seviyeleri hakkında daha fazla bilgi edinmek için Bilgi Bankası&apos;nı ziyaret etmek ister misiniz?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Bu arazi üzerinde sadece yetişkinler hak talebinde bulunabilir.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Erişkinlik Seviyesi ile ilgili kısıtlandırmalardan dolayı bu Arazi üzerinde hak talebinde bulunamıyorum." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+		<usetemplate ignoretext="Bu arazi üzerinde sadece yetişkinler hak talebinde bulunabilir." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu arazi üzerinde hak talebinde bulunamazsınız.
+		Hak talebinde bulunduğunuz arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Hak talebinde bulunduğunuz arazi [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Erişkinlik Seviyesi tercihinizden dolayı bu arazi üzerinde hak talebinde bulunamazsınız.
-
-Erişkinlik Seviyesi tercihinizi şimdi yükseltmek ve araziye girebilmek için &apos;Tercihi Değiştir&apos; seçeneğini tıklatabilirsiniz. Böylece [REGIONMATURITY] içerikli alanlar içinde arama yapabilecek ve bu alanlara erişebileceksiniz. İleride bu ayarı eski haline döndürmek isterseniz, Ben &gt; Tercihler &gt; Genel sekmesine gidin.
-		<usetemplate ignoretext="Seçtiğim Seviye tercihi Arazi üzerinde hak talebinde bulunmamı engelliyor" name="okcancelignore" notext="Kapat" yestext="Tercihi Değiştir"/>
+		Hak talebinde bulunduğunuz arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz, sonra arazi üzerinde tekar hak talebinde bulunabilirsiniz.
+		<form name="form">
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Hak talebinde bulunduğunuz arazi, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu araziyi satın alamazsınız. Bu sorun yaşınızı doğrulamak için gerekli bilgilerin eksik olmasından kaynaklanabilir.
-
-Lütfen en son Görüntüleyicinin yüklü olduğunu doğrulayın ve bu erişkinlik seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;nı ziyaret edin.
+		Satın almaya çalıştığınız arazinin erişkinlik seviyesi mevcut tercihlerinizi aşıyor.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu araziyi satın alamazsınız.
-
-Erişkinlik Seviyeleri hakkında daha fazla bilgi edinmek için Bilgi Bankası&apos;nı ziyaret etmek ister misiniz?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Bu araziyi sadece yetişkinler satın alabilir.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Erişkinlik Seviyesi ile ilgili kısıtlandırmalardan dolayı bu Araziyi satın alamıyorum" name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+		<usetemplate ignoretext="Bu araziyi sadece yetişkinler satın alabilir." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu araziyi satın alamazsınız.
+		Satın almaya çalıştığınız arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Ziyaret etmeye çalıştığınız arazi [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Erişkinlik Seviyesi tercihinizden dolayı bu araziyi satın alamazsınız.
-
-Erişkinlik Seviyesi tercihinizi şimdi yükseltmek ve araziye girebilmek için &apos;Tercihi Değiştir&apos; seçeneğini tıklatabilirsiniz. Böylece [REGIONMATURITY] içerikli alanlar içinde arama yapabilecek ve bu alanlara erişebileceksiniz. İleride bu ayarı eski haline döndürmek isterseniz, Ben &gt; Tercihler &gt; Genel sekmesine gidin.
-		<usetemplate ignoretext="Seçtiğim Seviye tercihi Araziyi satın almamı engelliyor" name="okcancelignore" notext="Kapat" yestext="Tercihi Değiştir"/>
+		Satın almaya çalıştığınız arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz, sonra araziyi tekrar satın almaya çalışabilirsiniz.
+		<form name="form">
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Satın almaya çalıştığınız arazi, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Çok fazla prim seçilmiş. Lütfen [MAX_PRIM_COUNT] ya da daha az prim seçin ve tekrar deneyin
@@ -1815,10 +1981,9 @@ Erişkinlik Seviyesi tercihinizi şimdi yükseltmek ve araziye girebilmek için
 		</form>
 	</notification>
 	<notification label="Bölgenin Erişkinlik Seviyesi Değişti" name="RegionMaturityChange">
-		Bu bölgenin erişkinlik seviyesi güncellendi.
-Değişikliğin harita üzerine yansıtılması biraz zaman alabilir.
-
-Yetişkin bölgelerine girebilmek için, Sakinlerin yaş doğrulama ya da ödeme doğrulama yoluyla Doğrulanmış bir Hesaba sahip olmaları gerekmektedir.
+		Bu bölgenin yetişkin içerik seviyesi değişti.
+Bu değişikliğin harita üzerine yansıtılması biraz zaman alabilir.
+		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification label="Sesli Sohbet Sürüm Uyumsuzluğu" name="VoiceVersionMismatch">
 		[APP_NAME] uygulamasının bu sürümü bu bölgedeki Sesli Sohbet özelliği ile uyumlu değil. Sesli Sohbet özelliğinin düzgün bir şekilde çalışabilmesi için [APP_NAME] uygulamasını güncellemeniz gerekiyor.
@@ -1931,6 +2096,10 @@ Envanter öğesi/öğeleri taşınsın mı?
 		Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz?
 		<usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur.  Tüm katılımcılara yeni sohbet bildirimi gönderilir.
+		<usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		Çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/>
@@ -2005,14 +2174,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
 			<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
 		</form>
 	</notification>
-	<notification label="Meşgul Durumu Uyarısı" name="BusyModePay">
-		Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir.
+	<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
+		Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
 
-Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz?
+Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
 		<form name="form">
-			<ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/>
-			<button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/>
-			<button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/>
+			<ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/>
+			<button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/>
+			<button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2108,14 +2277,11 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 		<usetemplate ignoretext="Görünümümü düzenlerken oluşturduğum giysiyi giy" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Second Life içinde yetişkinlere yönelik içeriğe ve bölgelere erişmek için en az 18 yaşında olmalısınız. 18 yaşından büyük olduğunuzu onaylamak için lütfen yaş doğrulama sayfamızı ziyaret edin. 
-Bu adımda web tarayıcınızın başlatılacağına dikkat edin.
-
-[_URL]
-		<url name="url">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Yaşımı doğrulatmadım" name="okcancelignore" notext="İptal" yestext="Yaş Doğrulamasına Git"/>
+		Ziyaret etmeye çalıştığınız konum, yaşı 18 ve üzeri olan sakinlere kısıtlanmıştır.
+		<usetemplate ignoretext="Yaş kısıtı olan alanları ziyaret etmek için yaşım yeterli değil." name="okignore" yestext="Tamam"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Konum, 18 veya üzeri bir yaşta olanlara kısıtlanmıştır.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Bu alanı ziyaret edebilmek için ödeme bilgilerinizin kayıtlı olması gerekir. [SECOND_LIFE] web sitesine gitmek ve bunu ayarlamak istiyor musunuz?
@@ -2150,11 +2316,8 @@ Bu adımda web tarayıcınızın başlatılacağına dikkat edin.
 	<notification name="GroupNotice">
 		Konu: [SUBJECT], İleti: [MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimiçi
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimdışı
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; durumu: [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
 		Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz.
@@ -2176,7 +2339,7 @@ Bu adımda web tarayıcınızın başlatılacağına dikkat edin.
 		Terrain.raw karşıdan yüklendi
 	</notification>
 	<notification name="GestureMissing">
-		Hmm. [NAME] mimiği veri tabanında yok.
+		[NAME] mimiği veri tabanında yok.
 	</notification>
 	<notification name="UnableToLoadGesture">
 		[NAME] mimiği karşıya yüklenemiyor.
@@ -2275,9 +2438,7 @@ Lütfen tek bir nesne seçin.
     &apos;Işınla&apos; seçimini yapabilirsiniz.)
 	</notification>
 	<notification name="TeleportToPerson">
-		&apos;[NAME]&apos; gibi sakinlerle bağlantıya geçmek için &quot;Kişiler&quot; düğmesine tıklayın, açılan pencereden bir Sakin seçin ve sonra
-    pencerenin altında &apos;Anlık İleti&quot; üzerine tıklayın.
-    (Listede adlarına çift tıklayarak veya sağ tıklayıp &quot;Anlık İleti&quot;yi seçerek de bunu yapabilirsiniz.)
+		Biriyle özel bir sohbet başlatmak için, avatarlarına sağ tıklayın ve menüden &quot;Aİ&quot; seçimini yapın.
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
 		Sunucunun sınırları dışındaki arazi seçilemez.
@@ -2377,6 +2538,16 @@ Burada uçamazsınız.
 	<notification name="NoBuild">
 		Bu alanda inşa etme özelliği devre dışı. Burada nesne inşa edemez ve oluşturamazsınız.
 	</notification>
+	<notification name="PathfindingDirty">
+		Bu bölgede bekleyen yol bulma değişiklikleri var.  Eğer oluşturma haklarına sahipseniz, “Bölgeyi yeniden kaydet” düğmesine tıklayarak bölgeyi yeniden kaydedebilirsiniz.
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		Bu bölgede dinamik yol bulma etkin değil.  Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		Bir hata meydana geldi.  Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz.  Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Bu parsel, avatarları ve metin sohbetini başka bir parselden saklar.   Parselin dışındaki diğer sakinleri göremezsiniz, dışardakiler de sizi göremez.  0. kanaldaki normal metin sohbeti de engellenmiştir.
 	</notification>
@@ -2395,9 +2566,7 @@ Arazi sahibine ait olanlar dışında hiçbir komut dosyası çalışmayacak.
 		İçinde bulunduğunuz Bölgede sadece kamuya ait araziler üzerinde hak talebinde bulunabilirsiniz.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu Bölgeye giremezsiniz. Yaşınızı doğrulatmanız ve/veya en son Görüntüleyici&apos;yi yüklemeniz gerekebilir.
-
-Lütfen bu erişkinlik Seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;na gidin.
+		Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Bu bölgeye erişiminiz yasaklandı.
@@ -2408,11 +2577,11 @@ Lütfen bu erişkinlik Seviyesi ile erişilecek alanlar hakkında ayrıntılı b
 	<notification name="ImproperPaymentStatus">
 		Bu bölgeye girmek için gerekli ödeme durumuna sahip değilsiniz.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Bu bölgeye girebilmek için yaş doğrulamanızın yapılmış olması gerekir.
+	<notification name="MustGetAgeRegion">
+		Bu bölgeye girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Bu parsele girebilmek için yaş doğrulamanızın yapılmış olması gerekir.
+		Bu parsele girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
 	</notification>
 	<notification name="NoDestRegion">
 		Seçili hedef bölge yok.
@@ -2514,12 +2683,33 @@ Lütfen biraz sonra tekrar deneyin.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Işınla"/>
 			<button name="Cancel" text="İptal"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Bu bölgede [REGION_CONTENT_MATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGION_CONTENT_MATURITY] içeriğini dışlayacak şekilde ayarlanmış durumda.  Tercihlerinizi değiştirebilirsiniz ve ışınlamaya devam edebilirsiniz veya bu ışınlama işlemini iptal edebilirsiniz.
+		<form name="form">
+			<button name="Teleport" text="Değiştir ve Devam Et"/>
+			<button name="Cancel" text="İptal"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Ancak bu bölge sadece yetişkinlerin erişebileceği içeriğe sahip.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Işınlanma teklifi [TO_NAME] adlı kişiye gönderildi
 	</notification>
@@ -2614,16 +2804,21 @@ Kabul ediyor musunuz?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		&apos;[NAME]&apos; adlı kişiye ait &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; adındaki bir nesne şunu yapmak istiyor:
-
-[QUESTIONS]
-Bu nesneye ya da onu oluşturan kişiye güvenmiyorsanız, bu talebi reddetmelisiniz.
-
-Talep kabul edilsin mi?
+		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
+  
+Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
-			<button name="Grant" text="Kabul Et"/>
+			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
-			<button name="Details" text="Ayrıntılar..."/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		&apos;[NAME]&apos; tarafından sahip olunan bir nesne olan &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; tarafından istenen çalışma zamanı komut dosyası izni görüntüleyici tarafından tanınmadı ve verilemez.
+
+Bu izni vermek için lütfen [DOWNLOADURL] adresinden görüntüleyicinizi en son sürüme güncelleyin.
+		<form name="form">
+			<button name="Deny" text="Tamam"/>
+			<button name="Mute" text="Engelle"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2927,6 +3122,10 @@ Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin.
 		( [EXISTENCE] saniyedir hayatta )
  &apos;[BODYREGION]&apos; için [RESOLUTION] çözünürlükte kaydedilmiş bir dokuyu [TIME] saniye sonra yerel olarak güncellediniz.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Kopyalanamaz ve/veya aktarılamaz olduğu için bu dokunun bir önizlemesini görüntüleyemiyoruz.
+		<usetemplate ignoretext="Kopyalanamayan ve/veya aktarılamayan dokular için Canlı Önizleme modu mevcut olmayınca beni uyar" name="okignore" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Bu aramadan çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Aramadan çıkmadan önce doğrulama iste" name="okcancelignore" notext="Hayır" yestext="Evet"/>
@@ -3098,6 +3297,62 @@ Görünümünüzü döndürmek için dünya üzerindeki herhangi bir yeri tıkla
 		Bu eylem tüm menü öğelerini ve düğmelerini gizler. Bunları geri almak için [SHORTCUT] üzerine tekrar tıklayın.
 		<usetemplate ignoretext="KA&apos;ni gizlemeden önce onayla" name="okcancelignore" notext="İptal" yestext="Tamam"/>
 	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		Bazı seçili bağlantı kümelerinin Fantom bayrağı dönüştürülecek.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Bazı seçili bağlantı kümelerinin fantom bayrağı dönüştürülecek." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamıyor.  Bunun yerine bu bağlantı kümeleri &apos;[RESTRICTED_TYPE]&apos; olarak ayarlanacak.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle ayarlanamıyor." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		Seçilen bazı bağlantı kümeleri &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamaz, çünkü şekil konveks değil.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Seçilen bazı bağlantı kümeleri ayarlanamaz, çünkü şekil konveks değil." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		Bazı seçili bağlantı kümelerinin Fantom bayrağı dönüştürülecek.
+
+Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamıyor.  Bunun yerine bu bağlantı kümeleri &apos;[RESTRICTED_TYPE]&apos; olarak ayarlanacak.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Bazı seçili bağlantı kümelerinin fantom bayrağı dönüştürülecek, diğerleri ise bağlantı kümesi için izin kısıtlamaları nedeniyle ayarlanamıyor." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		Bazı seçili bağlantı kümelerinin Fantom bayrağı dönüştürülecek.
+
+Seçilen bazı bağlantı kümeleri &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamaz, çünkü şekil konveks değil.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Bazı seçili bağlantı kümelerinin fantom bayrağı dönüştürülecek, diğerleri ise şekil konveks olmadığı için ayarlanamıyor" name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamıyor.  Bunun yerine bu bağlantı kümeleri &apos;[RESTRICTED_TYPE]&apos; olarak ayarlanacak.
+
+Seçilen bazı bağlantı kümeleri &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamaz, çünkü şekil konveks değil. Bu bağlantı kümelerinin kullanım tipleri değişmez.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle ve şekil konveks olmadığı için ayarlanamıyor." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		Bazı seçili bağlantı kümelerinin Fantom bayrağı dönüştürülecek.
+
+Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamıyor.  Bunun yerine bu bağlantı kümeleri &apos;[RESTRICTED_TYPE]&apos; olarak ayarlanacak.
+
+Seçilen bazı bağlantı kümeleri &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamaz, çünkü şekil konveks değil. Bu bağlantı kümelerinin kullanım tipleri değişmez.
+
+Devam etmek istiyor musunuz?
+		<usetemplate ignoretext="Bazı seçili bağlantı kümelerinin fantom bayrağı dönüştürülecek, diğerleri ise bağlantı kümesi için izin kısıtlamaları nedeniyle ve şekil konveks olmadığı için ayarlanamıyor." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		Seçilen nesne navigasyon örgüsünü etkiliyor.  Bunu bir Esnek Yol olarak değiştirirseniz, navigasyon örgüsünden çıkartmış olursunuz.
+		<usetemplate ignoretext="Seçilen nesne navigasyon örgüsünü etkiliyor.  Bunu bir Esnek Yol olarak değiştirirseniz, navigasyon örgüsünden çıkartmış olursunuz." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		[APP_NAME] uygulaması için gerekli donanım gereksinimlerine sahip olmadığınız görünüyor. [APP_NAME] çoklu doku desteği sunan bir OpenGL grafik kartı gerektiriyor. Eğer grafik kartınız bu özellikteyse, grafik kartınızın en son sürücülerine ve işletim sisteminiz için gerekli Service Pack ve yamalara sahip olup olmadığınızı kontrol etmeyi deneyebilirsiniz.
 
@@ -3122,4 +3377,646 @@ Bir araziye sahip değilseniz, Harita&apos;ya bakıp &quot;Bilgi İstasyonu&quot
 	<global name="You died and have been teleported to your home location">
 		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] güncellenemedi çünkü bu dosya artık bulunamıyor.
+Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[NRETRIES] girişimde [FNAME] açılamadı veya şifresi çözülemedi, bu dosya artık bozuk olarak değerlendiriliyor.
+Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Geçersiz veya okunamayan bir görüntü dosyası [FNAME] eklenmeye kalkışıldı, ancak dosya açılamadı veya şifresi çözülemedi.
+Girişim iptal edildi.
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		[NUM_ITEMS] öğeyi iade ediyorsunuz.  Devam etmek istediğinize emin misiniz?
+		<usetemplate ignoretext="Birden çok öğeyi iade etmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		[NUM_ITEMS] öğeyi siliyorsunuz.  Devam etmek istediğinize emin misiniz?
+		<usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
+	</notification>
+	<notification name="YouFrozeAvatar">
+		Avatar donduruldu.
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] sizin dondurulmanızı kaldırdı.
+	</notification>
+	<notification name="AvatarUnFrozen">
+		Avatar artık dondurulmuş değil.
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz.
+	</notification>
+	<notification name="AvatarCantFreeze">
+		Üzgünüz, bu kullanıcı dondurulamaz.
+	</notification>
+	<notification name="NowOwnObject">
+		Artık [OBJECT_NAME] nesnesinin sahibisiniz
+	</notification>
+	<notification name="CantRezOnLand">
+		[OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor.  Arazinin sahibini görmek için arazi aracını kullanın.
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		Çok fazla talep olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="SitFailCantMove">
+		Oturamazsınız çünkü şu anda hareket edemezsiniz.
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		Oturamazsınız çünkü bu araziye girme izniniz yok.
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		Daha yakına gelmeyi deneyin.  Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz.
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		Yeni nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="FailedToPlaceObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="NoOwnNoGardening">
+		Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız.
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		&apos;[OBJ_NAME]&apos; nesnesi size aktarılamadığı için kopyalama başarılamadı.
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi navmesh&apos;e katkıda bulunduğu için kopyalama başarılamadı.
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		Kök nesne seçili olmayan kopya.
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		Nesneler çoğaltılamıyor çünkü bölge dolu.
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı.
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		Nesne oluşturulamıyor çünkü
+parsel dolu.
+	</notification>
+	<notification name="RezAttemptFailed">
+		Bir nesneyi oluşturma girişimi başarısız oldu.
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor.
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		Bu envanter öğesi kara listeye alınmış.
+	</notification>
+	<notification name="NoCanRezObjects">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="LandSearchBlocked">
+		Arazi Arama Engellendi.
+Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz.
+Lütfen bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız
+	</notification>
+	<notification name="EjectComingSoon">
+		Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var.
+	</notification>
+	<notification name="NoEnterServerFull">
+		Bu bölgeye giremezsiniz çünkü 
+sunucu dolu.
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		Envantere Geri Kaydet devre dışı bırakıldı.
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		&apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil.
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		&apos;[DEST_NAME]&apos; nesnesini değiştirme izniniz olmadığı için &apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi.
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		&apos;[OBJ_NAME]&apos; envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı.
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız.
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoTransNoCopy">
+		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		Benzeticiden &apos;[OBJ_NAME]&apos; nesnesinin kaldırılmasına izinler sistemi izin vermiyor.
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		&apos;[OBJ_NAME]&apos; nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz.
+	</notification>
+	<notification name="NoModNoTaking">
+		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız.
+	</notification>
+	<notification name="RezDestInternalError">
+		Dahili Hata: Bilinmeyen hedef türü.
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		Nesne bulunamadığı için silme başarılamadı
+	</notification>
+	<notification name="SorryCantEjectUser">
+		Üzgünüz, bu kullanıcı çıkartılamaz.
+	</notification>
+	<notification name="RegionSezNotAHome">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="HomeLocationLimits">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="HomePositionSet">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="AvatarEjected">
+		Avatar çıkartıldı.
+	</notification>
+	<notification name="AvatarEjectFailed">
+		Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu.
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor.
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh&apos;i bölge sınırları ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE])
+	</notification>
+	<notification name="NoPermModifyObject">
+		Bu nesneyi değiştirme izniniz yok
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		Navmesh&apos;e katkıda bulunan bir nesne için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		Anahtar karelenmiş nesneler için fizik etkinleştirilemez.
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		Fizik kaynağı maliyeti [MAX_OBJECTS]&apos;dan büyük nesne için fizik etkinleştirilemedi
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		Bu nesne fantom olduğu ve navmesh&apos;e katkıda bulunduğu için konkav bir parçaya sahip olamaz.
+	</notification>
+	<notification name="UnableAddItem">
+		Öğe eklenemedi!
+	</notification>
+	<notification name="UnableEditItem">
+		Bu düzenlenemiyor!
+	</notification>
+	<notification name="NoPermToEdit">
+		Bunu düzenleme izni yok.
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		Bu envanteri kopyalama izni yok.
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil.
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
+	</notification>
+	<notification name="TooManyScripts">
+		Çok fazla komut dosyası.
+	</notification>
+	<notification name="UnableAddScript">
+		Komut dosyası eklenemedi!
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		Varlık sunucusu zamanında yanıt vermedi.  Nesne sime iade edildi.
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		Bu bölgede fiziksel şekiller etkin değil.
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		Navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		Bu nesne türü üzerinde fizik özellikleri ayarlanamaz.
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		Kök prim şekilsiz olacak şekilde ayarlanamaz.
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		Bu bölgede fiziksel malzemeler etkin değil.
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		Sadece kök primlerin fizik malzemeleri ayarlanabilir.
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor.
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz.
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		Bir örgü nesnesinin dikiş türünü değiştiremezsiniz.
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		Bir örgü nesnesinin şeklini değiştiremezsiniz
+	</notification>
+	<notification name="FullRegionCantEnter">
+		Bu bölgeye giremezsiniz çünkü \nbölge dolu.
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		Bağlantı başarısız oldu -- sahipler farklı
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		Bağlntı başarılamadı -- navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı.
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		Bağlantı başarısız oldu -- çok fazla ilkel öğe var
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok.
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		Bağlantı başarısız oldu -- arazi kaynakları yetersiz
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı.
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		&apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
+	</notification>
+	<notification name="TeleportedByAttachment">
+		You have been teleported by an attachment on [ITEM_ID]
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		Bilinmeyen bir sahibi olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız.
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		Talep edilen nesne oluşturulamıyor. Bölge dolu.
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		Tek bir noktaya birden fazla nesne iliştiremezsiniz.
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		Burada birden fazla nesne oluşturamazsınız.
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok.
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin.
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı.
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		Bu arazide bitkiler oluşturamazsınız.
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		Nesne geri yüklenemiyor. Dünya konumu bulunamadı.
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		Örgü verileri geçersiz olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı.
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor.
+	</notification>
+	<notification name="CantCreateObject">
+		Şu anda nesne oluşturmanıza izin verilmiyor.
+	</notification>
+	<notification name="InvalidObjectParams">
+		Geçersiz nesne parametreleri
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor.
+	</notification>
+	<notification name="CantChangeShape">
+		Bu şekli değiştirmenize izin verilmiyor.
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor.
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı.
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor.
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		Üzerinde bir avatar oturduğu için nesne iliştirilemiyor.
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		Ağaçlar ve çimen aksesuar olarak giyilemez.
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		Sahibi grup olan nesneler iliştirilemiyor.
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		Sahip olmadığınız nesneleri iliştiremezsiniz.
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		Navmesh&apos;e katkıda bulunan nesneler iliştirilemez.
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız.
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun.
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		Aksesuar düşürülemedi: Burada düşürme izniniz yok.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz.
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz.
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		Nesne buraya düşürülemez.  Parsel dolu.
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz.
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		Lütfen silme parametrelerinizi daraltın.
+	</notification>
+	<notification name="UnableToUploadAsset">
+		Varlık karşıya yüklenemiyor.
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		Ana konuma ışınlanacak kullanıcı bulunamadı
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		tanrısal talep başarısız oldu
+	</notification>
+	<notification name="GenericRequestFailed">
+		genel talep başarısız oldu
+	</notification>
+	<notification name="CantUploadPostcard">
+		Posta kartı karşıya yüklenemiyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		Grup bildirimi için envanter ayrıntıları alınamadı.
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		Grup bildirimi gönderilemedi -- izin verilmiyor.
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		Grup bildirimi gönderilemedi -- envanter oluşturulamadı.
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		Bildirimde envanter ayrıştırılamadı.
+	</notification>
+	<notification name="TerrainUploadFailed">
+		Yüzeyin karşıya yüklemesi başarılamadı.
+	</notification>
+	<notification name="TerrainFileWritten">
+		Yüzey dosyası yazıldı.
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor...
+	</notification>
+	<notification name="TerrainBaked">
+		Yüzey kaydedildi.
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın.
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz.
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		Satın alınamıyor, bu parsel satılık değil.
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş.
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		Bu parsel için yetkili alıcı değilsiniz.
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır.
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin.
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok.
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -&gt; Hata Bildir ile bildirin...
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin.
+	</notification>
+	<notification name="LandHasBeenDivided">
+		Arazi bölündü.
+	</notification>
+	<notification name="PassPurchased">
+		Bir geçiş hakkı satın aldınız.
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		Bölgede seri ilanlara izin verilmiyor.
+	</notification>
+	<notification name="LandPassExpireSoon">
+		Bu arazi için geçiş hakkınız sona ermek üzere.
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin.
+	</notification>
+	<notification name="CantSitNoRoom">
+		Burada oturacak yer yok, başka bir yer deneyin.
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı.
+	</notification>
+	<notification name="CantDeedGroupLand">
+		Grubun sahip olduğu araziyi devredemezsiniz.
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı.
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı.
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil.
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		Şu anda geçiş hakkı satın alınamıyor.  Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		Nesne oluşturulamıyor çünkü \nparsel dolu.
+	</notification>
+	<notification name="FailedPlacingObject">
+		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		Etkinlik için yer imi oluşturulamıyor.
+	</notification>
+	<notification name="GodBeatsFreeze">
+		Tanrısal güçleriniz dondurmayı devre dışı bıraktı!
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi.
+	</notification>
+	<notification name="ExpireExplanation">
+		Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı.
+	</notification>
+	<notification name="DieExplanation">
+		Sistem talebinizi işleyemiyor.
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		İlkel öğeyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="RezObjectFailure">
+		Nesneyi oluşturmak için yeterli fon yok.
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		Ana konum sıfırlandı çünkü Ana konum yasal değildi.
+	</notification>
+	<notification name="CantInviteRegionFull">
+		Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin.
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
+	</notification>
+	<notification name="ListValidHomeLocations">
+		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
+	</notification>
+	<notification name="SetHomePosition">
+		Ana konum ayarlandı.
+	</notification>
+	<notification name="CantDerezInventoryError">
+		Envanter hatasından ötürü nesne oluşturulması geri alınamıyor.
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		Talep edilen envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		Talep edilen envanter klasörü oluşturulamadı.
+	</notification>
+	<notification name="CantCreateInventory">
+		Bu envanter oluşturulamadı.
+	</notification>
+	<notification name="CantCreateLandmark">
+		Yer imi oluşturulamıyor.
+	</notification>
+	<notification name="CantCreateOutfit">
+		Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin.
+	</notification>
+	<notification name="InventoryNotForSale">
+		Envanter satılık değil.
+	</notification>
+	<notification name="CantFindInvItem">
+		Envanter öğesi bulunamıyor.
+	</notification>
+	<notification name="CantFindObject">
+		Nesne bulunamıyor.
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
+	</notification>
+	<notification name="CantPayNoAgent">
+		Kime ödeme yapılacağı belirlenemedi.
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		Kamusal nesnelere L$ veremezsiniz.
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		Dünya içerisindeki nesnede envater oluşturma başarısız oldu.
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik.  Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir.
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		Başka oyuncularla kesişen büyük primler oluşturulamaz.  Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin.
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir.
+		<usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir.
+		<usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		Dosyalar taşınamıyor. Önceki yol geri yüklendi.
+		<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml
index b03ce3ebe5..b03ce3ebe5 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/tr/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
index 602818de94..602818de94 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/tr/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
index 7542778aca..f330bd85e8 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
@@ -27,5 +27,6 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/>
 	<icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/>
 	<icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml
index 81e04379a1..81e04379a1 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
index 0464b7ec07..87b67e249e 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		Listeyi Engelle
-	</text>
-	<scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
-	<button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/>
-	<button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/>
-	<button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="Filtrele" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/>
+		<menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/>
+		<menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/>
+		<button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
+	</panel>
+	<block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml
index f991c3b688..f991c3b688 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_body_parts_list_item.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml
index 6c2478cdb7..6c2478cdb7 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_bodyparts_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray.xml
deleted file mode 100644
index 26118d8b39..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Mikrofonu açar/kapatır"/>
-	<string name="VoiceControlBtnToolTip" value="Ses kontrol panelini gösterir/gizler"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Konuş" label_selected="Konuş" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Mimik" name="Gesture" tool_tip="Mimikleri gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Hareket Et" name="movement_btn" tool_tip="Hareket kontrollerini gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Görünüm" name="camera_btn" tool_tip="Kamera kontrollerini gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button name="snapshots" tool_tip="Anlık görüntü al"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="İnşa Et" name="build_btn" tool_tip="İnşa Et Aracını gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Ara" name="search_btn" tool_tip="Aramayı gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Harita" name="world_map_btn" tool_tip="Dünya Haritasını gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini-Harita" name="mini_map_btn" tool_tip="Mini Haritayı gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Sohbetler"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Bildirimler"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml
index 5d7006af2f..5d7006af2f 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/tr/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_chat_header.xml b/indra/newview/skins/default/xui/tr/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/tr/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml
index a1e8190bbc..a1e8190bbc 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_chiclet_bar.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_classified_info.xml b/indra/newview/skins/default/xui/tr/panel_classified_info.xml
index d412a03e32..d412a03e32 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/tr/panel_classified_info.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml
index bb5930ee79..bb5930ee79 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml
index e60e291ee8..e60e291ee8 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml
index 7d70177553..7d70177553 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/tr/panel_cof_wearables.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..c7227f02b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="(yükleniyor)"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..79895f9c21
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/>
+	<icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/>
+	<button name="delete_btn" tool_tip="Bu girişi kaldır"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml
index 47703136b0..47703136b0 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml
index 28e034a357..28e034a357 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml
index e3ba806b0d..e3ba806b0d 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_alpha.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
index 7584b754f1..7584b754f1 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_classified.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml
index 42f62b6bbe..42f62b6bbe 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_eyes.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml
index be89e94bbf..be89e94bbf 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_gloves.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml
index f33a6d6402..f33a6d6402 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_hair.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml
index 10bc4278db..10bc4278db 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_jacket.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml
index 06e1b7b4ab..06e1b7b4ab 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_pants.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml
index 98dbfd8e42..98dbfd8e42 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
index 98b02d27df..98b02d27df 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_pick.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
index 21f4e419bc..21f4e419bc 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_profile.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml
index 57cd9aca75..57cd9aca75 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml
index 2dd417afc6..2dd417afc6 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_shirt.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml
index 34acb414b0..34acb414b0 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_shoes.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml
index fdf75100ed..fdf75100ed 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_skin.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml
index 2099013fe1..2099013fe1 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_skirt.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml
index d386814d31..d386814d31 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_socks.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml
index 7f5590a485..7f5590a485 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_tattoo.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml
index ed003e1adf..ed003e1adf 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_underpants.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml
index e0a0be8abb..e0a0be8abb 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_undershirt.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml
index 7a4a09aaed..7a4a09aaed 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/tr/panel_edit_wearable.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
index 58bb68a5c3..58bb68a5c3 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_control_panel.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_general.xml b/indra/newview/skins/default/xui/tr/panel_group_general.xml
index 0462026249..0462026249 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_general.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
index 32f39da490..32f39da490 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_info_sidetray.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
index 9b0c7f799a..4ba5761edb 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Seçtiğiniz bazı Sakinler zaten grupta yer alıyor, bu yüzden bunlara davetiye gönderilmedi.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Gönderilmeyen Grup Davetiyeleri: Çok fazla Sakin seçilmiş. Grup Davetiyelerinde talep başına 100 sınırı vardır.
+	</panel.string>
 	<text name="help_text">
 		Grubunuza davet etmek için birden fazla Sakin seçebilirsiniz. Başlamak için &quot;Sakin Seçiciyi Aç&quot; üzerine tıklayın.
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml
index e9112a862b..e9112a862b 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_land_money.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
index 2bc597f2fa..f44d2b5e76 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Bilinmiyor"/>
+	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_notices.xml b/indra/newview/skins/default/xui/tr/panel_group_notices.xml
index 179b5fff69..179b5fff69 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_notices.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_notify.xml b/indra/newview/skins/default/xui/tr/panel_group_notify.xml
index bcc5482daa..bcc5482daa 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_notify.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_group_roles.xml b/indra/newview/skins/default/xui/tr/panel_group_roles.xml
index fb03107da8..fb03107da8 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_roles.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
index aebdc6b48d..aebdc6b48d 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/tr/panel_im_control_panel.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_instant_message.xml b/indra/newview/skins/default/xui/tr/panel_instant_message.xml
index cf9bc7fccb..cf9bc7fccb 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/tr/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml
index 2cad753f25..2cad753f25 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/tr/panel_landmark_info.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_landmarks.xml b/indra/newview/skins/default/xui/tr/panel_landmarks.xml
index d40d0c1543..d40d0c1543 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/tr/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_login.xml b/indra/newview/skins/default/xui/tr/panel_login.xml
index acd6aa1921..28d316e46b 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_login.xml
+++ b/indra/newview/skins/default/xui/tr/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				OTURUM AÇ
+			</text>
 			<text name="username_text">
 				Kullanıcı Adı:
 			</text>
@@ -15,15 +15,8 @@
 			<text name="password_text">
 				Parola:
 			</text>
-			<check_box label="Parolayı hatırla" name="remember_check"/>
-			<button label="Oturum Aç" name="connect_btn"/>
-			<text name="mode_selection_text">
-				Mod:
-			</text>
-			<combo_box name="mode_combo" tool_tip="Modunuzu seçin. Hızlı, kolay keşif yapmak ve sohbet için Temel seçimini yapın. Daha fazla özelliğe erişmek için Gelişmiş seçimini yapın.">
-				<combo_box.item label="Temel" name="Basic"/>
-				<combo_box.item label="Gelişmiş" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				Buradan başla:
 			</text>
@@ -33,16 +26,21 @@
 				<combo_box.item label="&lt;Bölge adını girin&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				Kaydolun
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				Oturum açarken yardım mı gerekiyor?
 			</text>
 			<text name="forgot_password_text">
 				Kullanıcı adınızı veya parolanızı mı unuttunuz?
 			</text>
-			<text name="login_help">
-				Oturum açarken yardım mı gerekiyor?
+			<button label="Oturum Aç" name="connect_btn"/>
+			<check_box label="Parolayı hatırla" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				HESABINIZI OLUŞTURUN
 			</text>
+			<button label="Şimdi başla" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
index c69fb39130..c69fb39130 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_me.xml b/indra/newview/skins/default/xui/tr/panel_me.xml
index 4b911c9ce6..4b911c9ce6 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_me.xml
+++ b/indra/newview/skins/default/xui/tr/panel_me.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml
index 89e78b75de..89e78b75de 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_media_settings_general.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml
index 6c0b14a889..6c0b14a889 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/tr/panel_media_settings_permissions.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml
index da3ca1bd29..da3ca1bd29 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/tr/panel_media_settings_security.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
index 8d43e3fb5a..8d43e3fb5a 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_navigation_bar.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
index d238388b0e..d238388b0e 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
index fd954475ac..7d191191c4 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
+<panel name="nearby_chat">
 	<line_editor label="Sohbet etmek için buraya tıklayın." name="chat_box" tool_tip="Söylemek için Enter, bağırmak için Ctrl+Enter yapın"/>
 	<button name="show_nearby_chat" tool_tip="yakın sohbet günlüğünü gösterir/gizler"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml
index a654b2ac14..a654b2ac14 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/tr/panel_nearby_media.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml
index b893da2a71..b893da2a71 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/tr/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml
index fdc489f375..fdc489f375 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/tr/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml
index a947eee150..a947eee150 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outbox_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml
index 00cd49abcd..00cd49abcd 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfit_edit.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
index 550f7ebf10..550f7ebf10 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml
index d222f1a6e3..d222f1a6e3 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml
index 60a3576d84..60a3576d84 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfits_list.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
index 462926738f..462926738f 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/tr/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 1a1e53bac2..b499ec8307 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -14,81 +14,56 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_filtered_friends_msg">
 		Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin.
 	</string>
-	<string name="people_filter_label" value="Kişileri Filtrele"/>
-	<string name="groups_filter_label" value="Grupları Filtrele"/>
 	<string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/>
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
-	<filter_editor label="Filtrele" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
-		<panel label="ARKADAŞLARIM" name="friends_panel">
+		<panel label="ARKADAŞLAR" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="GRUPLARIM" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
-				<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
+		<panel label="GRUPLAR" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="Grupları Filtrele" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/>
+				<menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
+				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
 			</panel>
+			<text name="groupcount">
+				[COUNT] gruba üyesiniz, daha [REMAINING] gruba üye olabilirsiniz.
+			</text>
 		</panel>
 		<panel label="SON" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
-				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="Kişileri Filtrele" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
+				<menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/>
+				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
+				<dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
 			</panel>
 		</panel>
+		<panel label="ENGELLENMİŞ" name="blocked_panel">
+			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="im_btn_lp">
-				<button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="call_btn_lp">
-				<button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/>
-			</layout_panel>
-			<layout_panel name="share_btn_lp">
-				<button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/>
-			</layout_panel>
-			<layout_panel name="teleport_btn_lp">
-				<button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_pick_info.xml b/indra/newview/skins/default/xui/tr/panel_pick_info.xml
index f2bbfac232..f2bbfac232 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/tr/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_picks.xml b/indra/newview/skins/default/xui/tr/panel_picks.xml
index 26beac7854..26beac7854 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_picks.xml
+++ b/indra/newview/skins/default/xui/tr/panel_picks.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_place_profile.xml b/indra/newview/skins/default/xui/tr/panel_place_profile.xml
index f42cde0ace..f42cde0ace 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/tr/panel_place_profile.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_places.xml b/indra/newview/skins/default/xui/tr/panel_places.xml
index c2a3acf9c5..c2a3acf9c5 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_places.xml
+++ b/indra/newview/skins/default/xui/tr/panel_places.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml
index 2361f4c1c3..2361f4c1c3 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_postcard_message.xml
+++ b/indra/newview/skins/default/xui/tr/panel_postcard_message.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
index bce0b21b9a..bce0b21b9a 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/tr/panel_postcard_settings.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
index 770cdc6efd..770cdc6efd 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
index 46a4793c53..46a4793c53 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index 9caf95a122..d46f3e08cc 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,33 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<text name="font_size">
-		Font büyüklüğü:
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="Küçük" name="radio" value="0"/>
-		<radio_item label="Orta" name="radio2" value="1"/>
-		<radio_item label="Büyük" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
-	<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
-	<check_box label="Düz metin Aİ&apos;ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/>
-	<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		Aİ&apos;leri şurada göster:
-	</text>
-	<text name="requires_restart_label">
-		(tekrar başlatma gerekir)
-	</text>
-	<radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
-		<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
-		<radio_item label="Sekmeler" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		Gelen sohbet için açılır pencereleri etkinleştir:
-	</text>
-	<check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/>
-	<check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/>
-	<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
-	<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
-	<button label="Sohbet Çevirisi Ayarları" name="ok_btn"/>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
+		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
+		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			Font büyüklüğü:
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="Küçük" name="Small" value="0"/>
+			<item label="Orta" name="Medium" value="1"/>
+			<item label="Büyük" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			Arkadaş Aİ&apos;leri:
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			Arkadaş harici Aİ&apos;ler:
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			Konferans Aİ&apos;leri:
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			Grup sohbeti:
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			Yakındaki sohbet:
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			Nesne Aİ&apos;leri:
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
+			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
+			<item label="Eylem yok" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="Sesi çal" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			Sesi çal:
+		</text>
+		<check_box label="Yeni sohbet" name="new_conversation"/>
+		<check_box label="Gelen sesli arama" name="incoming_voice_call"/>
+		<check_box label="Işınlama teklifi" name="teleport_offer"/>
+		<check_box label="Envanter teklifi" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="Günlüğü temizle..." name="clear_log"/>
+		<button label="Dökümleri sil..." name="delete_transcripts"/>
+		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
+	</panel>
+	<button label="Çeviri..." name="ok_btn"/>
+	<button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/>
+	<button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml
index f6e9d0948c..f6e9d0948c 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_colors.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index 4a48b1588c..1a13cf8f71 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="asla" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Meşgul durumu cevabı:
+		Rahatsız Etme yanıtı:
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
index ddb83ffc69..25c9e966c7 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -30,7 +30,7 @@
 		<check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
 		<check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
 		<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Işıklandırma ve Gölgeler" name="UseLightShaders"/>
+		<check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
 		<check_box initial_value="true" label="Ortam Gölgeleme" name="UseSSAO"/>
 		<check_box initial_value="true" label="Alan Derinliği" name="UseDoF"/>
 		<text name="shadows_label">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
index c35eaec9c3..c35eaec9c3 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_move.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
index 9111594979..9111594979 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index 9d03d9b01d..2039761748 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -29,6 +29,7 @@
 		<combo_box.item label="Otomatik olarak kurulsun" name="Install_automatically"/>
 		<combo_box.item label="Güncelleştirmeler manuel olarak karşıdan yüklensin ve kurulsun" name="Install_manual"/>
 	</combo_box>
+	<check_box label="Sürüm adaylarına güncelleme yapmaya gönüllü" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
 		Proxy Ayarları:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
index 9256f1d324..9256f1d324 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_sound.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
index 0433d03450..0433d03450 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml
index 5c46365aea..5c46365aea 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_covenant.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
index 6e15e0f6f6..834ece563f 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
@@ -30,5 +30,5 @@
 	<button label="En Çok Çarpışanlar..." name="top_colliders_btn" tool_tip="En çok potansiyel çarpışma yaşayan nesnelerin listesi"/>
 	<button label="En Çok Komut Dsy. Çalştr...." name="top_scripts_btn" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesi"/>
 	<button label="Bölgeyi Yeniden Başlat" name="restart_btn" tool_tip="2 dakikalık bir geri sayımdan sonra bölgeyi yeniden başlat"/>
-	<button label="Yeniden Başlatmayı Ertele" name="cancel_restart_btn" tool_tip="Bölgenin yeniden başlatılmasını 1 saat ertele"/>
+	<button label="Yeniden Başlatmayı İptal Et" name="cancel_restart_btn" tool_tip="Bölge yeniden başlatmasını iptal et"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_environment.xml b/indra/newview/skins/default/xui/tr/panel_region_environment.xml
index 058ea91b70..058ea91b70 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_environment.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
index f1df13df61..4a9028643f 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
@@ -23,7 +23,7 @@
 		Sadece şu Sakinlere erişim izni verin:
 	</text>
 	<check_box label="Ödeme bilgileri kayıtlı" name="limit_payment" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için ödeme bilgilerinin kayıtlı olması gerekir.  Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
-	<check_box label="Yaş doğrulaması yapılmış" name="limit_age_verified" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için yaş doğrulamalarının yapılmış olması gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
+	<check_box label="18 veya üzeri bir yaşta" name="limit_age_verified" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için 18 veya üzeri bir yaşta olmaları gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
 	<check_box label="Sesli Sohbete İzin Ver" name="voice_chat_check"/>
 	<check_box label="Doğrudan Işınlamaya İzin Ver" name="allow_direct_teleport"/>
 	<button label="Uygula" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_general.xml b/indra/newview/skins/default/xui/tr/panel_region_general.xml
index 37da0f2cca..37da0f2cca 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_general.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
index 3226ee008e..3226ee008e 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_region_texture.xml b/indra/newview/skins/default/xui/tr/panel_region_texture.xml
deleted file mode 100644
index fd7ca2a893..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_region_texture.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Zemin Dokuları" name="Textures">
-	<text name="region_text_lbl">
-		Bölge:
-	</text>
-	<text name="region_text">
-		bilinmiyor
-	</text>
-	<text name="detail_texture_text">
-		Yüzey Dokuları (512x512, 24 bit .tga dosyalar gerektirir)
-	</text>
-	<text name="height_text_lbl">
-		1 (Düşük)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Yüksek)
-	</text>
-	<text name="height_text_lbl5">
-		Doku Yükselti Aralıkları
-	</text>
-	<text name="height_text_lbl6">
-		Kuzeybatı
-	</text>
-	<text name="height_text_lbl7">
-		Kuzeydoğu
-	</text>
-	<spinner label="Düşük" name="height_start_spin_1"/>
-	<spinner label="Düşük" name="height_start_spin_3"/>
-	<spinner label="Yüksek" name="height_range_spin_1"/>
-	<spinner label="Yüksek" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		Güneybatı
-	</text>
-	<text name="height_text_lbl9">
-		Güneydoğu
-	</text>
-	<spinner label="Düşük" name="height_start_spin_0"/>
-	<spinner label="Düşük" name="height_start_spin_2"/>
-	<spinner label="Yüksek" name="height_range_spin_0"/>
-	<spinner label="Yüksek" name="height_range_spin_2"/>
-	<text name="height_text_lbl10">
-		Bu değerler yukarıdaki dokular için karışım aralığını temsil eder.
-	</text>
-	<text name="height_text_lbl11">
-		Metre cinsinden olan bu değerler için, DÜŞÜK değer 1. Dokunun MAKSİMUM yüksekliği, YÜKSEK değer ise 4. Dokunun MİNİMUM yüksekliğidir.
-	</text>
-	<button label="Uygula" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_script_ed.xml b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
index 7aa1da6fb2..79cd86c3f0 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/tr/panel_script_ed.xml
@@ -34,6 +34,7 @@
 			<menu_item_call label="Tümünü Seç" name="Select All"/>
 			<menu_item_call label="Seçimi Kaldır" name="Deselect"/>
 			<menu_item_call label="Ara / Değiştir..." name="Search / Replace..."/>
+			<menu_item_call label="Şu satıra git:" name="Go to line..."/>
 		</menu>
 		<menu label="Yardım" name="Help">
 			<menu_item_call label="Yardım..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml
index c821dc45c1..c821dc45c1 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_script_limits_my_avatar.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml
index 2994aba39b..2994aba39b 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_script_limits_region_memory.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml
index aabdc7358b..aabdc7358b 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/tr/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/tr/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray.xml b/indra/newview/skins/default/xui/tr/panel_side_tray.xml
deleted file mode 100644
index 97bca38a50..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Yan Çubuğu Aç/Kapa." name="sidebar_openclose" tab_title="Yan Çubuğu Aç/Kapa"/>
-	<sidetray_tab description="Ana konum." name="sidebar_home" tab_title="Ana konum">
-		<panel label="ana konum" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Kamuya açık profilinizi ve Favorilerinizi düzenleyin." name="sidebar_me" tab_title="Profilim">
-		<panel_container name="panel_container">
-			<panel label="Ben" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Yakındaki arkadaşlarınızı, irtibatları ve kişileri bulun." name="sidebar_people" tab_title="Kişiler">
-		<panel_container name="panel_container">
-			<panel label="Grup Profili" name="panel_group_info_sidetray"/>
-			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Gitmek istediğiniz yerleri ve daha önce uğradığınız yerleri bulun." label="Yerler" name="sidebar_places" tab_title="Yerler">
-		<panel label="Yerler" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Envanterinize göz atın." name="sidebar_inventory" tab_title="Envanterim">
-		<panel label="Envanteri Düzenle" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Görünümünüzü değiştirin." name="sidebar_appearance" tab_title="Görünümüm">
-		<panel label="Görünümü Düzenle" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml
index b9c39ef8cb..b9c39ef8cb 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/tr/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
index e3b22c639a..e3b22c639a 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
index 87d7677d73..87d7677d73 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_local.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
index fd2e85fce5..fd2e85fce5 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_options.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
index e999678a0d..e999678a0d 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_postcard.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
index 334fd52a48..334fd52a48 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_profile.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
index 982ef2ea3b..982ef2ea3b 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/tr/panel_sound_devices.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml
index 91d07a3b0c..91d07a3b0c 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/tr/panel_stand_stop_flying.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_status_bar.xml b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
index 178cbda4a2..178cbda4a2 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/tr/panel_status_bar.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml
index f5b1175029..f5b1175029 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/tr/panel_teleport_history.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml
index a3a5c70c7e..a3a5c70c7e 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
new file mode 100644
index 0000000000..2ce7c9c11f
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Doku" name="Texture">
+	<panel.string name="string repeats per meter">
+		Metrede Kaç Kez Tekrarlandığı
+	</panel.string>
+	<panel.string name="string repeats per face">
+		Bir Yüzde Kaç Kez Tekrarlandığı
+	</panel.string>
+	<text name="color label">
+		Renk
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="Renk seçiciyi açmak için tıklayın"/>
+	<text name="color trans">
+		Saydamlık %
+	</text>
+	<text name="glow label">
+		Parıltı
+	</text>
+	<check_box label="Tam Parlak" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="Malzemeler" name="Materials"/>
+		<combo_box.item label="Ortam" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="Doku (yayılmış)" name="Texture (diffuse)"/>
+		<combo_box.item label="Yumruluk (normal)" name="Bumpiness (normal)"/>
+		<combo_box.item label="Parıldama (yansıtan)" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="Doku" name="texture control" tool_tip="Bir resim seçmek için tıklayın"/>
+	<text name="label alphamode">
+		Alfa modu
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="Hiçbiri" name="None"/>
+		<combo_box.item label="Alfa karıştırma" name="Alpha blending"/>
+		<combo_box.item label="Alfa maskeleme" name="Alpha masking"/>
+		<combo_box.item label="Yayımlatıcı maske" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		Maske kesimi
+	</text>
+	<texture_picker label="Doku" name="bumpytexture control" tool_tip="Bir resim seçmek için tıklayın"/>
+	<text name="label bumpiness">
+		Yumruluk
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="Yok" name="None"/>
+		<combo_box.item label="Parlaklık" name="Brightness"/>
+		<combo_box.item label="Koyuluk" name="Darkness"/>
+		<combo_box.item label="damarlı ahşap" name="woodgrain"/>
+		<combo_box.item label="ağaç kabuğu" name="bark"/>
+		<combo_box.item label="tuğlalar" name="bricks"/>
+		<combo_box.item label="dama tahtası" name="checker"/>
+		<combo_box.item label="beton" name="concrete"/>
+		<combo_box.item label="sert çini" name="crustytile"/>
+		<combo_box.item label="kesilmiş taş" name="cutstone"/>
+		<combo_box.item label="diskler" name="discs"/>
+		<combo_box.item label="çakıl" name="gravel"/>
+		<combo_box.item label="petri kabı" name="petridish"/>
+		<combo_box.item label="dış kaplama" name="siding"/>
+		<combo_box.item label="taş çini" name="stonetile"/>
+		<combo_box.item label="stükko" name="stucco"/>
+		<combo_box.item label="vakum" name="suction"/>
+		<combo_box.item label="örgü" name="weave"/>
+	</combo_box>
+	<texture_picker label="Doku" name="shinytexture control" tool_tip="Bir resim seçmek için tıklayın"/>
+	<text name="label shininess">
+		Parıldama
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="Yok" name="None"/>
+		<combo_box.item label="Düşük" name="Low"/>
+		<combo_box.item label="Orta" name="Medium"/>
+		<combo_box.item label="Yüksek" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		Pürüzsüzlük
+	</text>
+	<text name="label environment">
+		Ortam
+	</text>
+	<text name="label shinycolor">
+		Renk
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="Renk seçiciyi açmak için tıklayın"/>
+	<text name="media_info">
+		Varsa, seçilen ortamın URL&apos;si burada yer alır
+	</text>
+	<button label="Seç..." name="add_media" tool_tip="Ortam Ekle"/>
+	<button label="Kaldır" name="delete_media" tool_tip="Bu ortam dokusunu sil"/>
+	<button label="Hizala" label_selected="Ortamı Hizala" name="button align" tool_tip="Ortam dokusunu hizala (önce yüklenmelidir)"/>
+	<text name="tex gen">
+		Eşleştirme
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="Varsayılan" name="Default"/>
+		<combo_box.item label="Planar" name="Planar"/>
+	</combo_box>
+	<spinner label="Yatay ölçek" name="TexScaleU"/>
+	<spinner label="Dikey ölçek" name="TexScaleV"/>
+	<spinner label="Metrede kaç kez tekrarlandığı" name="rptctrl"/>
+	<spinner label="Dönüş derecesi" name="TexRot"/>
+	<spinner label="Yatay ofset" name="TexOffsetU"/>
+	<spinner label="Dikey ofset" name="TexOffsetV"/>
+	<spinner label="Yatay ölçek" name="bumpyScaleU"/>
+	<spinner label="Dikey ölçek" name="bumpyScaleV"/>
+	<spinner label="Dönüş derecesi" name="bumpyRot"/>
+	<spinner label="Yatay ofset" name="bumpyOffsetU"/>
+	<spinner label="Dikey ofset" name="bumpyOffsetV"/>
+	<spinner label="Yatay ölçek" name="shinyScaleU"/>
+	<spinner label="Dikey ölçek" name="shinyScaleV"/>
+	<spinner label="Dönüş derecesi" name="shinyRot"/>
+	<spinner label="Yatay ofset" name="shinyOffsetU"/>
+	<spinner label="Dikey ofset" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="Planar yüzleri hizala" name="checkbox planar align" tool_tip="Tüm seçili yüzeylerdeki dokuları son seçili yüzdekiyle hizalar. Planar doku eşleştirmesi gerektirir."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
index b46833d7e6..b46833d7e6 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..0c8c7b68b5
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater">
+	<slider label="Ana" name="System Volume"/>
+	<slider label="Düğmeler" name="UI Volume"/>
+	<slider label="Ortam" name="Wind Volume"/>
+	<slider label="Sesler" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="Mimiklerdeki sesleri etkinleştir"/>
+	<slider label="Müzik" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="Müzik Akışını Etkinleştir"/>
+	<slider label="Ortam" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="Akış Ortamını Etkinleştir"/>
+	<slider label="Ses" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="Sesli Sohbeti Etkinleştir"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_world_map.xml b/indra/newview/skins/default/xui/tr/panel_world_map.xml
index 5595c13a7c..5595c13a7c 100644..100755
--- a/indra/newview/skins/default/xui/tr/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/tr/panel_world_map.xml
diff --git a/indra/newview/skins/default/xui/tr/role_actions.xml b/indra/newview/skins/default/xui/tr/role_actions.xml
index 655ac64172..76ca58c319 100644..100755
--- a/indra/newview/skins/default/xui/tr/role_actions.xml
+++ b/indra/newview/skins/default/xui/tr/role_actions.xml
@@ -25,7 +25,7 @@
 	</action_set>
 	<action_set description="Bu yetenekler arasında parsel adını ve yayınlama ayarlarını, Bul dizinindeki görünürlük ile iniş noktası ve TP yönlendirme seçeneklerini değiştirme imkanları yer alır." name="Parcel Identity">
 		<action description="&apos;Konumu Arama Sonuçlarında Göster&apos; seçeneğini Aç/Kapa ve kategoriyi ayarla" longdescription="Arazi Hakkında &gt; Seçenekler sekmesinden &apos;Konumu Arama Sonuçlarında Göster&apos; seçeneğini Açın/Kapayın ve parsel kategorisini ayarlayın." name="land find places" value="17"/>
-		<action description="Parsel adını, açıklamasını ve &quot;Konumu Arama Sonuçlarında Göster&quot; ayarlarını değiştir" longdescription="Parsel adını, açıklamasını ve &quot;Konumu Arama Sonuçlarında Göster&quot; ayarlarını değiştirin. Bu işlem Arazi Hakkında &gt; Seçenekler sekmesinde yapılır." name="land change identity" value="18"/>
+		<action description="Parsel adını, açıklamasını ve &quot;Orta Seviyede İçerik&quot; ayarlarını değiştir" longdescription="Parsel adını, açıklamasını ve &quot;Orta Seviyede İçerik&quot; ayarlarını değiştir. Bu işlem Arazi Hakkında &gt; Seçenekler sekmesinde yapılır." name="land change identity" value="18"/>
 		<action description="İniş noktasını ve ışınlama yönlendirmesini ayarlayın" longdescription="Bir grubun sahip olduğu parsel üzerinde, bu Yeteneğe sahip olan bir Roldeki Üyeler gelen ışınlanmaların varacağı iniş noktasını ve daha fazla kontrol için ışınlama yönlendirmesini ayarlayabilirler. Bu işlem Arazi Hakkında &gt; Seçenekler sekmesinde yapılır." name="land set landing point" value="19"/>
 	</action_set>
 	<action_set description="Bu Yeteneklere &apos;Nesneleri Oluştur&apos;, &apos;Yüzeyi Düzenle&apos;, müzik ve ortam ayarları gibi parsel seçeneklerini etkileyen güçler de dahildir." name="Parcel Settings">
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
index b632f21cf5..b632f21cf5 100644..100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
index 938b5a76d8..938b5a76d8 100644..100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_inventory.xml
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
index 81291a431c..86b684c497 100644..100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(bilinmiyor)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(bilinmiyor veya birden çok değer)
+	</panel.string>
 	<panel.string name="public">
 		(kamuya açık)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index 2fa6281f05..9a4cf54fa7 100644..100755
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Bu nesneleri değiştiremezsiniz
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz
+	</panel.string>
 	<panel.string name="text modify warning">
 		Bu nesne bağlantılı parçalara sahip
 	</panel.string>
@@ -66,6 +72,7 @@
 			<combo_box.item label="Nesneyi satın al" name="Buyobject"/>
 			<combo_box.item label="Nesneye ödeme yap" name="Payobject"/>
 			<combo_box.item label="Aç" name="Open"/>
+			<combo_box.item label="Yakınlaştır" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -95,6 +102,9 @@
 		</combo_box>
 		<spinner label="Fiyat: L$" name="Edit Cost"/>
 		<check_box label="Aramada göster" name="search_check" tool_tip="Kişiler arama sonuçlarında bu nesneyi görebilsin"/>
+		<text name="pathfinding_attributes_label">
+			Yol bulma özellikleri:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 2a4e2c20a7..c4b1530b2b 100644..100755
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,10 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
@@ -448,6 +451,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="SLappAgentRequestFriend">
 		Arkadaşlık Talebi
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		Arkadaşların Çıkarılması
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		Kapat (⌘W)
 	</string>
@@ -619,8 +625,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AvatarAway">
 		Uzakta
 	</string>
-	<string name="AvatarBusy">
-		Meşgul
+	<string name="AvatarDoNotDisturb">
+		Rahatsız Etme
 	</string>
 	<string name="AvatarMuted">
 		Engellenmiş
@@ -835,6 +841,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="multiple_textures">
 		Birden Çok
 	</string>
+	<string name="use_texture">
+		Dokuyu kullan
+	</string>
 	<string name="texture_loading">
 		Yükleniyor...
 	</string>
@@ -856,6 +865,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ST_NO_JOINT">
 		KÖK veya EKLEM bulunamıyor.
 	</string>
+	<string name="NearbyChatTitle">
+		Yakındaki sohbet
+	</string>
+	<string name="NearbyChatLabel">
+		(Yakındaki sohbet)
+	</string>
 	<string name="whisper">
 		fısıldar:
 	</string>
@@ -883,6 +898,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OWNERNAME]&apos; adlı kişiye ait, [REGIONPOS] üzerinde [REGIONNAME] içerisinde bulunan &apos;[OBJECTNAME]&apos; nesnesine şunu yapma izni verilmedi: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Eğer hesabınıza erişime izin verirseniz, bu nesneye aynı zamanda şunun için izin vermiş olacaksınız:
+	</string>
 	<string name="ScriptTakeMoney">
 		Sizden Linden dolar (L$) almak
 	</string>
@@ -919,6 +937,27 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="NotConnected">
 		Bağlı Değil
 	</string>
+	<string name="AgentNameSubst">
+		(Siz)
+	</string>
+	<string name="TeleportYourAgent">
+		Sizi ışınlama
+	</string>
+	<string name="JoinAnExperience">
+		Bir tecrübeye katıl
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		Gayri menkul erişim listelerini yönetirken uyarıları bastır
+	</string>
+	<string name="OverrideYourAnimations">
+		Varsayılan animasyonlarınızı değiştirin
+	</string>
+	<string name="ScriptReturnObjects">
+		Kendi adınıza nesneler iade edin
+	</string>
+	<string name="UnknownScriptPermission">
+		(bilinmiyor)!
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -997,17 +1036,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="script_files">
 		Komut Dosyaları
 	</string>
-	<string name="AvatarSetNotAway">
-		Uzakta Değil
-	</string>
-	<string name="AvatarSetAway">
-		Uzakta
-	</string>
-	<string name="AvatarSetNotBusy">
-		Meşgul Değil
-	</string>
-	<string name="AvatarSetBusy">
-		Meşgul
+	<string name="dictionary_files">
+		Sözlükler
 	</string>
 	<string name="shape">
 		Şekil
@@ -1241,7 +1271,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
 	</string>
 	<string name="MarketplaceURL_CreateStore">
-		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.3
 	</string>
 	<string name="MarketplaceURL_Dashboard">
 		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
@@ -1402,6 +1432,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="InvFolder favorite">
 		Favorilerim
 	</string>
+	<string name="InvFolder Favorites">
+		Sık Kullanılanlarım
+	</string>
+	<string name="InvFolder favorites">
+		Sık Kullanılanlarım
+	</string>
 	<string name="InvFolder Current Outfit">
 		Mevcut Dış Görünüm
 	</string>
@@ -1417,6 +1453,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="InvFolder Meshes">
 		Örgüler
 	</string>
+	<string name="InvFolder Received Items">
+		Alınan Öğeler
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Satıcı Giden Kutusu
+	</string>
 	<string name="InvFolder Friends">
 		Arkadaşlar
 	</string>
@@ -1947,6 +1989,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
 		BÜG Sağ Alt
 	</string>
+	<string name="ATTACH_NECK">
+		Boyun
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		Avatar Merkezi
+	</string>
 	<string name="CursorPos">
 		Satır [LINE], Sütun [COLUMN]
 	</string>
@@ -1965,8 +2013,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="PanelContentsNewScript">
 		Yeni Komut Dosyası
 	</string>
-	<string name="BusyModeResponseDefault">
-		İleti gönderdiğiniz Sakin &apos;meşgul modu&apos;nda, bu da rahatsız edilmek istemediği anlamına geliyor.  İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir.
+	<string name="DoNotDisturbModeResponseDefault">
+		Bu sakin &quot;Rahatsız Etme&quot; seçeneğini devreye almış, mesajınızı sonra görecek.
 	</string>
 	<string name="MuteByName">
 		(Adına göre)
@@ -2079,9 +2127,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
-	<string name="ViewerObjectContents">
-		İçerik
-	</string>
 	<string name="AcquiredItems">
 		Alınan Öğeler
 	</string>
@@ -2979,6 +3024,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="Hip Width">
 		Kalça Genişliği
 	</string>
+	<string name="Hover">
+		Üzerine getir
+	</string>
 	<string name="In">
 		İçeri
 	</string>
@@ -3853,7 +3901,13 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Genel Bölge
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor
+		Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Bu bölgede dinamik yol bulma etkin değil.
 	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Güncelleştirme
@@ -3924,6 +3978,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="IM_unblock_only_groups_friends">
 		Bu mesajı görmek için Tercihler/Gizlilik&apos;de &apos;Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin&apos; seçeneğinin işaretini kaldırmalısınız.
 	</string>
+	<string name="OnlineStatus">
+		Çevrimiçi
+	</string>
+	<string name="OfflineStatus">
+		Çevrimdışı
+	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
@@ -3933,6 +3993,9 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="you_joined_call">
 		Sesli aramaya katıldınız
 	</string>
+	<string name="you_auto_rejected_call-im">
+		&quot;Rahatsız Etme&quot; seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz.
+	</string>
 	<string name="name_started_call">
 		[NAME] bir sesli arama başlattı
 	</string>
@@ -3949,7 +4012,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Bağlanıyor...
 	</string>
 	<string name="conference-title">
-		Özel Konferans
+		Çok kişili sohbet
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] ile konferans
@@ -4839,6 +4902,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Label">
 		Sohbet
 	</string>
+	<string name="Command_Conversations_Label">
+		Sohbetler
+	</string>
 	<string name="Command_Compass_Label">
 		Pusula
 	</string>
@@ -4914,6 +4980,9 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Tooltip">
 		Metin kullanarak yakındaki kişilerle sohbet etmek
 	</string>
+	<string name="Command_Conversations_Tooltip">
+		Herkesle sohbet et
+	</string>
 	<string name="Command_Compass_Tooltip">
 		Pusula
 	</string>
@@ -5007,6 +5076,21 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Hiçbiri
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Navigasyon örgüsünü etkiler
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Karakter
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Birden çok)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Çok Düşük
 	</string>
@@ -5022,4 +5106,22 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="snapshot_quality_very_high">
 		Çok Yüksek
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Sakin bu bölgeyi ziyaret edemez.
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
+	</string>
+	<string name="loading_chat_logs">
+		Yükleniyor...
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index 62aaaf671f..20d09b1ee2 100644..100755
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -45,6 +45,9 @@ Bir dakika sonra tekrar deneyin.
 		<message name="no_inventory_host">
 			Envanter sistemi şu anda kullanılamıyor.
 		</message>
+		<message name="MustGetAgeRegion">
+			Bu bölgeye girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@ Bir dakika sonra tekrar deneyin.
 		<message name="requesting">
 			Işınlanma talep ediliyor...
 		</message>
+		<message name="pending">
+			Işınlama Bekliyor...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/zh/floater_aaa.xml b/indra/newview/skins/default/xui/zh/floater_aaa.xml
index 0d110c0456..e2d6a2b004 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_aaa.xml
+++ b/indra/newview/skins/default/xui/zh/floater_aaa.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Test Floater" title="測試浮動視窗">
 	<string name="test_the_vlt">
-		This string CHANGE2 is extracted.
+		字串 CHANGE2 已抽取。
 	</string>
 	<string name="testing_eli">
 		這只是測試 - 變更。
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 7e19c124a1..2dfb35fa54 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -5,10 +5,12 @@
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
 	<floater.string name="AboutCompiler">
-		Built with [COMPILER] version [COMPILER_VERSION]
+		以 [COMPILER_VERSION] 版本 [COMPILER] 建置
 	</floater.string>
 	<floater.string name="AboutPosition">
-		You are at [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		你的方位是 [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地區名：[REGION]，主機：&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+第二人生 URL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
+（全域坐標：[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]）
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
@@ -20,10 +22,10 @@
 顯示卡：[GRAPHICS_CARD]
 	</floater.string>
 	<floater.string name="AboutDriver">
-		Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]
+		Windows 顯示驅動程式版本：[GRAPHICS_DRIVER_VERSION]
 	</floater.string>
 	<floater.string name="AboutLibs">
-		OpenGL Version: [OPENGL_VERSION]
+		OpenGL 版本：[OPENGL_VERSION]
 
 libcurl 版本： [LIBCURL_VERSION]
 J2C 解碼器版本： [J2C_VERSION]
@@ -37,47 +39,60 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION]
 	<floater.string name="AboutTraffic">
 		封包損失：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
 	</floater.string>
+	<floater.string name="ErrorFetchingServerReleaseNotesURL">
+		擷取伺服器版本說明 URL 時出錯。
+	</floater.string>
 	<tab_container name="about_tab">
 		<panel label="資訊" name="support_panel">
 			<button label="覆製到剪貼簿" name="copy_btn"/>
 		</panel>
-		<panel label="Credits" name="credits_panel">
-			<text_editor name="credits_editor">
-				Second Life is brought to you by ..., and many others.
-
-Thank you to the following Residents for helping to ensure that this is the best version yet: ..., and many others.
-
-
-
-
-&quot;The work goes on, the cause endures, the hope still lives, and the dreams shall never die&quot; - Edward Kennedy
+		<panel label="貸記" name="credits_panel">
+			<text name="linden_intro">
+				「第二人生」由以下的 Linden 家族帶給你：
+			</text>
+			<text name="contrib_intro">
+				這些人士做了開放源碼的貢獻：
+			</text>
+			<text_editor name="contrib_names">
+				執行時期被取代的假名稱
+			</text_editor>
+			<text name="trans_intro">
+				以下人士提供翻譯：
+			</text>
+			<text_editor name="trans_names">
+				執行時期被取代的假名稱
 			</text_editor>
 		</panel>
-		<panel label="Licenses" name="licenses_panel">
+		<panel label="許可" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-GL Copyright (C) 1999-2004 Brian Paul.
-google-perftools Copyright (c) 2005, Google Inc.
-Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-Pth Copyright (C) 1999-2006 Ralf S. Engelschall &lt;rse@gnu.org&gt;
-SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-google-perftools Copyright (c) 2005, Google Inc.
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
+        DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+        expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
+        GL Copyright (C) 1999-2004 Brian Paul.
+        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+        google-perftools Copyright (c) 2005, Google Inc.
+        Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+        jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+        jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
+        SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+        SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
+
+        第二人生 Viewer 採用 Havok (TM) 物理引擎。 (c)Copyright 1999-2010 Havok.com Inc.（及其放照人）。 保留一切權利。 詳情見 www.havok.com。
+
+        本軟體含有 NVIDIA Corporation 提供的源程式碼。
 
-All rights reserved.  See licenses.txt for details.
+        保留一切權利。  詳情見 licenses.txt。
 
-語音聊天音頻編碼：Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+        語音聊天音頻技術：Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 			</text_editor>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index 2568d492f0..76db621951 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="關於土地">
+<floater name="floaterland" title="土地資料">
 	<floater.string name="maturity_icon_general">
 		&quot;Parcel_PG_Dark&quot;
 	</floater.string>
@@ -10,39 +10,39 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] minutes
+		[MINUTES] 分鐘
 	</floater.string>
 	<floater.string name="Minute">
-		minute
+		分鐘
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] seconds
+		[SECONDS] 秒
 	</floater.string>
 	<floater.string name="Remaining">
-		remaining
+		剩餘時間
 	</floater.string>
 	<tab_container name="landtab">
 		<panel label="一般" name="land_general_panel">
 			<panel.string name="new users only">
-				New Residents only
+				僅限新居民
 			</panel.string>
 			<panel.string name="anyone">
-				Anyone
+				任何人
 			</panel.string>
 			<panel.string name="area_text">
 				區域
 			</panel.string>
 			<panel.string name="area_size_text">
-				[AREA] m²
+				[AREA] 平方公尺
 			</panel.string>
 			<panel.string name="auction_id_text">
-				Auction ID: [ID]
+				拍賣 ID：[ID]
 			</panel.string>
 			<panel.string name="need_tier_to_modify">
-				You must approve your purchase to modify this land.
+				你必須批准購買才能修改這塊土地。
 			</panel.string>
 			<panel.string name="group_owned_text">
-				（群組所擁有）
+				（由群組所擁有）
 			</panel.string>
 			<panel.string name="profile_text">
 				檔案
@@ -57,10 +57,10 @@
 				（無）
 			</panel.string>
 			<panel.string name="sale_pending_text">
-				(Sale Pending)
+				（擱置銷售）
 			</panel.string>
 			<panel.string name="no_selection_text">
-				No parcel selected.
+				未選擇地段。
 			</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]
@@ -75,7 +75,7 @@
 				類型：
 			</text>
 			<text name="LandTypeText">
-				Mainland / Homestead
+				大陸 / 家園
 			</text>
 			<text name="ContentRating">
 				分級：
@@ -84,37 +84,37 @@
 				完全成人
 			</text>
 			<text name="Owner:">
-				擁有者：
+				所有人：
 			</text>
 			<text name="Group:">
 				群組：
 			</text>
 			<button label="設定" name="Set..."/>
-			<check_box label="允許讓渡給群組" name="check deed" tool_tip="A group officer can deed this land to the group, so it will be supported by the group&apos;s land allocation."/>
-			<button label="讓渡" name="Deed..." tool_tip="You may only deed land if you are an officer in the selected group."/>
-			<check_box label="Owner Makes Contribution With Deed" name="check contrib" tool_tip="When the land is deeded to the group, the former owner contributes enough land allocation to support it."/>
+			<check_box label="允許讓渡給群組" name="check deed" tool_tip="群組工作人員可將這土地讓渡給群組，使其得到群組土地配置的支援。"/>
+			<button label="讓渡" name="Deed..." tool_tip="你必須是所選群組的工作人員才能讓渡土地。"/>
+			<check_box label="所有人透過讓渡動作進行捐獻" name="check contrib" tool_tip="將土地讓渡給群組，表示上一個所有人會捐獻足夠土地來支持讓渡。"/>
 			<text name="For Sale:">
-				出售：
+				出售中：
 			</text>
 			<text name="Not for sale.">
 				不出售
 			</text>
 			<text name="For Sale: Price L$[PRICE].">
-				Price: L$[PRICE] (L$[PRICE_PER_SQM]/m²)
+				價格：L$[PRICE] （L$[PRICE_PER_SQM]/平方公尺）
 			</text>
 			<button label="出售土地" name="Sell Land..."/>
 			<text name="For sale to">
 				出售給：[BUYER]
 			</text>
 			<text name="Sell with landowners objects in parcel.">
-				Objects included in sale
+				物件連帶一起出售
 			</text>
 			<text name="Selling with no objects in parcel.">
-				Objects not included in sale
+				此次出售不含物件
 			</text>
-			<button label="Cancel Land Sale" label_selected="Cancel Land Sale" name="Cancel Land Sale"/>
+			<button label="取消土地出售" label_selected="取消土地出售" name="Cancel Land Sale"/>
 			<text name="Claimed:">
-				Claimed:
+				已收取：
 			</text>
 			<text name="DateClaimText">
 				Tue Aug 15 13:47:25 2006
@@ -123,52 +123,52 @@
 				面積：
 			</text>
 			<text name="PriceText">
-				4048 m²
+				4048 平方公尺
 			</text>
 			<text name="Traffic:">
 				流量：
 			</text>
 			<text name="DwellText">
-				0
+				載入中...
 			</text>
 			<button label="購買土地" name="Buy Land..."/>
+			<button label="Linden 出售" name="Linden Sale..." tool_tip="土地必須有人擁有、已設有內容，並且不在拍賣中。"/>
 			<button label="腳本資訊" name="Scripts..."/>
 			<button label="為群組購買" name="Buy For Group..."/>
 			<button label="購買通行權" name="Buy Pass..." tool_tip="通行權允許你暫時可出入這塊土地。"/>
 			<button label="放棄土地" name="Abandon Land..."/>
-			<button label="Reclaim Land" name="Reclaim Land..."/>
-			<button label="Linden Sale" name="Linden Sale..." tool_tip="Land must be owned, set content, and not already for auction."/>
+			<button label="收回土地" name="Reclaim Land..."/>
 		</panel>
 		<panel label="契約" name="land_covenant_panel">
 			<panel.string name="can_resell">
-				Purchased land in this region may be resold.
+				購買這地區的土地允許轉售。
 			</panel.string>
 			<panel.string name="can_not_resell">
-				Purchased land in this region may not be resold.
+				購買這地區的土地不允許轉售。
 			</panel.string>
 			<panel.string name="can_change">
-				Purchased land in this region may be joined or subdivided.
+				購買這地區的土地允許進行合併或分割。
 			</panel.string>
 			<panel.string name="can_not_change">
-				Purchased land in this region may not be joined or subdivided.
+				購買這地區的土地不允許進行合併或分割。
 			</panel.string>
 			<text name="estate_section_lbl">
 				領地：
 			</text>
 			<text name="estate_name_text">
-				mainland
+				大陸
 			</text>
 			<text name="estate_owner_lbl">
-				擁有者：
+				所有人：
 			</text>
 			<text name="estate_owner_text">
 				（無）
 			</text>
 			<text_editor name="covenant_editor">
-				There is no Covenant provided for this Estate.
+				此領地沒有任何契約要求。
 			</text_editor>
 			<text name="covenant_timestamp_text">
-				Last Modified Wed Dec 31 16:00:00 1969
+				上次修改於 Wed Dec 31 16:00:00 1969
 			</text>
 			<text name="region_section_lbl">
 				地區：
@@ -180,7 +180,7 @@
 				類型：
 			</text>
 			<text name="region_landtype_text">
-				Mainland / Homestead
+				大陸 / 家園
 			</text>
 			<text name="region_maturity_lbl">
 				分級：
@@ -189,54 +189,54 @@
 				完全成人
 			</text>
 			<text name="resellable_lbl">
-				Resale:
+				轉售：
 			</text>
 			<text name="resellable_clause">
-				Land in this region may not be resold.
+				這地區的土地不能轉售。
 			</text>
 			<text name="changeable_lbl">
-				Subdivide:
+				分割：
 			</text>
 			<text name="changeable_clause">
-				Land in this region may not be joined/subdivided.
+				這地區的土地不能合併或分割。
 			</text>
 		</panel>
 		<panel label="物件" name="land_objects_panel">
 			<panel.string name="objects_available_text">
-				[COUNT] out of [MAX] ([AVAILABLE] available)
+				使用　[MAX]　中的 [COUNT] （剩餘 [AVAILABLE] 可用）
 			</panel.string>
 			<panel.string name="objects_deleted_text">
-				[COUNT] out of [MAX] ([DELETED] will be deleted)
+				目前 [COUNT]，最多允許 [MAX] （[DELETED] 將被刪除）
 			</panel.string>
 			<text name="parcel_object_bonus">
-				Region Object Bonus Factor: [BONUS]
+				地區物件負荷倍數：[BONUS]
 			</text>
 			<text name="Simulator primitive usage:">
-				幾何元件使用：
+				地區容納量：
 			</text>
 			<text name="objects_available">
 				使用　[MAX]　中的 [COUNT] （剩餘 [AVAILABLE] 可用）
 			</text>
 			<text name="Primitives parcel supports:">
-				地段所提供的幾何元件數：
+				地段土地容納量：
 			</text>
 			<text name="object_contrib_text">
 				[COUNT]
 			</text>
 			<text name="Primitives on parcel:">
-				地段上的幾何元件數：
+				地段土地衝擊量：
 			</text>
 			<text name="total_objects_text">
 				[COUNT]
 			</text>
 			<text name="Owned by parcel owner:">
-				地段擁有者所擁有：
+				地段所有人所擁有：
 			</text>
 			<text name="owner_objects_text">
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowOwner"/>
-			<button label="退回" name="ReturnOwner..." tool_tip="退回物件給它們的擁有者。"/>
+			<button label="退回" name="ReturnOwner..." tool_tip="退回物件給它們的所有人。"/>
 			<text name="Set to group:">
 				設定群組：
 			</text>
@@ -244,7 +244,7 @@
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowGroup"/>
-			<button label="退回" name="ReturnGroup..." tool_tip="退回物件給它們的擁有者。"/>
+			<button label="退回" name="ReturnGroup..." tool_tip="退回物件給它們的所有人。"/>
 			<text name="Owned by others:">
 				其他人所擁有：
 			</text>
@@ -252,26 +252,26 @@
 				[COUNT]
 			</text>
 			<button label="顯示" label_selected="顯示" name="ShowOther"/>
-			<button label="退回" name="ReturnOther..." tool_tip="退回物件給它們的擁有者。"/>
+			<button label="退回" name="ReturnOther..." tool_tip="退回物件給它們的所有人。"/>
 			<text name="Selected / sat upon:">
-				Selected / sat upon:
+				已選 / 坐在上面：
 			</text>
 			<text name="selected_objects_text">
 				[COUNT]
 			</text>
 			<text name="Autoreturn">
-				Auto return other Residents&apos; objects (minutes, 0 for off):
+				自動送返其他居民的物件（分鐘，設為 0 可取消自動）：
 			</text>
 			<text name="Object Owners:">
-				物件擁有者：
+				物件所有人：
 			</text>
 			<button name="Refresh List" tool_tip="刷新物件清單"/>
 			<button label="退回物件" name="Return objects..."/>
 			<name_list name="owner list">
-				<name_list.columns label="Type" name="type"/>
+				<name_list.columns label="類型" name="type"/>
 				<name_list.columns label="名稱" name="name"/>
-				<name_list.columns label="Count" name="count"/>
-				<name_list.columns label="Most Recent" name="mostrecent"/>
+				<name_list.columns label="計數" name="count"/>
+				<name_list.columns label="最近" name="mostrecent"/>
 			</name_list>
 		</panel>
 		<panel label="選項" name="land_options_panel">
@@ -279,8 +279,8 @@
 				讓其他人可以在搜尋結果中看到這塊地段
 			</panel.string>
 			<panel.string name="search_disabled_small_tooltip">
-				This option is disabled because this parcel&apos;s area is 128 m² or smaller.
-Only large parcels can be listed in search.
+				這個選項已停用，因為這個地段面積小於 128 平方公尺。
+大面積地段才可列入搜尋結果。
 			</panel.string>
 			<panel.string name="search_disabled_permissions_tooltip">
 				這個選項已關閉因為你不能修改這個地段的選項。
@@ -292,10 +292,10 @@ Only large parcels can be listed in search.
 				完全成人內容
 			</panel.string>
 			<panel.string name="mature_check_mature_tooltip">
-				Your parcel information or content is considered moderate.
+				你的地段資訊或內容被視為適度成人分級。
 			</panel.string>
 			<panel.string name="mature_check_adult_tooltip">
-				Your parcel information or content is considered adult.
+				你的地段資訊或內容被視為完全成人分級。
 			</panel.string>
 			<panel.string name="landing_point_none">
 				（無）
@@ -309,8 +309,10 @@ Only large parcels can be listed in search.
 			<text name="allow_label">
 				允許其他居民去：
 			</text>
-			<check_box label="編輯地形" name="edit land check" tool_tip="若勾選則任何人將可以變形你的土地，最好是保持未勾選，因為你隨時可以編輯變更你的土地。"/>
-			<check_box label="飛行" name="check fly" tool_tip="逤勾選則居民可以在你飛行，不然就只能由外面飛入或飛越你的土地。"/>
+			<text name="allow_label0">
+				飛行：
+			</text>
+			<check_box label="任何人" name="check fly" tool_tip="如果勾選，居民可在你土地上飛行。 如果不勾選，居民僅可飛越你土地。"/>
 			<text name="allow_label2">
 				建造：
 			</text>
@@ -326,67 +328,68 @@ Only large parcels can be listed in search.
 			</text>
 			<check_box label="任何人" name="check other scripts"/>
 			<check_box label="群組" name="check group scripts"/>
-			<text name="land_options_label">
-				土地選項：
-			</text>
-			<check_box label="安全（無傷害）" name="check safe" tool_tip="若勾選則設應土地為安全的，傷害性的戰鬥將被關閉。清除勾選後才能進行傷害性的戰鬥。"/>
-			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="防止使用腳本推撞。勾選這個選項將可以有效防止你土地上的破壞行為。"/>
+			<check_box label="安全（無傷害）" name="check safe" tool_tip="若勾選，將把土地設為安全，禁絕傷害性的戰鬥。 若未勾選，則允許傷害性的戰鬥。"/>
+			<check_box label="禁止推撞" name="PushRestrictCheck" tool_tip="禁止使用腳本推撞。 勾選這選項可有效防止你土地上出現滋事行為。"/>
 			<check_box label="將地點刊登顯示在搜尋中（L$30 / 每週）" name="ShowDirectoryCheck" tool_tip="讓其他人可以在搜尋結果中看到這塊地段"/>
 			<combo_box name="land category with adult">
 				<combo_box.item label="任何類別" name="item0"/>
-				<combo_box.item label="Linden Location" name="item1"/>
+				<combo_box.item label="林登位置" name="item1"/>
 				<combo_box.item label="完全成人" name="item2"/>
 				<combo_box.item label="藝術與文化" name="item3"/>
 				<combo_box.item label="商業" name="item4"/>
 				<combo_box.item label="教育" name="item5"/>
 				<combo_box.item label="遊戲" name="item6"/>
 				<combo_box.item label="聚會所" name="item7"/>
-				<combo_box.item label="新手友善" name="item8"/>
-				<combo_box.item label="公園與自然" name="item9"/>
+				<combo_box.item label="歡迎新手光臨" name="item8"/>
+				<combo_box.item label="公園與自然景觀" name="item9"/>
 				<combo_box.item label="住宅" name="item10"/>
-				<combo_box.item label="採購" name="item11"/>
-				<combo_box.item label="Rental" name="item13"/>
-				<combo_box.item label="Other" name="item12"/>
+				<combo_box.item label="購物" name="item11"/>
+				<combo_box.item label="出租" name="item13"/>
+				<combo_box.item label="其他" name="item12"/>
 			</combo_box>
 			<combo_box name="land category">
 				<combo_box.item label="任何類別" name="item0"/>
-				<combo_box.item label="Linden Location" name="item1"/>
+				<combo_box.item label="林登位置" name="item1"/>
 				<combo_box.item label="藝術與文化" name="item3"/>
 				<combo_box.item label="商業" name="item4"/>
 				<combo_box.item label="教育" name="item5"/>
 				<combo_box.item label="遊戲" name="item6"/>
 				<combo_box.item label="聚會所" name="item7"/>
-				<combo_box.item label="新手友善" name="item8"/>
-				<combo_box.item label="公園與自然" name="item9"/>
+				<combo_box.item label="歡迎新手光臨" name="item8"/>
+				<combo_box.item label="公園與自然景觀" name="item9"/>
 				<combo_box.item label="住宅" name="item10"/>
-				<combo_box.item label="採購" name="item11"/>
-				<combo_box.item label="Rental" name="item13"/>
-				<combo_box.item label="Other" name="item12"/>
+				<combo_box.item label="購物" name="item11"/>
+				<combo_box.item label="出租" name="item13"/>
+				<combo_box.item label="其他" name="item12"/>
 			</combo_box>
 			<check_box label="適度成人內容" name="MatureCheck" tool_tip=" "/>
 			<text name="Snapshot:">
 				快照：
 			</text>
-			<texture_picker name="snapshot_ctrl" tool_tip="點擊以挑選圖像"/>
+			<texture_picker name="snapshot_ctrl" tool_tip="點按以挑選圖片"/>
+			<text name="allow_label5">
+				其他地段的化身可以看見本地段裡的化身，並與之交談
+			</text>
+			<check_box label="察看化身" name="SeeAvatarsCheck" tool_tip="允許其他地段的化身看到本地段包括你在內的化身，並可互相交談。"/>
 			<text name="landing_point">
 				登陸點：[LANDING]
 			</text>
-			<button label="設定" label_selected="設定" name="Set" tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."/>
+			<button label="設定" label_selected="設定" name="Set" tool_tip="設定訪客登陸地點。 設定你的化身在此地段內的位置。"/>
 			<button label="清除" label_selected="清除" name="Clear" tool_tip="清除登陸點"/>
 			<text name="Teleport Routing: ">
 				瞬間傳送路徑：
 			</text>
-			<combo_box name="landing type" tool_tip="Teleport Routing -- select how to handle teleports onto your land">
-				<combo_box.item label="Blocked" name="Blocked"/>
-				<combo_box.item label="Landing Point" name="LandingPoint"/>
-				<combo_box.item label="Anywhere" name="Anywhere"/>
+			<combo_box name="landing type" tool_tip="瞬間傳送繞路 -- 設定如何處理前往你土地的瞬間傳送">
+				<combo_box.item label="封鎖的" name="Blocked"/>
+				<combo_box.item label="登陸點" name="LandingPoint"/>
+				<combo_box.item label="任何地點" name="Anywhere"/>
 			</combo_box>
 		</panel>
-		<panel label="MEDIA" name="land_media_panel">
+		<panel label="媒體" name="land_media_panel">
 			<text name="with media:">
 				類型：
 			</text>
-			<combo_box name="media type" tool_tip="Specify if the URL is a movie, web page, or other media"/>
+			<combo_box name="media type" tool_tip="指明這 URL 是影片、網頁還是其他媒體類型"/>
 			<text name="at URL:">
 				首頁：
 			</text>
@@ -394,27 +397,27 @@ Only large parcels can be listed in search.
 			<text name="Description:">
 				描述：
 			</text>
-			<line_editor name="url_description" tool_tip="Text displayed next to play/load button"/>
+			<line_editor name="url_description" tool_tip="播放 / 載入按鈕旁顯示的文字"/>
 			<text name="Media texture:">
 				取代材質：
 			</text>
-			<texture_picker name="media texture" tool_tip="點擊以挑選圖像"/>
+			<texture_picker name="media texture" tool_tip="點按以挑選圖片"/>
 			<text name="replace_texture_help">
-				Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
+				使用此材質的物件，將在你點按「播放」箭頭後播放影片或顯示網頁。  選取縮圖即可選擇不同的材質。
 			</text>
-			<check_box label="自動縮放" name="media_auto_scale" tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."/>
-			<text name="media_size" tool_tip="Size to render Web media, leave 0 for default.">
+			<check_box label="自動縮放" name="media_auto_scale" tool_tip="勾選此選項將會在此地段自動變更內容的比例。 速度可能稍慢，視覺效果可能略遜，但不需要調整其他材質的比例或加以對齊。"/>
+			<text name="media_size" tool_tip="網上媒體的顯示尺寸，設 0 將採用預設值。">
 				尺寸：
 			</text>
-			<spinner name="media_size_width" tool_tip="Size to render Web media, leave 0 for default."/>
-			<spinner name="media_size_height" tool_tip="Size to render Web media, leave 0 for default."/>
+			<spinner name="media_size_width" tool_tip="網上媒體的顯示尺寸，設 0 將採用預設值。"/>
+			<spinner name="media_size_height" tool_tip="網上媒體的顯示尺寸，設 0 將採用預設值。"/>
 			<text name="pixels">
 				像素
 			</text>
 			<text name="Options:">
 				選項：
 			</text>
-			<check_box label="Loop" name="media_loop" tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."/>
+			<check_box label="連續" name="media_loop" tool_tip="連續播放媒體。  媒體播放結束後，會從頭繼續播放。"/>
 		</panel>
 		<panel label="聲音" name="land_audio_panel">
 			<text name="MusicURL:">
@@ -423,45 +426,45 @@ Only large parcels can be listed in search.
 			<text name="Sound:">
 				聲音：
 			</text>
-			<check_box label="Restrict gesture and object sounds to this parcel" name="check sound local"/>
+			<check_box label="將姿勢和物件的聲音限制於此地段" name="check sound local"/>
+			<text name="Avatar Sounds:">
+				化身聲音：
+			</text>
+			<check_box label="任何人" name="all av sound check"/>
+			<check_box label="群組" name="group av sound check"/>
 			<text name="Voice settings:">
-				Voice:
+				語音：
 			</text>
-			<check_box label="Enable Voice" name="parcel_enable_voice_channel"/>
-			<check_box label="Enable Voice (established by the Estate)" name="parcel_enable_voice_channel_is_estate_disabled"/>
-			<check_box label="Restrict Voice to this parcel" name="parcel_enable_voice_channel_local"/>
+			<check_box label="啟用語音" name="parcel_enable_voice_channel"/>
+			<check_box label="啟用聲音（由領地所確立）" name="parcel_enable_voice_channel_is_estate_disabled"/>
+			<check_box label="將聲音限制於此地段" name="parcel_enable_voice_channel_local"/>
 		</panel>
-		<panel label="ACCESS" name="land_access_panel">
+		<panel label="出入許可" name="land_access_panel">
 			<panel.string name="access_estate_defined">
-				(Defined by the Estate)
-			</panel.string>
-			<panel.string name="allow_public_access">
-				Allow Public Access ([MATURITY]) (Note: Unchecking this will create ban lines)
+				（由領地定義）
 			</panel.string>
 			<panel.string name="estate_override">
-				One or more of these options is set at the estate level
+				至少一個選項在領地的層級設定
 			</panel.string>
-			<text name="Limit access to this parcel to:">
-				出入此地段
-			</text>
+			<check_box label="允許公開出入（若未勾選，將設立禁越線）" name="public_access"/>
 			<text name="Only Allow">
-				Restrict Access to Residents verified by:
+				僅允許符合以下條件的居民進入：
 			</text>
-			<check_box label="Payment Information on File [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Ban unidentified Residents."/>
-			<check_box label="年齡驗證 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."/>
+			<check_box label="已預留付款資料 [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="居民必須提供付款資料才能進入這地段。  參閱 [SUPPORT_SITE] 獲取進一步資訊。"/>
+			<check_box label="年滿 18 歲 [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="居民必須年滿 18 歲才能進入這地段。 參閱 [SUPPORT_SITE] 獲取進一步資訊。"/>
 			<check_box label="允許出入的群組：[GROUP]" name="GroupCheck" tool_tip="設定群組於一般頁籤。"/>
 			<check_box label="出售通行權給：" name="PassCheck" tool_tip="允許暫時出入這個地段"/>
 			<combo_box name="pass_combo">
-				<combo_box.item label="Anyone" name="Anyone"/>
+				<combo_box.item label="任何人" name="Anyone"/>
 				<combo_box.item label="群組" name="Group"/>
 			</combo_box>
-			<spinner label="Price in L$:" name="PriceSpin"/>
-			<spinner label="Hours of access:" name="HoursSpin"/>
+			<spinner label="價格（L$）：" name="PriceSpin"/>
+			<spinner label="出入時間：" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
-				<text label="Always Allow" name="AllowedText">
-					Allowed Residents
+				<text label="永遠允許" name="AllowedText">
+					允許的居民
 				</text>
-				<name_list name="AccessList" tool_tip="([LISTED] listed, [MAX] max)"/>
+				<name_list name="AccessList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
 				<button label="添加" name="add_allowed"/>
 				<button label="移除" label_selected="移除" name="remove_allowed"/>
 			</panel>
@@ -469,7 +472,7 @@ Only large parcels can be listed in search.
 				<text label="禁止" name="BanCheck">
 					被封鎖的居民
 				</text>
-				<name_list name="BannedList" tool_tip="([LISTED] listed, [MAX] max)"/>
+				<name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
 				<button label="添加" name="add_banned"/>
 				<button label="移除" label_selected="移除" name="remove_banned"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_activeim.xml b/indra/newview/skins/default/xui/zh/floater_activeim.xml
index 93017bf5b2..b148ca8eb4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/zh/floater_activeim.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_activeim" title="ACTIVE IM"/>
+<floater name="floater_activeim" title="進行中的 IM"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
new file mode 100755
index 0000000000..76cb9079c4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_animation_anim_preview.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Anim Preview" title="ANIMATION.ANIM">
+	<text name="name_label">
+		名稱：
+	</text>
+	<text name="description_label">
+		描述：
+	</text>
+	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
+	<button label="取消" label_selected="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
new file mode 100755
index 0000000000..ffb0de8a68
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_animation_bvh_preview.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Animation Preview">
+	<floater.string name="failed_to_initialize">
+		動作初始化失敗
+	</floater.string>
+	<floater.string name="anim_too_long">
+		動作檔長度為 [LENGTH] 秒。
+
+動作檔長度最多可為 [MAX_LENGTH] 秒。
+	</floater.string>
+	<floater.string name="failed_file_read">
+		無法讀取動作檔。
+
+[STATUS]
+	</floater.string>
+	<floater.string name="E_ST_OK">
+		確定
+	</floater.string>
+	<floater.string name="E_ST_EOF">
+		檔案結尾不正常。
+	</floater.string>
+	<floater.string name="E_ST_NO_CONSTRAINT">
+		無法讀取約束定義。
+	</floater.string>
+	<floater.string name="E_ST_NO_FILE">
+		無法開啟 BVH 檔案。
+	</floater.string>
+	<floater.string name="E_ST_NO_HIER">
+		HIERARCHY 檔頭無效。
+	</floater.string>
+	<floater.string name="E_ST_NO_JOINT">
+		找不到 ROOT 或 JOINT。
+	</floater.string>
+	<floater.string name="E_ST_NO_NAME">
+		無法取得 JOINT 名稱。
+	</floater.string>
+	<floater.string name="E_ST_NO_OFFSET">
+		無法尋找位移。
+	</floater.string>
+	<floater.string name="E_ST_NO_CHANNELS">
+		找不到頻道。
+	</floater.string>
+	<floater.string name="E_ST_NO_ROTATION">
+		無法取得旋轉序。
+	</floater.string>
+	<floater.string name="E_ST_NO_AXIS">
+		無法取得旋轉軸。
+	</floater.string>
+	<floater.string name="E_ST_NO_MOTION">
+		找不到動作。
+	</floater.string>
+	<floater.string name="E_ST_NO_FRAMES">
+		無法取得幀數。
+	</floater.string>
+	<floater.string name="E_ST_NO_FRAME_TIME">
+		無法取得幀時間。
+	</floater.string>
+	<floater.string name="E_ST_NO_POS">
+		無法取得位置值。
+	</floater.string>
+	<floater.string name="E_ST_NO_ROT">
+		無法取得旋轉值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_FILE">
+		無法開啟平移檔案。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_HEADER">
+		無法讀取平移檔頭。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_NAME">
+		無法讀取平移名稱。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_IGNORE">
+		無法讀取平移忽略值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_RELATIVE">
+		無法讀取平移相對值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_OUTNAME">
+		無法讀取平移輸出名稱。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MATRIX">
+		無法讀取平移矩陣。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MERGECHILD">
+		無法取得 mergechild 名稱。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
+		無法取得 mergeparent 名稱。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_PRIORITY">
+		無法取得優先值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_LOOP">
+		無法取得迴圈值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EASEIN">
+		無法取得 easeIn 值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EASEOUT">
+		無法取得 easeOut 值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_HAND">
+		無法取得 hand morph 值。
+	</floater.string>
+	<floater.string name="E_ST_NO_XLT_EMOTE">
+		無法讀取表情符號名稱。
+	</floater.string>
+	<floater.string name="E_ST_BAD_ROOT">
+		root joint 名稱不正確，使用 &quot;hip&quot;。
+	</floater.string>
+	<text name="name_label">
+		名稱：
+	</text>
+	<text name="description_label">
+		描述：
+	</text>
+	<spinner label="優先度" name="priority" tool_tip="其他動作的控制可被此動作強行取代"/>
+	<check_box label="連續" name="loop_check" tool_tip="讓此動作不斷重覆演繹"/>
+	<spinner label="入(%)" name="loop_in_point" tool_tip="設定動作中重覆演繹的起始點"/>
+	<spinner label="出(%)" name="loop_out_point" tool_tip="設定動作中重覆演繹的結束點"/>
+	<text name="hand_label">
+		手部姿勢
+	</text>
+	<combo_box name="hand_pose_combo" tool_tip="控制動作演繹時雙手的姿勢">
+		<combo_box.item label="張開" name="Spread"/>
+		<combo_box.item label="放鬆" name="Relaxed"/>
+		<combo_box.item label="雙手伸出指頭" name="PointBoth"/>
+		<combo_box.item label="拳頭" name="Fist"/>
+		<combo_box.item label="左邊放鬆" name="RelaxedLeft"/>
+		<combo_box.item label="左邊伸指" name="PointLeft"/>
+		<combo_box.item label="左邊握拳" name="FistLeft"/>
+		<combo_box.item label="右邊放鬆" name="RelaxedRight"/>
+		<combo_box.item label="右邊伸指" name="PointRight"/>
+		<combo_box.item label="右邊握拳" name="FistRight"/>
+		<combo_box.item label="右手敬禮" name="SaluteRight"/>
+		<combo_box.item label="打字" name="Typing"/>
+		<combo_box.item label="右手比出和平手勢" name="PeaceRight"/>
+	</combo_box>
+	<text name="emote_label">
+		表情
+	</text>
+	<combo_box name="emote_combo" tool_tip="控制動作演繹時臉部的姿態">
+		<item label="（無）" name="[None]" value=""/>
+		<item label="張口吶喊貌" name="Aaaaah" value="張口吶喊貌"/>
+		<item label="害怕" name="Afraid" value="害怕"/>
+		<item label="生氣" name="Angry" value="生氣"/>
+		<item label="燦爛笑容" name="BigSmile" value="燦爛笑容"/>
+		<item label="無聊" name="Bored" value="無聊"/>
+		<item label="哭泣" name="Cry" value="哭泣"/>
+		<item label="鄙視" name="Disdain" value="鄙視"/>
+		<item label="尷尬" name="Embarrassed" value="尷尬"/>
+		<item label="皺眉" name="Frown" value="皺眉"/>
+		<item label="親吻" name="Kiss" value="親吻"/>
+		<item label="笑" name="Laugh" value="笑"/>
+		<item label="嫌惡貌" name="Plllppt" value="嫌惡貌"/>
+		<item label="作噁" name="Repulsed" value="作噁"/>
+		<item label="傷心" name="Sad" value="傷心"/>
+		<item label="聳聳肩" name="Shrug" value="聳聳肩"/>
+		<item label="微笑" name="Smile" value="微笑"/>
+		<item label="驚喜" name="Surprise" value="驚喜"/>
+		<item label="眨眼" name="Wink" value="眨眼"/>
+		<item label="擔心" name="Worry" value="擔心"/>
+	</combo_box>
+	<text name="preview_label">
+		預覽…
+	</text>
+	<combo_box name="preview_base_anim" tool_tip="用這個來測試你的化身從一般動作轉入動作演繹時的情況。">
+		<item label="站立" name="Standing" value="站立"/>
+		<item label="步行中" name="Walking" value="步行中"/>
+		<item label="坐著" name="Sitting" value="坐著"/>
+		<item label="飛行" name="Flying" value="飛行"/>
+	</combo_box>
+	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="動作攙混植入的時間長度（秒）"/>
+	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="動作攙混淡出的時間長度（秒）"/>
+	<button name="play_btn" tool_tip="播放你的動作"/>
+	<button name="pause_btn" tool_tip="暫停你的動做"/>
+	<button name="stop_btn" tool_tip="停止播放動作"/>
+	<text name="bad_animation_text">
+		無法讀取動作檔。
+
+我們建議採用由 Poser 4 匯出的 BVH 檔案格式。
+	</text>
+	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
deleted file mode 100644
index c5e2eac446..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		Failed to initialize motion
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animation file is [LENGTH] seconds in length.
-
-Maximum animation length is [MAX_LENGTH] seconds.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		無法讀取動作檔。
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		確定
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Premature end of file.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Cannot read constraint definition.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		無法開啟 BVH 檔案。
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Invalid HIERARCHY header.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Cannot find ROOT or JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Cannot get JOINT name.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		無法尋找位移。
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Cannot find CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Cannot get rotation order.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Cannot get rotation axis.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Cannot find MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Cannot get number of frames.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Cannot get frame time.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Cannot get position values.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Cannot get rotation values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Cannot open translation file.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Cannot read translation header.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Cannot read translation names.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Cannot read translation ignore value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Cannot read translation relative value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Cannot read translation outname value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Cannot read translation matrix.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Cannot get mergechild name.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Cannot get mergeparent name.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Cannot get priority value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Cannot get loop value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Cannot get easeIn values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Cannot get easeOut values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Cannot get hand morph value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Cannot read emote name.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Incorrect root joint name, use &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		名稱：
-	</text>
-	<text name="description_label">
-		描述：
-	</text>
-	<spinner label="優先度" name="priority" tool_tip="Controls which other animations can be overridden by this animation"/>
-	<check_box label="Loop" name="loop_check" tool_tip="Makes this animation loop"/>
-	<spinner label="In(%)" name="loop_in_point" tool_tip="Sets point in animation that looping returns to"/>
-	<spinner label="Out(%)" name="loop_out_point" tool_tip="Sets point in animation that ends a loop"/>
-	<text name="hand_label">
-		Hand Pose
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Controls what hands do during animation">
-		<combo_box.item label="Spread" name="Spread"/>
-		<combo_box.item label="Relaxed" name="Relaxed"/>
-		<combo_box.item label="Point Both" name="PointBoth"/>
-		<combo_box.item label="Fist" name="Fist"/>
-		<combo_box.item label="Relaxed Left" name="RelaxedLeft"/>
-		<combo_box.item label="Point Left" name="PointLeft"/>
-		<combo_box.item label="Fist Left" name="FistLeft"/>
-		<combo_box.item label="Relaxed Right" name="RelaxedRight"/>
-		<combo_box.item label="Point Right" name="PointRight"/>
-		<combo_box.item label="Fist Right" name="FistRight"/>
-		<combo_box.item label="Salute Right" name="SaluteRight"/>
-		<combo_box.item label="Typing" name="Typing"/>
-		<combo_box.item label="Peace Right" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expression
-	</text>
-	<combo_box name="emote_combo" tool_tip="Controls what face does during animation">
-		<item label="（無）" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Afraid" name="Afraid" value="Afraid"/>
-		<item label="Angry" name="Angry" value="Angry"/>
-		<item label="Big Smile" name="BigSmile" value="Big Smile"/>
-		<item label="Bored" name="Bored" value="Bored"/>
-		<item label="Cry" name="Cry" value="Cry"/>
-		<item label="Disdain" name="Disdain" value="Disdain"/>
-		<item label="Embarrassed" name="Embarrassed" value="Embarrassed"/>
-		<item label="Frown" name="Frown" value="Frown"/>
-		<item label="Kiss" name="Kiss" value="Kiss"/>
-		<item label="Laugh" name="Laugh" value="Laugh"/>
-		<item label="Plllppt" name="Plllppt" value="Plllppt"/>
-		<item label="Repulsed" name="Repulsed" value="Repulsed"/>
-		<item label="Sad" name="Sad" value="Sad"/>
-		<item label="Shrug" name="Shrug" value="Shrug"/>
-		<item label="Smile" name="Smile" value="Smile"/>
-		<item label="Surprise" name="Surprise" value="Surprise"/>
-		<item label="Wink" name="Wink" value="Wink"/>
-		<item label="Worry" name="Worry" value="Worry"/>
-	</combo_box>
-	<text name="preview_label">
-		Preview while
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-		<item label="Standing" name="Standing" value="Standing"/>
-		<item label="Walking" name="Walking" value="Walking"/>
-		<item label="Sitting" name="Sitting" value="Sitting"/>
-		<item label="飛行" name="Flying" value="飛行"/>
-	</combo_box>
-	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="Amount of time (in seconds) over which animations blends in"/>
-	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out"/>
-	<button name="play_btn" tool_tip="播放你的動作"/>
-	<button name="pause_btn" tool_tip="暫停你的動做"/>
-	<button name="stop_btn" tool_tip="Stop animation playback"/>
-	<text name="bad_animation_text">
-		Unable to read animation file.
-
-We recommend BVH files exported from Poser 4.
-	</text>
-	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取消" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_auction.xml b/indra/newview/skins/default/xui/zh/floater_auction.xml
index b1862bc582..1b589a92cc 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/indra/newview/skins/default/xui/zh/floater_auction.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="START LINDEN LAND SALE">
+<floater name="floater_auction" title="開始 Linden 土地出售">
 	<floater.string name="already for sale">
-		You cannot auction parcels which are already for sale.
+		出售中的地段無法進行拍賣。
 	</floater.string>
-	<check_box initial_value="true" label="Include yellow selection fence" name="fence_check"/>
-	<button label="Snapshot" label_selected="Snapshot" name="snapshot_btn"/>
-	<button label="Sell to Anyone" label_selected="Sell to Anyone" name="sell_to_anyone_btn"/>
+	<check_box initial_value="true" label="包括黃色圍線" name="fence_check"/>
+	<button label="快照" label_selected="快照" name="snapshot_btn"/>
+	<button label="出售給任何人" label_selected="出售給任何人" name="sell_to_anyone_btn"/>
 	<button label="清除設定" label_selected="清除設定" name="reset_parcel_btn"/>
-	<button label="Start Auction" label_selected="Start Auction" name="start_auction_btn"/>
+	<button label="開始拍賣" label_selected="開始拍賣" name="start_auction_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
new file mode 100755
index 0000000000..4ee07e6295
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="自動取代設定">
+	<check_box label="啟用自動取代" name="autoreplace_enable" tool_tip="在輸入聊天內容的同時，將輸入的關鍵字代換為相應的取代文字。"/>
+	<button label="匯入清單…" name="autoreplace_import_list" tool_tip="從檔案載入先前匯出過的清單。"/>
+	<button label="匯出清單…" name="autoreplace_export_list" tool_tip="將所選清單儲存到檔案以便和他人分享。"/>
+	<button label="新的清單…" name="autoreplace_new_list" tool_tip="新建一個清單。"/>
+	<button label="刪除清單" name="autoreplace_delete_list" tool_tip="刪除所選清單。"/>
+	<button name="autoreplace_list_up" tool_tip="提高此清單的優先次序。"/>
+	<button name="autoreplace_list_down" tool_tip="降低此清單的優先次序。"/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="關鍵字" name="keyword"/>
+		<scroll_list.columns label="取代文字" name="replacement"/>
+	</scroll_list>
+	<button label="添加..." name="autoreplace_add_entry"/>
+	<button label="移除" name="autoreplace_delete_entry"/>
+	<button label="儲存項目" name="autoreplace_save_entry" tool_tip="儲存此項目。"/>
+	<button label="儲存變更" name="autoreplace_save_changes" tool_tip="儲存所有變更。"/>
+	<button label="取消" name="autoreplace_cancel" tool_tip="放棄所有變更。"/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar.xml b/indra/newview/skins/default/xui/zh/floater_avatar.xml
new file mode 100755
index 0000000000..55b1a95a41
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_avatar.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Avatar" title="選擇一個化身"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index 7e2d74c728..c19369c859 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="挑選居民">
 	<floater.string name="not_found">
-		&apos;[TEXT]&apos; not found
+		查無「[TEXT]」
 	</floater.string>
 	<floater.string name="no_one_near">
-		No one near
+		附近無人
 	</floater.string>
 	<floater.string name="no_results">
-		No results
+		沒有結果
 	</floater.string>
 	<floater.string name="searching">
 		搜尋中...
@@ -21,9 +21,9 @@
 	<tab_container name="ResidentChooserTabs">
 		<panel label="搜尋" name="SearchPanel">
 			<text name="InstructSearchResidentName">
-				Type part of a person&apos;s name:
+				鍵入人名的一部分：
 			</text>
-			<button label="Go" label_selected="Go" name="Find"/>
+			<button label="前往" label_selected="前往" name="Find"/>
 			<scroll_list name="SearchResults">
 				<columns label="名稱" name="name"/>
 				<columns label="使用者名稱" name="username"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index 36dae7c798..69309c96de 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="化身材質">
 	<floater.string name="InvalidAvatar">
-		INVALID AVATAR
+		無效的化身
 	</floater.string>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text name="label">
-				Baked
-Textures
+				確定產出的
+材質
 			</text>
 			<text name="composite_label">
-				Composite
-Textures
+				合成
+材質
 			</text>
-			<button label="Dump IDs to Console" label_selected="Dump" name="Dump"/>
+			<button label="傾印 ID 到控制臺" label_selected="傾印" name="Dump"/>
 			<panel name="scroll_content_panel">
 				<texture_picker label="頭髮" name="hair-baked"/>
 				<texture_picker label="頭髮" name="hair_grain"/>
@@ -25,7 +25,7 @@ Textures
 				<texture_picker label="眼睛" name="eyes-baked"/>
 				<texture_picker label="眼睛" name="eyes_iris"/>
 				<texture_picker label="眼睛半透明" name="eyes_alpha"/>
-				<texture_picker label="上半身半透明" name="upper-baked"/>
+				<texture_picker label="上半身" name="upper-baked"/>
 				<texture_picker label="上半身身體部位" name="upper_bodypaint"/>
 				<texture_picker label="內衣" name="upper_undershirt"/>
 				<texture_picker label="手套" name="upper_gloves"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_beacons.xml b/indra/newview/skins/default/xui/zh/floater_beacons.xml
index 1613b23e75..83e10804d6 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/zh/floater_beacons.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="BEACONS">
+<floater name="beacons" title="指標">
 	<panel name="beacons_panel">
 		<text name="label_show">
-			Show :
+			顯示：
 		</text>
-		<check_box label="Beacons" name="beacons"/>
-		<check_box label="Highlights" name="highlights"/>
-		<text name="beacon_width_label" tool_tip="Beacon width">
-			Width:
+		<check_box label="指標" name="beacons"/>
+		<check_box label="高亮顯示" name="highlights"/>
+		<text name="beacon_width_label" tool_tip="指標寬度">
+			寬：
 		</text>
 		<text name="label_objects">
-			For these objects:
+			對象物件：
 		</text>
-		<check_box label="Physical" name="physical"/>
-		<check_box label="Scripted" name="scripted"/>
-		<check_box label="Touch only" name="touch_only"/>
-		<check_box label="Sound sources" name="sounds"/>
-		<check_box label="Particle sources" name="particles"/>
-		<check_box label="Media sources" name="moapbeacon"/>
+		<check_box label="物理性" name="physical"/>
+		<check_box label="有腳本" name="scripted"/>
+		<check_box label="僅可觸碰" name="touch_only"/>
+		<check_box label="聲音來源" name="sounds"/>
+		<check_box label="例子來源" name="particles"/>
+		<check_box label="媒體來源" name="moapbeacon"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_build_options.xml b/indra/newview/skins/default/xui/zh/floater_build_options.xml
index b9d3b6b849..29f36b461c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="格線選項">
-	<spinner label="格線單位（公尺）" name="GridResolution"/>
-	<spinner label="Grid Extents (meters)" name="GridDrawSize"/>
+	<floater.string name="grid_screen_text">
+		螢幕
+	</floater.string>
+	<floater.string name="grid_local_text">
+		本地
+	</floater.string>
+	<floater.string name="grid_world_text">
+		世界
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		參考
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		附件
+	</floater.string>
+	<text name="grid_mode_label" tool_tip="格線不透明度">
+		模式
+	</text>
+	<combo_box name="combobox grid mode" tool_tip="選擇物件定位參考的格線尺度類型">
+		<combo_box.item label="世界格線" name="World"/>
+		<combo_box.item label="地方格線" name="Local"/>
+		<combo_box.item label="參考格線" name="Reference"/>
+	</combo_box>
+	<spinner label="單位（公尺）" name="GridResolution"/>
+	<spinner label="範圍（公尺）" name="GridDrawSize"/>
 	<check_box label="貼齊至子單位" name="GridSubUnit"/>
-	<check_box label="View cross-sections" name="GridCrossSection"/>
+	<check_box label="檢視橫剖面" name="GridCrossSection"/>
 	<text name="grid_opacity_label" tool_tip="格線不透明度">
 		不透明度：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
index 660710fb7b..c103ea938f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bulk_perms.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="編輯內容物權限">
+<floater name="floaterbulkperms" title="調整內容物權限">
 	<floater.string name="nothing_to_modify_text">
 		選擇未包含可編輯的內容物。
 	</floater.string>
@@ -24,7 +24,7 @@
 	<button label="√ 全部" name="check_all"/>
 	<button label="清除" label_selected="無" name="check_none"/>
 	<text name="newperms">
-		新內容物權限
+		調整內容物權限：
 	</text>
 	<text name="GroupLabel">
 		群組：
@@ -33,13 +33,14 @@
 	<text name="AnyoneLabel">
 		任何人：
 	</text>
-	<check_box label="覆製" name="everyone_copy"/>
+	<check_box label="恚庨" name="everyone_copy"/>
 	<text name="NextOwnerLabel">
-		下一個擁有者：
+		下一個所有人：
 	</text>
 	<check_box label="修改" name="next_owner_modify"/>
-	<check_box label="覆製" name="next_owner_copy"/>
-	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="下一個擁有者能送出或轉售這個物件"/>
-	<button label="確定" name="apply"/>
+	<check_box label="恚庨" name="next_owner_copy"/>
+	<check_box initial_value="true" label="轉移" name="next_owner_transfer" tool_tip="下一個所有人可贈送或轉售這個物件"/>
+	<button label="確定" name="ok"/>
+	<button label="套用" name="apply"/>
 	<button label="取消" name="close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index 2d76a9f831..2d76a9f831 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 44d3394a52..5e4153de66 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_contents" title="BUY CONTENTS">
+<floater name="floater_buy_contents" title="購買內容">
 	<floater.string name="no_copy_text">
-		(no copy)
+		（禁止複製）
 	</floater.string>
 	<floater.string name="no_modify_text">
-		(no modify)
+		（禁止修改）
 	</floater.string>
 	<floater.string name="no_transfer_text">
-		(no transfer)
+		（禁止轉讓）
 	</floater.string>
 	<text name="contains_text">
-		[NAME] contains:
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 內含：
 	</text>
 	<text name="buy_text">
-		Buy for L$[AMOUNT] from [NAME]?
+		是否花 L$[AMOUNT] 向 [NAME] 購買？
 	</text>
 	<check_box label="立即穿上服裝" name="wear_check"/>
 	<button label="購買" label_selected="購買" name="buy_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index 9f6591faf9..fcf2800728 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy currency" title="購買 L$">
 	<floater.string name="buy_currency">
-		Buy L$ [LINDENS] for approx. [LOCALAMOUNT]
+		購買 L$ [LINDENS]，所需花費約為 [LOCALAMOUNT]
 	</floater.string>
 	<text name="info_need_more">
-		你需要更多 L$
+		你的 L$ 不足
 	</text>
 	<text name="contacting">
 		聯接到 LindeX 中...
@@ -31,10 +31,10 @@
 		以此價格
 	</text>
 	<text name="currency_est">
-		approx. [LOCALAMOUNT]
+		約合 [LOCALAMOUNT]
 	</text>
 	<text name="getting_data">
-		Estimating...
+		估算中…
 	</text>
 	<text name="buy_action">
 		[ACTION]
@@ -46,16 +46,16 @@
 		L$ [AMT]
 	</text>
 	<text name="currency_links">
-		[http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency]
+		[http://www.secondlife.com/my/account/payment_method_management.php 付費方式] | [http://www.secondlife.com/my/account/currency.php 幣種]
 	</text>
 	<text name="exchange_rate_note">
-		Re-enter amount to see the latest exchange rate.
+		重新輸入金額即可察看最新的匯率。
 	</text>
 	<text name="purchase_warning_repurchase">
-		Confirming this purchase only buys L$, not the object.
+		確認這次購買只是添購 L$，並非購買物件。
 	</text>
 	<text name="purchase_warning_notenough">
-		你並未購買足夠的林登幣，請先添加一些數量。
+		你購買的林登幣不足， 請增加數額。
 	</text>
 	<button label="立即購買" name="buy_btn"/>
 	<button label="取消" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
index ec700ad7af..ec700ad7af 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_currency_html.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index 336d14747d..51bbd6a561 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="購買土地">
 	<floater.string name="can_resell">
-		May be resold.
+		得以再出售。
 	</floater.string>
 	<floater.string name="can_not_resell">
-		May not be resold.
+		不得再出售。
 	</floater.string>
 	<floater.string name="can_change">
-		May be joined or subdivided.
+		得以合併或分割。
 	</floater.string>
 	<floater.string name="can_not_change">
-		May not be joined or subdivided.
+		不得合併或分割。
 	</floater.string>
 	<floater.string name="cant_buy_for_group">
-		You do not have permission to buy land for your active group.
+		你沒有權限為你當前的群組購買土地。
 	</floater.string>
 	<floater.string name="no_land_selected">
 		無土地被選擇。
 	</floater.string>
 	<floater.string name="multiple_parcels_selected">
-		Multiple different parcels selected. 
-Try selecting a smaller area.
+		選取了多個不同地段。 
+請嘗試選取較小區域。
 	</floater.string>
 	<floater.string name="no_permission">
-		You do not have permission to buy land for your active group.
+		你沒有權限為你當前的群組購買土地。
 	</floater.string>
 	<floater.string name="parcel_not_for_sale">
 		所選擇的地段不出售。.
@@ -35,37 +35,37 @@ Try selecting a smaller area.
 		你已經擁有這個地段。
 	</floater.string>
 	<floater.string name="set_to_sell_to_other">
-		The selected parcel is set to sell to another party.
+		所選地段已設為待售給他人。
 	</floater.string>
 	<floater.string name="no_public_land">
-		The selected area has no public land.
+		所選區域內無公共土地。
 	</floater.string>
 	<floater.string name="not_owned_by_you">
-		Land owned by another Resident is selected. 
-Try selecting a smaller area.
+		選取了另一位居民所擁有土地。 
+請嘗試選取較小區域。
 	</floater.string>
 	<floater.string name="processing">
-		Processing your purchase...
+		正在處理你的購買…
  
-（過程這將會花費一到兩分鐘）
+（這過程將會花費一到兩分鐘。）
 	</floater.string>
 	<floater.string name="fetching_error">
-		There has been an error while fetching land buying information.
+		擷取購地訊息時發生錯誤。
 	</floater.string>
 	<floater.string name="buying_will">
-		Buying this land will:
+		購買這塊土地後：
 	</floater.string>
 	<floater.string name="buying_for_group">
-		Buying land for group will:
+		為群組購買土地後：
 	</floater.string>
 	<floater.string name="cannot_buy_now">
-		Cannot buy now:
+		現在無法購買：
 	</floater.string>
 	<floater.string name="not_for_sale">
 		不出售：
 	</floater.string>
 	<floater.string name="none_needed">
-		none needed
+		不需要
 	</floater.string>
 	<floater.string name="must_upgrade">
 		你的帳戶必須要升級才能擁有土地。
@@ -77,52 +77,52 @@ Try selecting a smaller area.
 		你持有 [BUYER] m² 土地。
 	</floater.string>
 	<floater.string name="pay_to_for_land">
-		Pay L$ [AMOUNT] to [SELLER] for this land
+		支付 L$ [AMOUNT] 給 [SELLER] 購買這土地
 	</floater.string>
 	<floater.string name="buy_for_US">
-		Buy L$ [AMOUNT] for approx. [LOCAL_AMOUNT],
+		購買 L$ [AMOUNT]，所需花費約為 [LOCAL_AMOUNT]，
 	</floater.string>
 	<floater.string name="parcel_meters">
-		這個地段為 [AMOUNT] m²
+		這個地段有 [AMOUNT] 平方公尺
 	</floater.string>
 	<floater.string name="premium_land">
-		This land is premium, and will charge as [AMOUNT] m².
+		這土地屬於高價地段，將計為 [AMOUNT] 平方公尺。
 	</floater.string>
 	<floater.string name="discounted_land">
-		This land is discounted, and will charge as [AMOUNT] m².
+		這土地有折扣，將計為 [AMOUNT] 平方公尺。
 	</floater.string>
 	<floater.string name="meters_supports_object">
-		[AMOUNT] m²
-supports [AMOUNT2] objects
+		[AMOUNT] 平方公尺
+支援 [AMOUNT2] 項物件
 	</floater.string>
 	<floater.string name="sold_with_objects">
-		sold with objects
+		含物件出售
 	</floater.string>
 	<floater.string name="sold_without_objects">
-		objects not included
+		不含物件
 	</floater.string>
 	<floater.string name="info_price_string">
-		L$ [PRICE]
-(L$ [PRICE_PER_SQM]/m²)
+		L$[PRICE]
+（L$ [PRICE_PER_SQM]/平方公尺）
 [SOLD_WITH_OBJECTS]
 	</floater.string>
 	<floater.string name="insufficient_land_credits">
-		The group [GROUP] will need sufficient contributed land use credits to cover this parcel before the purchase will complete.
+		群組 [GROUP] 需先有足夠的捐地使用額度來支應這個地段，才可完成購買。
 	</floater.string>
 	<floater.string name="have_enough_lindens">
-		You have L$ [AMOUNT], which is enough to buy this land.
+		你有 L$ [AMOUNT]，足以購買這土地。
 	</floater.string>
 	<floater.string name="not_enough_lindens">
-		You have only L$ [AMOUNT], and need L$ [AMOUNT2] more.
+		你只有 L$ [AMOUNT]，尚缺 L$ [AMOUNT2]。
 	</floater.string>
 	<floater.string name="balance_left">
-		After the purchase, you will have L$ [AMOUNT] left.
+		購買後，你將剩餘 L$ [AMOUNT]。
 	</floater.string>
 	<floater.string name="balance_needed">
-		You need to buy at least L$ [AMOUNT] to afford this land.
+		你至少必須購買 L$ [AMOUNT] 才能添購這土地。
 	</floater.string>
 	<floater.string name="no_parcel_selected">
-		（無地段被選擇）
+		（未選擇地段）
 	</floater.string>
 	<text name="region_name_label">
 		地區：
@@ -143,27 +143,27 @@ supports [AMOUNT2] objects
 		（未知）
 	</text>
 	<text name="estate_owner_label">
-		領地擁有者：
+		領地所有人：
 	</text>
 	<text name="estate_owner_text">
 		（未知）
 	</text>
 	<text name="resellable_changeable_label">
-		Purchased land in this region:
+		在本地區已購土地：
 	</text>
 	<text name="resellable_clause">
-		May or may not be resold.
+		是否可再售出。
 	</text>
 	<text name="changeable_clause">
-		May or may not be joined or subdivided.
+		是否可合併或分割。
 	</text>
 	<text name="covenant_text">
-		You must agree to the Estate Covenant:
+		你必須同意領地契約：
 	</text>
 	<text_editor name="covenant_editor">
 		載入中...
 	</text_editor>
-	<check_box label="I Agree to the Covenant Defined Above." name="agree_covenant"/>
+	<check_box label="我同意以上所訂契約。" name="agree_covenant"/>
 	<text name="info_parcel_label">
 		地段：
 	</text>
@@ -174,60 +174,60 @@ supports [AMOUNT2] objects
 		尺寸：
 	</text>
 	<text name="info_size">
-		1024 m²
+		1024 平方公尺
 	</text>
 	<text name="info_price_label">
 		價格：
 	</text>
 	<text name="info_price">
 		L$ 1500
-(L$ 1.1/m²)
-sold with objects
+（L$ 1.1/平方公尺）
+含物件出售
 	</text>
 	<text name="info_action">
-		Buying this land will:
+		購買這塊土地後：
 	</text>
 	<text name="error_message">
-		Something ain&apos;t right.
+		恐怕出問題了。
 	</text>
 	<button label="前往網站" name="error_web"/>
 	<text name="account_action">
-		Upgrade you to premium membership.
+		將你升級為付費用戶
 	</text>
 	<text name="account_reason">
-		Only premimum members may own land.
+		只有付費用戶才能擁有土地。
 	</text>
 	<combo_box name="account_level">
-		<combo_box.item label="US$9.95/month, billed monthly" name="US$9.95/month,billedmonthly"/>
-		<combo_box.item label="US$7.50/month, billed quarterly" name="US$7.50/month,billedquarterly"/>
-		<combo_box.item label="US$6.00/month, billed annually" name="US$6.00/month,billedannually"/>
+		<combo_box.item label="每月 US$9.95，按月支付" name="US$9.95/month,billedmonthly"/>
+		<combo_box.item label="每月 US$7.50，按季支付" name="US$7.50/month,billedquarterly"/>
+		<combo_box.item label="每月 US$6.00，一年支付一次" name="US$6.00/month,billedannually"/>
 	</combo_box>
 	<text name="land_use_action">
-		Increase your monthly land use fees to US$ 40/month.
+		將你的每月土地使用費增加為每月 US$ 40。
 	</text>
 	<text name="land_use_reason">
-		You hold 1309 m² of land.
-This parcel is 512 m² of land.
+		你持有 1309 平方公尺土地。
+這地段有 512 平方公尺的土地。
 	</text>
 	<text name="purchase_action">
-		Pay Joe Resident L$ 4000 for the land
+		支付給居民 Joe L$ 4000 購買土地
 	</text>
 	<text name="currency_reason">
-		You have L$ 2,100.
+		你有 L$ 2,100。
 	</text>
 	<text name="currency_action">
-		Buy additional L$
+		購買更多 L$
 	</text>
 	<line_editor name="currency_amt">
 		1000
 	</line_editor>
 	<text name="currency_est">
-		for approx. [LOCAL_AMOUNT]
+		花費大約 [LOCAL_AMOUNT]
 	</text>
 	<text name="currency_balance">
-		You have L$ 2,100.
+		你有 L$ 2,100。
 	</text>
-	<check_box label="Remove [AMOUNT] m² of contribution from group." name="remove_contribution"/>
-	<button label="Purchase" name="buy_btn"/>
+	<check_box label="從群組移除 [AMOUNT] 平方公尺的捐出地。" name="remove_contribution"/>
+	<button label="購買" name="buy_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index 507e482766..ff4a1feedb 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -4,25 +4,25 @@
 		購買
 	</floater.string>
 	<floater.string name="title_buy_copy_text">
-		Buy a copy of
+		購買一個
 	</floater.string>
 	<floater.string name="no_copy_text">
-		(no copy)
+		（禁止複製）
 	</floater.string>
 	<floater.string name="no_modify_text">
-		(no modify)
+		（禁止修改）
 	</floater.string>
 	<floater.string name="no_transfer_text">
-		(no transfer)
+		（禁止轉讓）
 	</floater.string>
 	<text name="contents_text">
-		Contains:
+		內含：
 	</text>
 	<text name="buy_text">
-		Buy for L$[AMOUNT] from:
+		購買，支付 L$[AMOUNT] 給：
 	</text>
 	<text name="buy_name_text">
-		[NAME]?
+		[NAME]？
 	</text>
 	<button label="購買" label_selected="購買" name="buy_btn"/>
 	<button label="取消" label_selected="取消" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_camera.xml b/indra/newview/skins/default/xui/zh/floater_camera.xml
index b75474340c..becb7b9546 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_camera.xml
+++ b/indra/newview/skins/default/xui/zh/floater_camera.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="camera_floater">
+<floater name="camera_floater" title="攝影機控制">
 	<floater.string name="rotate_tooltip">
-		Rotate Camera Around Focus
+		繞著焦點轉動攝影機
 	</floater.string>
 	<floater.string name="zoom_tooltip">
-		Zoom Camera Towards Focus
+		攝影機移近焦點
 	</floater.string>
 	<floater.string name="move_tooltip">
-		Move Camera Up and Down, Left and Right
+		攝影機上下左右移動
+	</floater.string>
+	<floater.string name="camera_modes_title">
+		攝影機模式
+	</floater.string>
+	<floater.string name="pan_mode_title">
+		環繞縮放平移
+	</floater.string>
+	<floater.string name="presets_mode_title">
+		預設視角
 	</floater.string>
 	<floater.string name="free_mode_title">
 		視角物件
@@ -43,14 +52,14 @@
 			</panel_camera_item>
 		</panel>
 		<panel name="zoom">
-			<joystick_rotate name="cam_rotate_stick" tool_tip="Orbit camera around focus"/>
-			<slider_bar name="zoom_slider" tool_tip="Zoom camera toward focus"/>
+			<joystick_rotate name="cam_rotate_stick" tool_tip="攝影機繞焦點旋轉"/>
+			<slider_bar name="zoom_slider" tool_tip="攝影機移近焦點"/>
 			<joystick_track name="cam_track_stick" tool_tip="移動攝影機上下左右"/>
 		</panel>
 	</panel>
 	<panel name="buttons">
 		<button label="" name="presets_btn" tool_tip="預設視角"/>
-		<button label="" name="pan_btn" tool_tip="Orbit Zoom Pan"/>
+		<button label="" name="pan_btn" tool_tip="環繞縮放平移"/>
 		<button label="" name="avatarview_btn" tool_tip="攝影機模式"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_chat_bar.xml b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
new file mode 100755
index 0000000000..f1a69a7688
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_chat_bar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="chat_bar" title="附近的聊天">
+	<panel name="bottom_panel">
+		<line_editor label="點按此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
+		<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_choose_group.xml b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
index 9977bfc828..9977bfc828 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/zh/floater_choose_group.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
index a7ac78e419..fa7b795d4f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/zh/floater_color_picker.xml
@@ -10,13 +10,13 @@
 		藍色：
 	</text>
 	<text name="h_val_text">
-		Hue:
+		色調：
 	</text>
 	<text name="s_val_text">
-		Sat:
+		飽和度：
 	</text>
 	<text name="l_val_text">
-		Lum:
+		亮度：
 	</text>
 	<check_box label="立即套用" name="apply_immediate"/>
 	<button label="確定" label_selected="確定" name="select_btn"/>
@@ -25,6 +25,6 @@
 		目前顏色：
 	</text>
 	<text name="(Drag below to save.)">
-		(Drag below to save)
+		（拖曳到下方即可儲存）
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
new file mode 100644
index 0000000000..37115a0310
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_conversation_log" title="交談記錄">
+	<panel name="buttons_panel">
+		<filter_editor label="人員過濾器" name="people_filter_input"/>
+		<menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
+		<menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
new file mode 100644
index 0000000000..ece263f440
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_conversation" title="交談：">
+	<floater.string name="Title">
+		交談：[NAME]
+	</floater.string>
+	<text name="page_label" value="頁"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_critical.xml b/indra/newview/skins/default/xui/zh/floater_critical.xml
index 7d08fe8af2..7d08fe8af2 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_critical.xml
+++ b/indra/newview/skins/default/xui/zh/floater_critical.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
new file mode 100755
index 0000000000..4aafb31952
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_delete_env_preset.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Env Preset" title="刪除環境自訂配置">
+	<string name="title_water">
+		刪除水的自訂配置
+	</string>
+	<string name="title_sky">
+		刪除天空自訂配置
+	</string>
+	<string name="title_day_cycle">
+		刪除日循環
+	</string>
+	<string name="label_water">
+		自訂配置：
+	</string>
+	<string name="label_sky">
+		自訂配置：
+	</string>
+	<string name="label_day_cycle">
+		日循環：
+	</string>
+	<string name="msg_confirm_deletion">
+		確定要刪除所選自訂配置？
+	</string>
+	<string name="msg_sky_is_referenced">
+		無法刪除日循環有所指涉的自訂配置。
+	</string>
+	<string name="combo_label">
+		-選擇一個自訂配置-
+	</string>
+	<text name="label">
+		自訂配置：
+	</text>
+	<button label="刪除" name="delete"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_destinations.xml b/indra/newview/skins/default/xui/zh/floater_destinations.xml
new file mode 100755
index 0000000000..f50a6a631a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_destinations.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Destinations" title="目的地"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_display_name.xml b/indra/newview/skins/default/xui/zh/floater_display_name.xml
index 01b5088794..aa71bba769 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/zh/floater_display_name.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Display Name" title="變更顯示名稱">
 	<text name="info_text">
-		The name you give your avatar is called your Display Name. You can change it once a week.
+		你為你的化身取的名字叫做「顯示名稱」。 一星期可以修改一次。
 	</text>
 	<text name="lockout_text">
-		You cannot change your Display Name until: [TIME].
+		你下次能再更改顯示名稱的時間為 [TIME]。
 	</text>
 	<text name="set_name_label">
 		新顯示名稱：
 	</text>
 	<text name="name_confirm_label">
-		Type your new name again to confirm:
+		再次輸入你的新名稱以便確認：
 	</text>
-	<button label="儲存" name="save_btn" tool_tip="儲存你的新顯示名稱"/>
-	<button label="重設" name="reset_btn" tool_tip="Make Display Name the same as Username"/>
+	<button label="儲存" name="save_btn" tool_tip="儲存你的新的顯示名稱"/>
+	<button label="重設" name="reset_btn" tool_tip="將顯示名稱設成和使用者名稱相同"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
new file mode 100755
index 0000000000..b84a4027ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_edit_day_cycle.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Day cycle" title="編輯日循環">
+	<string name="title_new">
+		新建一個日循環
+	</string>
+	<string name="title_edit">
+		編輯日循環
+	</string>
+	<string name="hint_new">
+		為日循環定名，調整各項控制確定細節，再點按「儲存」。
+	</string>
+	<string name="hint_edit">
+		若要編輯你的日循環，請調整下方各項控制，再點按「儲存」。
+	</string>
+	<string name="combo_label">
+		-選擇一個自訂配置-
+	</string>
+	<text name="label">
+		自訂配置名稱：
+	</text>
+	<text name="note">
+		注意：更改自訂配置的名稱將會新建一個自訂配置，不會改變原有的自訂配置。
+	</text>
+	<text name="hint_item1">
+		- 點按一個頁籤，編輯特定的天空設定和時間。
+	</text>
+	<text name="hint_item2">
+		- 點按並拖曳各個頁籤，即可設定過渡時間。
+	</text>
+	<text name="hint_item3">
+		- 使用 scrubber 預覽你的日循環。
+	</text>
+	<panel name="day_cycle_slider_panel">
+		<multi_slider initial_value="0" name="WLTimeSlider"/>
+		<multi_slider initial_value="0" name="WLDayCycleKeys"/>
+		<button label="新增鍵" label_selected="新增鍵" name="WLAddKey"/>
+		<button label="刪除鍵" label_selected="刪除鍵" name="WLDeleteKey"/>
+		<text name="WL12am">
+			午夜 12 點
+		</text>
+		<text name="WL3am">
+			凌晨 3 點
+		</text>
+		<text name="WL6am">
+			上午 6 點
+		</text>
+		<text name="WL9amHash">
+			上午 9 點
+		</text>
+		<text name="WL12pmHash">
+			中午 12 點
+		</text>
+		<text name="WL3pm">
+			下午 3 點
+		</text>
+		<text name="WL6pm">
+			下午 6 點
+		</text>
+		<text name="WL9pm">
+			下午 9 點
+		</text>
+		<text name="WL12am2">
+			午夜 12 點
+		</text>
+		<text name="WL12amHash">
+			|
+		</text>
+		<text name="WL3amHash">
+			I
+		</text>
+		<text name="WL6amHash">
+			|
+		</text>
+		<text name="WL9amHash2">
+			I
+		</text>
+		<text name="WL12pmHash2">
+			|
+		</text>
+		<text name="WL3pmHash">
+			I
+		</text>
+		<text name="WL6pmHash">
+			|
+		</text>
+		<text name="WL9pmHash">
+			I
+		</text>
+		<text name="WL12amHash2">
+			|
+		</text>
+	</panel>
+	<text name="WLCurKeyPresetText">
+		天空設定：
+	</text>
+	<combo_box label="預設值" name="WLSkyPresets"/>
+	<text name="WLCurKeyTimeText">
+		時間：
+	</text>
+	<time name="time" value="上午 6 點"/>
+	<check_box label="根據這設定變更我的日循環" name="make_default_cb"/>
+	<button label="儲存" name="save"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
new file mode 100755
index 0000000000..1ff832cdc4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_edit_sky_preset.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Sky Preset" title="編輯天空自訂配置">
+	<string name="title_new">
+		建立新的天空自訂配置
+	</string>
+	<string name="title_edit">
+		編輯天空自訂配置
+	</string>
+	<string name="hint_new">
+		為自訂配置定名，調整各項控制確定配置細節，完成後點按「儲存」。
+	</string>
+	<string name="hint_edit">
+		若要編輯你的天空自訂配置，請調整各項控制，再點按「儲存」。
+	</string>
+	<string name="combo_label">
+		-選擇一個自訂配置-
+	</string>
+	<text name="hint">
+		若要編輯你的自訂配置，請調整各項控制，再點按「儲存」。
+	</text>
+	<text name="label">
+		自訂配置名稱：
+	</text>
+	<text name="note">
+		注意：更改自訂配置的名稱將會新建一個自訂配置，不會改變原有的自訂配置。
+	</text>
+	<tab_container name="WindLight Tabs">
+		<panel label="大氣" name="Atmosphere">
+			<text name="BHText">
+				藍天水平線
+			</text>
+			<text name="BDensText">
+				陰霾水平線
+			</text>
+			<text name="BDensText2">
+				藍天密度
+			</text>
+			<text name="HDText">
+				陰霾密度
+			</text>
+			<text name="DensMultText">
+				密度倍增
+			</text>
+			<text name="WLDistanceMultText">
+				距離倍增
+			</text>
+			<text name="MaxAltText">
+				最大高度
+			</text>
+		</panel>
+		<panel label="照明" name="Lighting">
+			<text name="SLCText">
+				日／月 顏色
+			</text>
+			<text name="WLAmbientText">
+				環境
+			</text>
+			<text name="SunGlowText">
+				太陽光輝
+			</text>
+			<slider label="聚焦" name="WLGlowB"/>
+			<slider label="尺寸" name="WLGlowR"/>
+			<text name="WLStarText">
+				星空亮度
+			</text>
+			<text name="SceneGammaText">
+				場景 Gamma 值
+			</text>
+			<text name="TODText">
+				日／月 位置
+			</text>
+			<multi_slider initial_value="0" name="WLSunPos"/>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<text name="WL12am">
+				午夜 12 點
+			</text>
+			<text name="WL6am">
+				上午 6 點
+			</text>
+			<text name="WL12pmHash">
+				中午 12 點
+			</text>
+			<text name="WL6pm">
+				下午 6 點
+			</text>
+			<text name="WL12am2">
+				午夜 12 點
+			</text>
+			<time name="WLDayTime" value="上午 6 點"/>
+			<text name="WLEastAngleText">
+				東升角度
+			</text>
+		</panel>
+		<panel label="雲彩" name="Clouds">
+			<text name="WLCloudColorText">
+				雲彩顏色
+			</text>
+			<text name="WLCloudColorText2">
+				雲彩 XY 軸 / 密度
+			</text>
+			<slider label="X" name="WLCloudX"/>
+			<slider label="Y" name="WLCloudY"/>
+			<slider label="D" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				雲彩覆蓋
+			</text>
+			<text name="WLCloudScaleText">
+				雲彩規模
+			</text>
+			<text name="WLCloudDetailText">
+				雲彩細節（XY 軸 / 密度）
+			</text>
+			<slider label="X" name="WLCloudDetailX"/>
+			<slider label="Y" name="WLCloudDetailY"/>
+			<slider label="D" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				雲彩 X 滾軸
+			</text>
+			<check_box label="鎖定" name="WLCloudLockX"/>
+			<text name="WLCloudScrollYText">
+				雲彩 Y 滾軸
+			</text>
+			<check_box label="鎖定" name="WLCloudLockY"/>
+		</panel>
+	</tab_container>
+	<check_box label="根據這自訂配置變更我的天空設定" name="make_default_cb"/>
+	<button label="儲存" name="save"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
new file mode 100755
index 0000000000..7943866e72
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_edit_water_preset.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Edit Water Preset" title="編輯水的自訂配置">
+	<string name="title_new">
+		新建水的自訂配置
+	</string>
+	<string name="title_edit">
+		編輯水的自訂配置
+	</string>
+	<string name="hint_new">
+		為自訂配置定名，調整各項控制確定配置細節，完成後點按「儲存」。
+	</string>
+	<string name="hint_edit">
+		若要編輯水的自訂配置，請調整各項控制，再點按「儲存」。
+	</string>
+	<string name="combo_label">
+		-選擇一個自訂配置-
+	</string>
+	<text name="hint">
+		若要編輯你的自訂配置，請調整各項控制，再點按「儲存」。
+	</text>
+	<text name="label">
+		自訂配置名稱：
+	</text>
+	<text name="note">
+		注意：更改自訂配置的名稱將會新建一個自訂配置，不會改變原有的自訂配置。
+	</text>
+	<panel name="panel_water_preset">
+		<text name="water_color_label">
+			水霧顏色
+		</text>
+		<text name="water_fog_density_label">
+			霧密度指數
+		</text>
+		<text name="underwater_fog_modifier_label">
+			水底霧修飾元
+		</text>
+		<text name="BHText">
+			大波浪方向
+		</text>
+		<slider label="X" name="WaterWave1DirX"/>
+		<slider label="Y" name="WaterWave1DirY"/>
+		<text name="BDensText">
+			反射子波比例
+		</text>
+		<text name="HDText">
+			菲涅耳比例
+		</text>
+		<text name="FresnelOffsetText">
+			菲涅耳偏距
+		</text>
+		<text name="BHText2">
+			小波浪方向
+		</text>
+		<slider label="X" name="WaterWave2DirX"/>
+		<slider label="Y" name="WaterWave2DirY"/>
+		<text name="DensMultText">
+			上折射比例
+		</text>
+		<text name="WaterScaleBelowText">
+			下折射比例
+		</text>
+		<text name="MaxAltText">
+			模糊倍數
+		</text>
+		<text name="BHText3">
+			正常地圖
+		</text>
+	</panel>
+	<check_box label="根據這自訂配置變更我水的設定" name="make_default_cb"/>
+	<button label="儲存" name="save"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
deleted file mode 100644
index 534ee7f0d0..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ENVIRONMENT EDITOR">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Time of Day
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Cloud Cover
-	</text>
-	<text name="EnvWaterColorText">
-		水色
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/>
-	<text name="EnvWaterFogText">
-		水霧
-	</text>
-	<button label="Use Estate Time" name="EnvUseEstateTimeButton"/>
-	<button label="進階天空" name="EnvAdvancedSkyButton"/>
-	<button label="進階水文" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_environment_settings.xml b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
new file mode 100755
index 0000000000..1c6f2f936d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_environment_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="環境設定">
+	<text name="note">
+		使用以下的選項自訂你 Viewer 的環境設定。
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="使用地區設定" name="use_region_settings"/>
+		<radio_item label="自訂我的環境" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="note">
+			注意：你的自訂設定不會被其他使用者看見。
+		</text>
+		<text name="water_settings_title">
+			水的設定
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-選擇一個自訂配置-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			天空 / 日循環
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="固定天空" name="my_sky_settings"/>
+			<radio_item label="日循環" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-選擇一個自訂配置-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-選擇一個自訂配置-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="確定" name="ok_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_event.xml b/indra/newview/skins/default/xui/zh/floater_event.xml
index 349b5717f2..7175731fef 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_event.xml
+++ b/indra/newview/skins/default/xui/zh/floater_event.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Event" name="Event" title="EVENT DETAILS">
+<floater label="活動" name="Event" title="活動細節">
 	<floater.string name="loading_text">
 		載入中...
 	</floater.string>
 	<floater.string name="done_text">
-		Done
+		完成
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
new file mode 100755
index 0000000000..871849305c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="fast_timers">
+	<string name="pause">
+		暫停
+	</string>
+	<string name="run">
+		跑步
+	</string>
+	<button label="暫停" name="pause_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_font_test.xml b/indra/newview/skins/default/xui/zh/floater_font_test.xml
index ec83c51eb3..ec83c51eb3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/zh/floater_font_test.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_gesture.xml b/indra/newview/skins/default/xui/zh/floater_gesture.xml
index a809cf085c..e7b1ed1de3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -7,17 +7,17 @@
 		（播放中）
 	</floater.string>
 	<floater.string name="copy_name">
-		Copy of [COPY_NAME]
+		[COPY_NAME] 複本
 	</floater.string>
 	<scroll_list name="gesture_list">
 		<scroll_list.columns label="名稱" name="name"/>
 		<scroll_list.columns label="聊天" name="trigger"/>
-		<scroll_list.columns label="Key" name="shortcut"/>
+		<scroll_list.columns label="鍵" name="shortcut"/>
 	</scroll_list>
 	<panel label="bottom_panel" name="bottom_panel">
 		<menu_button name="gear_btn" tool_tip="更多選項"/>
 		<button name="new_gesture_btn" tool_tip="製作新姿勢e"/>
-		<button name="activate_btn" tool_tip="Activate/Deactivate selected gesture"/>
+		<button name="activate_btn" tool_tip="啟動/停止所選姿勢"/>
 		<button name="del_btn" tool_tip="刪除這個姿勢"/>
 	</panel>
 	<button label="編輯" name="edit_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index 448113bf74..69a6eadc8c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -8,42 +8,42 @@
 			<text name="Region Name:">
 				地區名稱：
 			</text>
-			<check_box label="Prelude" name="check prelude" tool_tip="Set this to make the region a prelude"/>
-			<check_box label="固定太陽" name="check fixed sun" tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain"/>
-			<check_box label="Reset Home On Teleport" name="check reset home" tool_tip="When Resident teleports out, reset their home to the destination position."/>
-			<check_box label="Visible" name="check visible" tool_tip="Set this to make the region visible to non-gods"/>
-			<check_box label="傷害" name="check damage" tool_tip="Set this to enable damage in this region"/>
-			<check_box label="阻止流量追蹤" name="block dwell" tool_tip="Set this to make the region not compute traffic"/>
-			<check_box label="阻止變形" name="block terraform" tool_tip="Set this to disallow people terraforming their land"/>
-			<check_box label="沙盒" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/>
-			<button label="Bake Terrain" label_selected="Bake Terrain" name="Bake Terrain" tool_tip="儲存目前的地形為預設"/>
-			<button label="Revert Terrain" label_selected="Revert Terrain" name="Revert Terrain" tool_tip="Replace the current terrain with default"/>
-			<button label="Swap Terrain" label_selected="Swap Terrain" name="Swap Terrain" tool_tip="Swap current terrain with default"/>
+			<check_box label="導引區" name="check prelude" tool_tip="在此設定，將區域設為導引區"/>
+			<check_box label="固定太陽" name="check fixed sun" tool_tip="固定太陽位置（如同地區/領地 &gt; 地形）"/>
+			<check_box label="瞬間傳送時重設家的位置" name="check reset home" tool_tip="居民瞬間傳送離開時，將他們的家重設為瞬間傳送的目的地。"/>
+			<check_box label="可看到" name="check visible" tool_tip="在此設定，將區域設為可讓非神者看到。"/>
+			<check_box label="傷害" name="check damage" tool_tip="在此設定，使本地區允許傷害。"/>
+			<check_box label="阻止流量追蹤" name="block dwell" tool_tip="在此設定，使本區域不計算流量。"/>
+			<check_box label="阻止土地變形" name="block terraform" tool_tip="設定禁止人們將其土地變形。"/>
+			<check_box label="沙盤" name="is sandbox" tool_tip="切換是否設為沙盤區域。"/>
+			<button label="確定地形" label_selected="確定地形" name="Bake Terrain" tool_tip="將目前的地形儲存為預設值"/>
+			<button label="回復原地形" label_selected="回復原地形" name="Revert Terrain" tool_tip="以預設值取代目前的地形"/>
+			<button label="交換地形" label_selected="交換地形" name="Swap Terrain" tool_tip="將目前的地形和預設值交換"/>
 			<text name="estate id">
 				領地 ID：
 			</text>
 			<text name="parent id">
-				Parent ID:
+				母領地 ID：
 			</text>
-			<line_editor name="parentestate" tool_tip="This is the parent estate for this region"/>
+			<line_editor name="parentestate" tool_tip="這是本區域的母領地"/>
 			<text name="Grid Pos: ">
 				網格位置：
 			</text>
-			<line_editor name="gridposx" tool_tip="This is the grid x position for this region"/>
-			<line_editor name="gridposy" tool_tip="This is the grid y position for this region"/>
+			<line_editor name="gridposx" tool_tip="這是本區域的網格 X 位置"/>
+			<line_editor name="gridposy" tool_tip="這是本區域的網格 Y 位置"/>
 			<text name="Redirect to Grid: ">
-				Redirect to Grid:
+				重新導向至網格：
 			</text>
 			<text name="billable factor text">
-				Billable Factor:
+				收費率：
 			</text>
 			<text name="land cost text">
-				L$ per m²:
+				每平方公尺 L$：
 			</text>
-			<button label="重新整理" label_selected="重新整理" name="Refresh" tool_tip="Click here to refresh the above information"/>
-			<button label="套用" label_selected="套用" name="Apply" tool_tip="點擊此處以接受套用上述變更"/>
-			<button label="選擇地區" label_selected="選擇地區" name="Select Region" tool_tip="Select the whole region with the land tool"/>
-			<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="Save gzipped state to autosave directory"/>
+			<button label="重新整理" label_selected="重新整理" name="Refresh" tool_tip="點按這裡刷新上列資料"/>
+			<button label="套用" label_selected="套用" name="Apply" tool_tip="點按此處以接受套用上述變更"/>
+			<button label="選擇地區" label_selected="選擇地區" name="Select Region" tool_tip="以土地工具選取整個區域"/>
+			<button label="立即自動儲存" label_selected="立即自動儲存" name="Autosave now" tool_tip="儲存 gzip 壓縮狀態至自動儲存目錄"/>
 		</panel>
 		<panel label="物件" name="objects">
 			<panel.string name="no_target">
@@ -53,44 +53,44 @@
 				地區名稱：
 			</text>
 			<text name="region name">
-				Welsh
+				威爾斯
 			</text>
 			<check_box label="關閉腳本" name="disable scripts" tool_tip="關閉這個地區現在的全部腳本"/>
-			<check_box label="Disable Collisions" name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region"/>
-			<check_box label="Disable Physics" name="disable physics" tool_tip="Set this to disable all physics in this region"/>
-			<button label="套用" label_selected="套用" name="Apply" tool_tip="Click here to apply any changes from above"/>
-			<button label="Set Target" label_selected="Set Target" name="Set Target" tool_tip="Set the target avatar for object deletion"/>
+			<check_box label="禁止碰撞" name="disable collisions" tool_tip="設置關閉地區內除了人以外的碰撞"/>
+			<check_box label="關閉物理" name="disable physics" tool_tip="設置關閉本區域內所有物理"/>
+			<button label="套用" label_selected="套用" name="Apply" tool_tip="點按此處以接受套用上述變更"/>
+			<button label="設定目標" label_selected="設定目標" name="Set Target" tool_tip="將目標化身設為待刪除的物件"/>
 			<text name="target_avatar_name">
 				（無目標）
 			</text>
-			<button label="Delete Target&apos;s Scripted Objects On Others Land" label_selected="Delete Target&apos;s Scripted Objects On Others Land" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."/>
-			<button label="Delete Target&apos;s Scripted Objects On *Any* Land" label_selected="Delete Target&apos;s Scripted Objects On *Any* Land" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."/>
-			<button label="Delete *ALL* Of Target&apos;s Objects" label_selected="Delete *ALL* Of Target&apos;s Objects" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."/>
-			<button label="Get Top Colliders" label_selected="Get Top Colliders" name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks"/>
-			<button label="Get Top Scripts" label_selected="Get Top Scripts" name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts"/>
-			<button label="Scripts digest" label_selected="Scripts digest" name="Scripts digest" tool_tip="Gets a list of all scripts and number of occurences of each"/>
+			<button label="刪除目標物在其他土地的帶腳本的物件" label_selected="刪除目標物在其他土地的帶腳本的物件" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="在不是目標物所擁有的土地上，刪除屬於該目標物的所有帶腳本的物件。 「禁止複製」的物件將被送回。"/>
+			<button label="刪除目標物在任何土地的帶腳本的物件" label_selected="刪除目標物在任何土地的帶腳本的物件" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="刪除本區域內屬於目標物的所有帶腳本的物件。 「禁止複製」的物件將被送回。"/>
+			<button label="刪除目標物所有的物件" label_selected="刪除目標物所有的物件" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="刪除本區域內屬於目標物的所有物件。 「禁止複製」的物件將被送回。"/>
+			<button label="取得最常碰撞的物件" label_selected="取得最常碰撞的物件" name="Get Top Colliders" tool_tip="取得經歷最多次「窄相」回調的物件清單"/>
+			<button label="取得排名最高的腳本" label_selected="取得排名最高的腳本" name="Get Top Scripts" tool_tip="取得花最多時間執行腳本的物件清單"/>
+			<button label="腳本集" label_selected="腳本集" name="Scripts digest" tool_tip="取得所有腳本清單，並列出發生次數，針對每一"/>
 		</panel>
-		<panel label="Request" name="request">
+		<panel label="請求" name="request">
 			<text name="Destination:">
-				Destination:
+				目的地：
 			</text>
 			<combo_box name="destination">
-				<combo_box.item label="Selection" name="item1"/>
-				<combo_box.item label="Agent Region" name="item2"/>
+				<combo_box.item label="選擇" name="item1"/>
+				<combo_box.item label="用戶地區" name="item2"/>
 			</combo_box>
 			<text name="Request:">
-				Request:
+				請求：
 			</text>
 			<combo_box name="request">
-				<combo_box.item label="colliders &lt;steps&gt;" name="item1"/>
-				<combo_box.item label="scripts &lt;count&gt;,&lt;optional pattern&gt;" name="item2"/>
-				<combo_box.item label="objects &lt;pattern&gt;" name="item3"/>
+				<combo_box.item label="碰撞物 &lt;步驟&gt;" name="item1"/>
+				<combo_box.item label="腳本 &lt;計數&gt;,&lt;非必要形態&gt;" name="item2"/>
+				<combo_box.item label="物件 &lt;形態&gt;" name="item3"/>
 				<combo_box.item label="rez &lt;asset_id&gt;" name="item4"/>
 			</combo_box>
 			<text name="Parameter:">
-				Parameter:
+				參數：
 			</text>
-			<button label="Make Request" label_selected="Make Request" name="Make Request"/>
+			<button label="提出請求" label_selected="提出請求" name="Make Request"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_goto_line.xml b/indra/newview/skins/default/xui/zh/floater_goto_line.xml
new file mode 100644
index 0000000000..e0215aef8a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_goto_line.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script goto" title="前往某行數">
+	<button label="確定" label_selected="確定" name="goto_btn"/>
+	<text name="txt">
+		前往某行數
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
index 1465dcb256..9e3bb88ac0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Hardware Settings Floater" title="硬體設定">
 	<text name="Filtering:">
-		Filtering:
+		過濾：
 	</text>
-	<check_box label="Anisotropic Filtering (slower when enabled)" name="ani"/>
-	<text name="Antialiasing:">
-		Antialiasing:
+	<check_box label="各向異性過濾（若啟用會變慢）" name="ani"/>
+	<text name="antialiasing label">
+		消除鋸齒：
 	</text>
-	<combo_box label="Antialiasing" name="fsaa">
-		<combo_box.item label="Disabled" name="FSAADisabled"/>
+	<combo_box label="消除鋸齒" name="fsaa">
+		<combo_box.item label="已停用" name="FSAADisabled"/>
 		<combo_box.item label="2x" name="2x"/>
 		<combo_box.item label="4x" name="4x"/>
 		<combo_box.item label="8x" name="8x"/>
@@ -17,15 +17,19 @@
 	<text name="antialiasing restart">
 		（須重新啟動瀏覽器）
 	</text>
-	<spinner label="Gamma:" name="gamma"/>
+	<spinner label="伽瑪值：" name="gamma"/>
 	<text name="(brightness, lower is brighter)">
-		(0 = default brightness, lower = brighter)
+		（0 = 預設亮度；值越小 = 亮度越高）
 	</text>
 	<text name="Enable VBO:">
-		Enable VBO:
+		啟用頂點緩衝物件(VBO)：
 	</text>
-	<check_box initial_value="true" label="Enable OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
-	<slider label="材質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="Amount of memory to allocate for textures. Defaults to video card memory. Reducing this may improve performance but may also make textures blurry."/>
-	<spinner label="Fog Distance Ratio:" name="fog"/>
+	<check_box initial_value="true" label="啟用 OpenGL 頂點緩衝物件(VBO)" name="vbo" tool_tip="在較新硬體上啟用，可提升效能。  但是，較舊硬體的 VBO 實作不佳，若啟用可能導致當機。"/>
+	<text name="tc label">
+		啟用 S3TC：
+	</text>
+	<check_box initial_value="true" label="啟用材質壓縮（須重新啟動）" name="texture compression" tool_tip="在影片記憶體中壓縮材質，讓高解析度材質可以載入，但色彩品質稍差。"/>
+	<slider label="材質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="配置給材質使用的記憶體量。 預設為顯像卡記憶體。 降低此值可以提升效能，但材質也會變模糊。"/>
+	<spinner label="霧距離比率：" name="fog"/>
 	<button label="確定" label_selected="確定" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_help_browser.xml b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
index e605d5f19c..e605d5f19c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_help_browser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_help_browser.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml
new file mode 100755
index 0000000000..e033327165
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_how_to.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_how_to" title="簡易教學"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_hud.xml b/indra/newview/skins/default/xui/zh/floater_hud.xml
index a788961e95..a788961e95 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_hud.xml
+++ b/indra/newview/skins/default/xui/zh/floater_hud.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 2d66c659fe..84ad869100 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談"/>
+<multi_floater name="floater_im_box" title="交談">
+	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<string name="expand_icon" value="Conv_toolbar_expand"/>
+	<layout_stack name="conversations_stack">
+		<layout_panel name="conversations_layout_panel">
+			<layout_stack name="conversations_pane_buttons_stack">
+				<layout_panel name="conversations_pane_buttons_expanded">
+					<menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
+					<button name="add_btn" tool_tip="開始新的交談"/>
+					<button name="speak_btn" tool_tip="用麥克風和大家交談"/>
+				</layout_panel>
+				<layout_panel name="conversations_pane_buttons_collapsed">
+					<button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="messages_layout_panel">
+			<panel_container name="im_box_tab_container">
+				<panel name="stub_panel">
+					<button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
+					<text name="stub_textbox">
+						這個交談另開了新視窗。   [secondlife:/// 把它收回來]
+					</text>
+				</panel>
+			</panel_container>
+		</layout_panel>
+	</layout_stack>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index e8db97560e..864af2e592 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,8 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<layout_stack name="im_panels">
-		<layout_panel>
-			<line_editor label="To" name="chat_editor"/>
-		</layout_panel>
-	</layout_stack>
+	<floater.string name="call_btn_start">
+		Conv_toolbar_open_call
+	</floater.string>
+	<floater.string name="call_btn_stop">
+		Conv_toolbar_hang_up
+	</floater.string>
+	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
+	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
+	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
+	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
+	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
+	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
+	<floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
+	<floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
+	<floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
+	<floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
+	<floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
+	<floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
+	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
+	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
+	<view name="contents_view">
+		<layout_stack name="main_stack">
+			<layout_panel name="toolbar_panel">
+				<menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<button name="add_btn" tool_tip="新增某人到這個交談"/>
+				<button name="voice_call_btn" tool_tip="建立語音通聯"/>
+				<button name="close_btn" tool_tip="結束這個交談"/>
+				<button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
+			</layout_panel>
+			<layout_panel name="body_panel">
+				<layout_stack name="im_panels">
+					<layout_panel name="right_part_holder">
+						<layout_stack name="translate_and_chat_stack">
+							<layout_panel name="translate_chat_checkbox_lp">
+								<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+							</layout_panel>
+						</layout_stack>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+			<layout_panel name="chat_layout_panel">
+				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<chat_editor label="至" name="chat_editor"/>
+					</layout_panel>
+					<layout_panel name="input_button_layout_panel">
+						<button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
+					</layout_panel>
+				</layout_stack>
+			</layout_panel>
+		</layout_stack>
+	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index 1260601f90..d2de37fa6a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -26,7 +26,7 @@
 
 請嘗試儲存圖像為 24 位元 Targa（.tga）格式。
 	</text>
-	<check_box label="Use lossless compression" name="lossless_check"/>
+	<check_box label="使用零失真壓縮" name="lossless_check"/>
 	<button label="取消" name="cancel_btn"/>
 	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
new file mode 100755
index 0000000000..8f6b476ccf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="匯入場景">
+	<text name="mesh count">
+		網面：[COUNT]
+	</text>
+	<text name="texture count">
+		材質： [COUNT]
+	</text>
+	<text name="status">
+		狀態：[STATUS]
+	</text>
+	<button label="取消" name="cancel"/>
+	<button label="確定" name="ok"/>
+	<string name="status_idle">
+		閒置中
+	</string>
+	<string name="status_uploading">
+		正在上傳 [NAME]
+	</string>
+	<string name="status_creating">
+		正在建立 [NAME] 物件
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index a0f31fa11f..4526eff21d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -4,30 +4,30 @@
 		5
 	</floater.string>
 	<floater.string name="localchat">
-		附近的音聊天
+		附近的語音聊天
 	</floater.string>
 	<floater.string name="anonymous">
 		匿名
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		通話中。
+		來電中。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
-		已加訴入會議交談中的語音聊天。
+		已加入多方語音通話。
 	</floater.string>
 	<floater.string name="VoiceInviteGroup">
 		剛加入 &apos;[GROUP]&apos; 語音頻道。
 	</floater.string>
 	<floater.string name="VoiceInviteQuestionGroup">
-		Would you like to leave [CURRENT_CHAT] and join the call with &apos;[GROUP]&apos;?
+		是否離開 [CURRENT_CHAT] 並加入和「[GROUP]」通話？
 	</floater.string>
 	<floater.string name="VoiceInviteQuestionDefault">
-		Do you want to leave [CURRENT_CHAT] and join this voice chat?
+		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		Do you want to leave [CURRENT_CHAT] and join this voice chat?
+		如果接聽，你將切斷目前的語音交談。
 	</text>
-	<button label="接受" label_selected="接受" name="Accept"/>
-	<button label="拒絕" label_selected="拒絕" name="Reject"/>
-	<button label="開始 IM" name="Start IM"/>
+	<button label="接聽" label_selected="接聽" name="Accept"/>
+	<button label="忽視" label_selected="忽視" name="Reject"/>
+	<button label="不接聽但開啟 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inspect.xml b/indra/newview/skins/default/xui/zh/floater_inspect.xml
index ea3d9d0c3e..4e1f4b24fd 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="INSPECT OBJECTS">
+<floater name="inspect" title="檢視物件">
 	<floater.string name="timeStamp">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</floater.string>
-	<scroll_list name="object_list" tool_tip="Select an object from this list to highlight it in-world">
+	<scroll_list name="object_list" tool_tip="從清單中選取一物件，在虛擬世界中加以高亮顯示。">
 		<scroll_list.columns label="物件名稱" name="object_name"/>
-		<scroll_list.columns label="擁有者名稱" name="owner_name"/>
+		<scroll_list.columns label="所有人名稱" name="owner_name"/>
 		<scroll_list.columns label="創造者名稱" name="creator_name"/>
 		<scroll_list.columns label="創造日期" name="creation_date"/>
 	</scroll_list>
-	<button label="察看擁有者檔案..." name="button owner" tool_tip="See profile of the highlighted object&apos;s owner"/>
-	<button label="察看創造者檔案..." name="button creator" tool_tip="See profile of the highlighted object&apos;s original creator"/>
+	<button label="察看所有人檔案..." name="button owner" tool_tip="察看高亮顯示的物件的物主個人檔案"/>
+	<button label="察看創造人檔案..." name="button creator" tool_tip="察看高亮顯示的物件的原創人個人檔案"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory.xml b/indra/newview/skins/default/xui/zh/floater_inventory.xml
deleted file mode 100644
index da4619c964..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="我的收納區">
-	<panel label="收納區面板" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index a41be7ef9a..6998df75f3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -10,7 +10,7 @@
 		你可以：
 	</floater.string>
 	<floater.string name="owner_can">
-		擁有者可以：
+		所有人可以：
 	</floater.string>
 	<floater.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
@@ -26,11 +26,11 @@
 	</text>
 	<button label="檔案..." name="BtnCreator"/>
 	<text name="LabelOwnerTitle">
-		擁有者：
+		所有人：
 	</text>
 	<button label="檔案..." name="BtnOwner"/>
 	<text name="LabelAcquiredTitle">
-		Acquired:
+		取得於：
 	</text>
 	<text name="LabelAcquiredDate">
 		Wed May 24 12:50:46 2006
@@ -39,25 +39,25 @@
 		你：
 	</text>
 	<check_box label="編輯" name="CheckOwnerModify"/>
-	<check_box label="覆製" name="CheckOwnerCopy"/>
+	<check_box label="恚庨" name="CheckOwnerCopy"/>
 	<check_box label="轉售" name="CheckOwnerTransfer"/>
 	<text name="AnyoneLabel">
 		任何人：
 	</text>
-	<check_box label="覆製" name="CheckEveryoneCopy"/>
+	<check_box label="恚庨" name="CheckEveryoneCopy"/>
 	<text name="GroupLabel">
 		群組：
 	</text>
 	<check_box label="分享" name="CheckShareWithGroup"/>
 	<text name="NextOwnerLabel">
-		下一個擁有者：
+		下一個所有人：
 	</text>
 	<check_box label="編輯" name="CheckNextOwnerModify"/>
-	<check_box label="覆製" name="CheckNextOwnerCopy"/>
+	<check_box label="恚庨" name="CheckNextOwnerCopy"/>
 	<check_box label="轉售" name="CheckNextOwnerTransfer"/>
 	<check_box label="出售" name="CheckPurchase"/>
 	<combo_box name="combobox sale copy">
-		<combo_box.item label="副本" name="Copy"/>
+		<combo_box.item label="恚庨" name="Copy"/>
 		<combo_box.item label="原件" name="Original"/>
 	</combo_box>
 	<spinner label="價格：" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index d698edf5e5..6d1d18b67c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -5,16 +5,17 @@
 	<check_box label="服裝" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
+	<check_box label="網面" name="check_mesh"/>
 	<check_box label="記事卡" name="check_notecard"/>
-	<check_box label="Objects" name="check_object"/>
+	<check_box label="物件" name="check_object"/>
 	<check_box label="腳本" name="check_script"/>
-	<check_box label="Sounds" name="check_sound"/>
+	<check_box label="聲音" name="check_sound"/>
 	<check_box label="材質" name="check_texture"/>
-	<check_box label="Snapshots" name="check_snapshot"/>
+	<check_box label="快照" name="check_snapshot"/>
 	<button label="全部" label_selected="全部" name="All"/>
 	<button label="無" label_selected="無" name="None"/>
-	<check_box label="Always show folders" name="check_show_empty"/>
-	<check_box label="Since Logoff" name="check_since_logoff"/>
+	<check_box label="固定顯示資料夾" name="check_show_empty"/>
+	<check_box label="自上次登出" name="check_since_logoff"/>
 	<text name="- OR -">
 		- 或 -
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_joystick.xml b/indra/newview/skins/default/xui/zh/floater_joystick.xml
index 1721f7cd1e..e0b2cf5a1c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/zh/floater_joystick.xml
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="JOYSTICK CONFIGURATION">
+<floater name="Joystick" title="搖桿設置">
 	<floater.string name="NoDevice">
 		未偵測到設備
 	</floater.string>
-	<check_box label="Enable Joystick:" name="enable_joystick"/>
-	<spinner label="X Axis Mapping" name="JoystickAxis1"/>
-	<spinner label="Y Axis Mapping" name="JoystickAxis2"/>
-	<spinner label="Z Axis Mapping" name="JoystickAxis0"/>
-	<spinner label="Pitch Mapping" name="JoystickAxis4"/>
-	<spinner label="Yaw Mapping" name="JoystickAxis5"/>
-	<spinner label="Roll Mapping" name="JoystickAxis3"/>
-	<spinner label="Zoom Mapping" name="JoystickAxis6"/>
-	<check_box label="Direct Zoom" name="ZoomDirect"/>
-	<check_box label="3D Cursor" name="Cursor3D"/>
-	<check_box label="Auto Level" name="AutoLeveling"/>
+	<check_box label="啟用搖桿：" name="enable_joystick"/>
+	<spinner label="X 軸映射" name="JoystickAxis1"/>
+	<spinner label="Y 軸映射" name="JoystickAxis2"/>
+	<spinner label="Z 軸映射" name="JoystickAxis0"/>
+	<spinner label="俯仰映射" name="JoystickAxis4"/>
+	<spinner label="偏擺映射" name="JoystickAxis5"/>
+	<spinner label="翻滾映射" name="JoystickAxis3"/>
+	<spinner label="縮放映射" name="JoystickAxis6"/>
+	<check_box label="直接縮放" name="ZoomDirect"/>
+	<check_box label="三維游標" name="Cursor3D"/>
+	<check_box label="自動水平" name="AutoLeveling"/>
 	<text name="Control Modes:">
-		Control Modes:
+		控制模式：
 	</text>
 	<check_box label="化身" name="JoystickAvatarEnabled"/>
 	<check_box label="建造" name="JoystickBuildEnabled"/>
-	<check_box label="Flycam" name="JoystickFlycamEnabled"/>
-	<stat_view label="Joystick Monitor" name="axis_view">
-		<stat_bar label="Axis 0" name="axis0"/>
-		<stat_bar label="Axis 1" name="axis1"/>
-		<stat_bar label="Axis 2" name="axis2"/>
-		<stat_bar label="Axis 3" name="axis3"/>
-		<stat_bar label="Axis 4" name="axis4"/>
-		<stat_bar label="Axis 5" name="axis5"/>
+	<check_box label="移動攝影機" name="JoystickFlycamEnabled"/>
+	<stat_view label="搖桿監控器" name="axis_view">
+		<stat_bar label="軸 0" name="axis0"/>
+		<stat_bar label="軸 1" name="axis1"/>
+		<stat_bar label="軸 2" name="axis2"/>
+		<stat_bar label="軸 3" name="axis3"/>
+		<stat_bar label="軸 4" name="axis4"/>
+		<stat_bar label="軸 5" name="axis5"/>
 	</stat_view>
 	<text name="XScale">
-		X Scale
+		X 比例
 	</text>
 	<text name="YScale">
-		Y Scale
+		Y 比例
 	</text>
 	<text name="ZScale">
-		Z Scale
+		Z 比例
 	</text>
 	<text name="PitchScale">
-		Pitch Scale
+		俯仰比例
 	</text>
 	<text name="YawScale">
-		Yaw Scale
+		偏擺比例
 	</text>
 	<text name="RollScale">
-		Roll Scale
+		翻滾比例
 	</text>
 	<text name="XDeadZone">
-		X Dead Zone
+		X 死區
 	</text>
 	<text name="YDeadZone">
-		Y Dead Zone
+		Y 死區
 	</text>
 	<text name="ZDeadZone">
-		Z Dead Zone
+		Z 死區
 	</text>
 	<text name="PitchDeadZone">
-		Pitch Dead Zone
+		俯仰死區
 	</text>
 	<text name="YawDeadZone">
-		Yaw Dead Zone
+		偏擺死區
 	</text>
 	<text name="RollDeadZone">
-		Roll Dead Zone
+		翻滾死區
 	</text>
 	<text name="Feathering">
-		Feathering
+		重量反應
 	</text>
 	<text name="ZoomScale2">
-		Zoom Scale
+		縮放比例
 	</text>
 	<text name="ZoomDeadZone">
-		Zoom Dead Zone
+		縮放死區
 	</text>
-	<button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults"/>
+	<button label="SpaceNavigator 預設值" name="SpaceNavigatorDefaults"/>
 	<button label="確定" label_selected="確定" name="ok_btn"/>
 	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
index 6e58e7332f..e9a082288a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -7,7 +7,7 @@
 		360
 	</floater.string>
 	<floater.string name="min_title_msg">
-		Lag
+		延遲
 	</floater.string>
 	<floater.string name="min_width_px">
 		90
@@ -22,28 +22,28 @@
 		15
 	</floater.string>
 	<floater.string name="client_frame_time_window_bg_msg">
-		Normal, window in background
+		正常，視窗位於背景
 	</floater.string>
 	<floater.string name="client_frame_time_critical_msg">
-		Client frame rate below [CLIENT_FRAME_RATE_CRITICAL]
+		客戶端幀率低於 [CLIENT_FRAME_RATE_CRITICAL]
 	</floater.string>
 	<floater.string name="client_frame_time_warning_msg">
-		Client frame rate between [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
+		客戶端幀率介於 [CLIENT_FRAME_RATE_CRITICAL] 和 [CLIENT_FRAME_RATE_WARNING] 之間
 	</floater.string>
 	<floater.string name="client_frame_time_normal_msg">
 		正常
 	</floater.string>
 	<floater.string name="client_draw_distance_cause_msg">
-		Possible cause: Draw distance set too high
+		可能原因：可視距離設得太遠
 	</floater.string>
 	<floater.string name="client_texture_loading_cause_msg">
-		Possible cause: Images loading
+		可能原因：正在載入圖像
 	</floater.string>
 	<floater.string name="client_texture_memory_cause_msg">
-		Possible cause: Too many images in memory
+		可能原因：記憶體裡圖像太多
 	</floater.string>
 	<floater.string name="client_complex_objects_cause_msg">
-		Possible cause: Too many complex objects in scene
+		可能原因：場景內複雜物件太多
 	</floater.string>
 	<floater.string name="network_text_msg">
 		網路
@@ -55,10 +55,10 @@
 		5
 	</floater.string>
 	<floater.string name="network_packet_loss_critical_msg">
-		Connection is dropping over [NETWORK_PACKET_LOSS_CRITICAL]% of packets
+		這次連通丟失了至少 [NETWORK_PACKET_LOSS_CRITICAL]% 的封包
 	</floater.string>
 	<floater.string name="network_packet_loss_warning_msg">
-		Connection is dropping [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% of packets
+		這次連通丟失了 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% 的封包
 	</floater.string>
 	<floater.string name="network_performance_normal_msg">
 		正常
@@ -70,16 +70,16 @@
 		300
 	</floater.string>
 	<floater.string name="network_ping_critical_msg">
-		Connection ping time is over [NETWORK_PING_CRITICAL] ms
+		探測連通回應時間超過 [NETWORK_PING_CRITICAL] 毫秒
 	</floater.string>
 	<floater.string name="network_ping_warning_msg">
-		Connection ping time is [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+		探測連通回應時間為 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒
 	</floater.string>
 	<floater.string name="network_packet_loss_cause_msg">
-		Possible bad connection or &apos;Bandwidth&apos; pref too high.
+		可能連通不良，或所設的偏好連通頻寬過高。
 	</floater.string>
 	<floater.string name="network_ping_cause_msg">
-		Possible bad connection or file-sharing app.
+		可能連通不良，或使用檔案分享應用程式。
 	</floater.string>
 	<floater.string name="server_text_msg">
 		伺服器
diff --git a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index 1d172f63e1..aae2cfb466 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="我的土地">
 	<floater.string name="area_string">
-		[AREA] m²
+		[AREA] 平方公尺
 	</floater.string>
 	<scroll_list name="parcel list">
 		<scroll_list.columns label="地段" name="name"/>
@@ -12,28 +12,28 @@
 	<button label="瞬間傳送" label_selected="瞬間傳送" name="Teleport" tool_tip="瞬間傳送到這土地的中央。"/>
 	<button label="地圖" label_selected="地圖" name="Show on Map" tool_tip="將這塊土地顯示在世界地圖上。"/>
 	<text name="contrib_label">
-		Contributions to your groups:
+		對你的群組的貢獻：
 	</text>
 	<scroll_list name="grant list">
 		<scroll_list.columns label="群組" name="group"/>
 		<scroll_list.columns label="區域" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
-		Allowed land holdings at current payment plan:
+		目前付費計劃所允許擁有的土地：
 	</text>
 	<text name="allowed_text">
-		[AREA] m²
+		[AREA] 平方公尺
 	</text>
 	<text name="current_label">
-		Current land holdings:
+		目前擁有的土地：
 	</text>
 	<text name="current_text">
-		[AREA] m²
+		[AREA] 平方公尺
 	</text>
 	<text name="available_label">
-		Available for land purchases:
+		可購土地：
 	</text>
 	<text name="available_text">
-		[AREA] m²
+		[AREA] 平方公尺
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index fe61c312ed..f4a7ba5cca 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="腳本：　新腳本">
 	<floater.string name="not_allowed">
-		You can not view or edit this script, since it has been set as &quot;no copy&quot;. You need full permissions to view or edit a script inside an object.
+		你無法察看或編輯這腳本，它被設為「禁止複製」。 你需要完整權限去察看或編輯物件內的腳本。
 	</floater.string>
 	<floater.string name="script_running">
 		執行中
diff --git a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
index e5c3c47827..b10a480b06 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="LSL REFERENCE">
-	<check_box label="Follow cursor" name="lock_check"/>
-	<combo_box label="Lock" name="history_combo"/>
-	<button label="Back" name="back_btn"/>
-	<button label="Forward" name="fwd_btn"/>
+<floater name="script ed float" title="LSL 參考">
+	<check_box label="跟隨游標" name="lock_check"/>
+	<combo_box label="鎖定" name="history_combo"/>
+	<button label="返回" name="back_btn"/>
+	<button label="向前" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_map.xml b/indra/newview/skins/default/xui/zh/floater_map.xml
index b535ef0074..8a030b3b3f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_map.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Map" title="">
+<floater name="Map" title="迷你地圖">
 	<floater.string name="ToolTipMsg">
-		[REGION](Double-click to open Map, shift-drag to pan)
+		[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）
 	</floater.string>
 	<floater.string name="AltToolTipMsg">
-		[REGION](Double-click to teleport, shift-drag to pan)
+		[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）
 	</floater.string>
 	<floater.string name="mini_map_caption">
-		MINIMAP
+		迷你地圖
 	</floater.string>
-	<text label="N" name="floater_map_north">
-		N
+	<text label="北" name="floater_map_north">
+		北
 	</text>
 	<text label="E" name="floater_map_east">
 		E
 	</text>
-	<text label="W" name="floater_map_west">
-		W
+	<text label="西" name="floater_map_west">
+		西
 	</text>
-	<text label="S" name="floater_map_south">
-		S
+	<text label="南" name="floater_map_south">
+		南
 	</text>
-	<text label="SE" name="floater_map_southeast">
-		SE
+	<text label="東南" name="floater_map_southeast">
+		東南
 	</text>
-	<text label="NE" name="floater_map_northeast">
-		NE
+	<text label="東北" name="floater_map_northeast">
+		東北
 	</text>
-	<text label="SW" name="floater_map_southwest">
-		SW
+	<text label="西南" name="floater_map_southwest">
+		西南
 	</text>
-	<text label="NW" name="floater_map_northwest">
-		NW
+	<text label="西北" name="floater_map_northwest">
+		西北
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
index 6e75016fad..7f030924e1 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -8,13 +8,13 @@
 	</floater.string>
 	<layout_stack name="stack1">
 		<layout_panel name="nav_controls">
-			<button label="向後" name="back"/>
+			<button label="返回" name="back"/>
 			<button label="向前" name="forward"/>
-			<button label="重載" name="reload"/>
-			<button label="Go" name="go"/>
+			<button label="重新載入" name="reload"/>
+			<button label="前往" name="go"/>
 		</layout_panel>
 		<layout_panel name="time_controls">
-			<button label="rewind" name="rewind"/>
+			<button label="倒轉" name="rewind"/>
 			<button label="停止" name="stop"/>
 			<button label="向前" name="seek"/>
 		</layout_panel>
@@ -22,8 +22,8 @@
 			<button label="送出目前頁面到地段" name="assign"/>
 		</layout_panel>
 		<layout_panel name="external_controls">
-			<button label="在我的網頁瀏覽器中開啟" name="open_browser"/>
-			<check_box label="總是在我的網頁瀏覽器中開啟" name="open_always"/>
+			<button label="用我的瀏覽器開啟" name="open_browser"/>
+			<check_box label="固定用我的瀏覽器開啟" name="open_always"/>
 			<button label="關閉" name="close"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/floater_media_settings.xml b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
index f42c0af3d9..3984095a65 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_media_settings.xml
+++ b/indra/newview/skins/default/xui/zh/floater_media_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="media_settings" title="MEDIA SETTINGS">
+<floater name="media_settings" title="媒體設定">
 	<button label="確定" label_selected="確定" name="OK"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 	<button label="套用" label_selected="套用" name="Apply"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
index 93c1b58df6..350254e385 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="MemLeak" title="SIMULATE A MEMORY LEAK">
-	<spinner label="Leaking Speed (bytes per frame):" name="leak_speed"/>
-	<spinner label="Max Leaked Memory (MB):" name="max_leak"/>
+<floater name="MemLeak" title="模擬記憶體漏耗">
+	<spinner label="漏耗速度（位元組/幀）：" name="leak_speed"/>
+	<spinner label="最大記憶體漏耗（MB）：" name="max_leak"/>
 	<text name="total_leaked_label">
-		Current leaked memory: [SIZE] KB
+		目前已漏耗記憶體：[SIZE] KB
 	</text>
 	<text name="note_label_1">
 		[NOTE1]
@@ -11,8 +11,8 @@
 	<text name="note_label_2">
 		[NOTE2]
 	</text>
-	<button label="Start" name="start_btn"/>
+	<button label="開始" name="start_btn"/>
 	<button label="停止" name="stop_btn"/>
-	<button label="Release" name="release_btn"/>
+	<button label="釋放" name="release_btn"/>
 	<button label="關閉" name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
new file mode 100755
index 0000000000..6b6126c8e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_merchant_outbox" title="商家發件匣">
+	<string name="OutboxFolderCount1">
+		1 個資料夾
+	</string>
+	<string name="OutboxFolderCountN">
+		[NUM] 個資料夾
+	</string>
+	<string name="OutboxImporting">
+		正在傳送資料夾…
+	</string>
+	<string name="OutboxInitializing">
+		正在初始化…
+	</string>
+	<panel label="">
+		<panel>
+			<panel name="outbox_inventory_placeholder_panel">
+				<text name="outbox_inventory_placeholder_title">
+					載入中...
+				</text>
+			</panel>
+		</panel>
+		<panel>
+			<button label="送往第二人生購物市集" name="outbox_import_btn" tool_tip="推到我第二人生購物市集的店面"/>
+		</panel>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
new file mode 100755
index 0000000000..22b3d3b065
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="上傳模型">
+	<string name="status_idle"/>
+	<string name="status_parse_error">
+		錯誤：剖析 dae 時出錯，詳見記錄檔。
+	</string>
+	<string name="status_material_mismatch">
+		錯誤：模型材料並非參考模型的子集合。
+	</string>
+	<string name="status_reading_file">
+		載入中...
+	</string>
+	<string name="status_generating_meshes">
+		正在生成網面…
+	</string>
+	<string name="status_vertex_number_overflow">
+		錯誤：頂點數目超過 65534，程序已中止！
+	</string>
+	<string name="bad_element">
+		錯誤：無效的元件
+	</string>
+	<string name="high">
+		高
+	</string>
+	<string name="medium">
+		中
+	</string>
+	<string name="low">
+		低
+	</string>
+	<string name="lowest">
+		最低
+	</string>
+	<string name="mesh_status_good">
+		確定產生！
+	</string>
+	<string name="mesh_status_na">
+		不適用
+	</string>
+	<string name="mesh_status_none">
+		無
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		細節層次裡，可使用材質的臉部數目不同。
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		細節層次裡，網面實例的數目不同。
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		細節層次裡，頂點數目太多。
+	</string>
+	<string name="mesh_status_missing_lod">
+		缺乏需要的細節層次。
+	</string>
+	<string name="mesh_status_invalid_material_list">
+		細節層次材料並非參考模型的子集合。
+	</string>
+	<string name="layer_all">
+		全部
+	</string>
+	<string name="decomposing">
+		分析中…
+	</string>
+	<string name="simplifying">
+		簡化中…
+	</string>
+	<string name="tbd">
+		（未定）
+	</string>
+	<panel name="left_panel">
+		<panel name="model_name_representation_panel">
+			<text name="name_label">
+				模型名稱：
+			</text>
+			<text name="model_category_label">
+				這模型代表…
+			</text>
+			<combo_box name="model_category_combo">
+				<combo_item label="選擇一項…" name="Choose one"/>
+				<combo_item label="化身形狀" name="Avatar shape"/>
+				<combo_item label="化身附件" name="Avatar attachment"/>
+				<combo_item label="會移動的物件（車輛、動物）" name="Moving object (vehicle, animal)"/>
+				<combo_item label="建製元件" name="Building Component"/>
+				<combo_item label="大型、不會移動等類型" name="Large, non moving etc"/>
+				<combo_item label="較小型、不會移動等類型" name="Smaller, non-moving etc"/>
+				<combo_item label="並非其中任何一個" name="Not really any of these"/>
+			</combo_box>
+		</panel>
+		<tab_container name="import_tab">
+			<panel label="細節層次" name="lod_panel" title="細節層次">
+				<text initial_value="來源" name="source" value="來源"/>
+				<text initial_value="三角形" name="triangles" value="三角形"/>
+				<text initial_value="頂點" name="vertices" value="頂點"/>
+				<text initial_value="高" name="high_label" value="高"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="從檔案載入"/>
+					<item name="Generate" value="產生"/>
+				</combo_box>
+				<button label="瀏覽…" name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="三角形上限"/>
+					<item name="Error Threshold" value="錯誤門檻"/>
+				</combo_box>
+				<text initial_value="0" name="high_triangles" value="0"/>
+				<text initial_value="0" name="high_vertices" value="0"/>
+				<text initial_value="中" name="medium_label" value="中"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="從檔案載入"/>
+					<item name="Generate" value="產生"/>
+					<item name="Use LoD above" value="以上使用低階細節"/>
+				</combo_box>
+				<button label="瀏覽…" name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="三角形上限"/>
+					<item name="Error Threshold" value="錯誤門檻"/>
+				</combo_box>
+				<text initial_value="0" name="medium_triangles" value="0"/>
+				<text initial_value="0" name="medium_vertices" value="0"/>
+				<text initial_value="低" name="low_label" value="低"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="從檔案載入"/>
+					<item name="Generate" value="產生"/>
+					<item name="Use LoD above" value="以上使用低階細節"/>
+				</combo_box>
+				<button label="瀏覽…" name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="三角形上限"/>
+					<item name="Error Threshold" value="錯誤門檻"/>
+				</combo_box>
+				<text initial_value="0" name="low_triangles" value="0"/>
+				<text initial_value="0" name="low_vertices" value="0"/>
+				<text initial_value="最低" name="lowest_label" value="最低"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="從檔案載入"/>
+					<item name="Generate" value="產生"/>
+					<item name="Use LoD above" value="以上使用低階細節"/>
+				</combo_box>
+				<button label="瀏覽…" name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="三角形上限"/>
+					<item name="Error Threshold" value="錯誤門檻"/>
+				</combo_box>
+				<text initial_value="0" name="lowest_triangles" value="0"/>
+				<text initial_value="0" name="lowest_vertices" value="0"/>
+				<check_box label="產生法線" name="gen_normals"/>
+				<text initial_value="皺褶角度：" name="crease_label" value="皺褶角度："/>
+				<spinner name="crease_angle" value="75"/>
+			</panel>
+			<panel label="物理" name="physics_panel">
+				<panel name="physics geometry">
+					<text name="first_step_name">
+						步驟 1：細節層次
+					</text>
+					<combo_box name="physics_lod_combo" tool_tip="物理形狀所採用的細節層次">
+						<combo_item name="choose_one">
+							選擇一項…
+						</combo_item>
+						<combo_item name="physics_high">
+							高
+						</combo_item>
+						<combo_item name="physics_medium">
+							中
+						</combo_item>
+						<combo_item name="physics_low">
+							低
+						</combo_item>
+						<combo_item name="physics_lowest">
+							最低
+						</combo_item>
+						<combo_item name="load_from_file">
+							來自檔案
+						</combo_item>
+					</combo_box>
+					<button label="瀏覽…" name="physics_browse"/>
+				</panel>
+				<panel name="physics analysis">
+					<text name="method_label">
+						步驟 2：分析
+					</text>
+					<text name="analysis_method_label">
+						方法：
+					</text>
+					<text name="quality_label">
+						品質：
+					</text>
+					<text name="smooth_method_label">
+						平滑：
+					</text>
+					<check_box label="關閉洞口" name="Close Holes (Slow)"/>
+					<button label="分析" name="Decompose"/>
+					<button label="取消" name="decompose_cancel"/>
+				</panel>
+				<panel name="physics simplification">
+					<text name="second_step_label">
+						步驟 3：簡化
+					</text>
+					<text name="simp_method_header">
+						方法：
+					</text>
+					<text name="pass_method_header">
+						階段數：
+					</text>
+					<text name="Detail Scale label">
+						細節比例：
+					</text>
+					<text name="Retain%_label">
+						保留：
+					</text>
+					<combo_box name="Combine Quality" value="1"/>
+					<button label="簡化" name="Simplify"/>
+					<button label="取消" name="simplify_cancel"/>
+				</panel>
+				<panel name="physics info">
+					<text name="results_text">
+						結果：
+					</text>
+					<text name="physics_triangles">
+						三角形：[TRIANGLES]，
+					</text>
+					<text name="physics_points">
+						頂點：[POINTS]，
+					</text>
+					<text name="physics_hulls">
+						殼面：[HULLS]
+					</text>
+				</panel>
+			</panel>
+			<panel label="上傳選項" name="modifiers_panel">
+				<text name="scale_label">
+					比例（1 = 原比例）：
+				</text>
+				<spinner name="import_scale" value="1.0"/>
+				<text name="dimensions_label">
+					規格：
+				</text>
+				<text name="import_dimensions">
+					[X] X [Y] X [Z]
+				</text>
+				<check_box label="包含材質" name="upload_textures"/>
+				<text name="include_label">
+					僅限化身模型：
+				</text>
+				<check_box label="包含表皮重量" name="upload_skin"/>
+				<check_box label="包含接點位置" name="upload_joints"/>
+				<text name="pelvis_offset_label">
+					Z 偏距（升高或降低化身）：
+				</text>
+				<spinner name="pelvis_offset" value="0.0"/>
+			</panel>
+		</tab_container>
+		<panel name="weights_and_warning_panel">
+			<button label="計算重量和費用" name="calculate_btn" tool_tip="計算重量和費用"/>
+			<button label="取消" name="cancel_btn"/>
+			<button label="上傳" name="ok_btn" tool_tip="上傳至模擬器"/>
+			<button label="清除設定並重設形式" name="reset_btn"/>
+			<text name="upload_fee">
+				上傳費用：L$ [FEE]
+			</text>
+			<text name="prim_weight">
+				土地衝擊量：[EQ]
+			</text>
+			<text name="download_weight">
+				下載：[ST]
+			</text>
+			<text name="physics_weight">
+				物理：[PH]
+			</text>
+			<text name="server_weight">
+				伺服器：[SIM]
+			</text>
+			<text name="warning_title">
+				附註：
+			</text>
+			<text name="warning_message">
+				你無權上傳網面模型。 [[VURL] 瞭解如何]通過認證。
+			</text>
+			<text name="status">
+				[STATUS]
+			</text>
+		</panel>
+	</panel>
+	<text name="lod_label">
+		預覽：
+	</text>
+	<panel name="right_panel">
+		<combo_box name="preview_lod_combo" tool_tip="要在呈像預覽中察看的細節層次">
+			<combo_item name="high">
+				高
+			</combo_item>
+			<combo_item name="medium">
+				中
+			</combo_item>
+			<combo_item name="low">
+				低
+			</combo_item>
+			<combo_item name="lowest">
+				最低
+			</combo_item>
+		</combo_box>
+		<text name="label_display">
+			顯示…
+		</text>
+		<check_box label="邊" name="show_edges"/>
+		<check_box label="物理" name="show_physics"/>
+		<check_box label="材質" name="show_textures"/>
+		<check_box label="表皮重量" name="show_skin_weight"/>
+		<check_box label="接點" name="show_joint_positions"/>
+		<text name="physics_explode_label">
+			預覽伸展：
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_moveview.xml b/indra/newview/skins/default/xui/zh/floater_moveview.xml
index e1155bdf34..0b267e8fae 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_moveview.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move_floater">
+<floater name="move_floater" title="行走 / 跑步 / 飛行">
 	<string name="walk_forward_tooltip">
-		Walk Forward (press Up Arrow or W)
+		向前走（按下向上箭頭或 W 鍵）
 	</string>
 	<string name="walk_back_tooltip">
-		Walk Backwards (press Down Arrow or S)
+		倒退行走（按下向下箭頭或 S 鍵）
 	</string>
 	<string name="walk_left_tooltip">
-		Walk left (press Shift + Left Arrow or A)
+		向左走（按下 Shift 加左方向鍵或按 A 鍵）
 	</string>
 	<string name="walk_right_tooltip">
-		Walk right (press Shift + Right Arrow or D)
+		向右走（按下 Shift 加右方向鍵或按 D 鍵）
 	</string>
 	<string name="run_forward_tooltip">
-		Run Forward (press Up Arrow or W)
+		向前跑（按下向上箭頭或 W 鍵）
 	</string>
 	<string name="run_back_tooltip">
-		Run Backwards (press Down Arrow or S)
+		倒退跑步（按下向下箭頭或 S 鍵）
 	</string>
 	<string name="run_left_tooltip">
-		Run left (press Shift + Left Arrow or A)
+		向左跑（按下 Shift + 左方向鍵或按 A 鍵）
 	</string>
 	<string name="run_right_tooltip">
-		Run right (press Shift + Right Arrow or D)
+		向右跑（按下 Shift + 右方向鍵或按 D 鍵）
 	</string>
 	<string name="fly_forward_tooltip">
 		向前飛（按下向上箭頭或 W 鍵）
@@ -65,7 +65,7 @@
 		<joystick_turn name="forward btn" tool_tip="向前走（按向上方向鍵或按 W 鍵）"/>
 		<joystick_turn name="backward btn" tool_tip="向後退（按向下方向鍵或按 S 鍵）"/>
 		<button name="move up btn" tool_tip="向上飛（按下 E 鍵）"/>
-		<button name="move down btn" tool_tip="向下飛（按下 C 建）"/>
+		<button name="move down btn" tool_tip="向下飛（按下 C 鍵）"/>
 	</panel>
 	<panel name="panel_modes">
 		<button label="" name="mode_walk_btn" tool_tip="行走模式"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
index 606e061395..64998d3e28 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="block by name" title="依名稱封鎖物件">
 	<text name="message">
-		Block an object:
+		封鎖一個物件：
 	</text>
 	<line_editor name="object_name">
 		物件名稱
 	</line_editor>
 	<text name="note">
-		* Only blocks object text, not sounds
+		* 只封鎖物件文字，不封鎖聲音
 	</text>
 	<button label="確定" name="OK"/>
 	<button label="取消" name="Cancel"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_my_appearance.xml b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
new file mode 100755
index 0000000000..217ea5d1f9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_my_appearance.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_my_appearance" title="外觀">
+	<panel label="編輯外觀" name="main_panel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_my_inventory.xml b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
new file mode 100755
index 0000000000..187597f4eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_my_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_my_inventory" title="收納區"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
deleted file mode 100644
index 38a5dab523..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="附近的聊天">
-	<check_box label="Translate chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_notification.xml b/indra/newview/skins/default/xui/zh/floater_notification.xml
index 1e0e207fb0..1e0e207fb0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_notification.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notification.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
index 3478761b0b..3478761b0b 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_notifications_console.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_object_weights.xml b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
new file mode 100755
index 0000000000..d2875b24b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_object_weights.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="object_weights" title="進階">
+	<floater.string name="nothing_selected" value="--"/>
+	<text name="selected_text" value="已選"/>
+	<text name="objects" value="--"/>
+	<text name="objects_label" value="物件"/>
+	<text name="prims" value="--"/>
+	<text name="prims_label" value="幾何元件"/>
+	<text name="weights_of_selected_text" value="所選物重量"/>
+	<text name="download" value="--"/>
+	<text name="download_label" value="下載"/>
+	<text name="physics" value="--"/>
+	<text name="physics_label" value="物理"/>
+	<text name="server" value="--"/>
+	<text name="server_label" value="伺服器"/>
+	<text name="display" value="--"/>
+	<text name="display_label" value="顯示"/>
+	<text name="land_impacts_text" value="土地衝擊量"/>
+	<text name="selected" value="--"/>
+	<text name="selected_label" value="選擇"/>
+	<text name="rezzed_on_land" value="--"/>
+	<text name="rezzed_on_land_label" value="已產生到土地上"/>
+	<text name="remaining_capacity" value="--"/>
+	<text name="remaining_capacity_label" value="剩餘容納量"/>
+	<text name="total_capacity" value="--"/>
+	<text name="total_capacity_label" value="總容納量"/>
+	<text name="help_SLURL" value="[secondlife:///app/help/object_weights 這是什麼？]"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_openobject.xml b/indra/newview/skins/default/xui/zh/floater_openobject.xml
index 61ac3cb1fc..ce6869487a 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/zh/floater_openobject.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="objectcontents" title="物件內容">
 	<text name="object_name">
-		[DESC]:
+		[DESC]：
 	</text>
 	<button label="覆製到收納區" label_selected="覆製到收納區" name="copy_to_inventory_button"/>
 	<button label="覆製且穿上" label_selected="覆製且穿上" name="copy_and_wear_button"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
index a557e1c2e3..9e786edcdd 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outfit_save_as.xml
@@ -3,9 +3,9 @@
 	<button label="儲存" label_selected="儲存" name="Save"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 	<text name="Save item as:">
-		儲存我正在穿的為新裝扮：
+		儲存我現在的穿著為新裝扮：
 	</text>
 	<line_editor name="name ed">
-		[DESC] （新）
+		[DESC]（新）
 	</line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
index 63da47f4de..e57374f4d7 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_outgoing_call.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="outgoing call" title="CALLING">
+<floater name="outgoing call" title="打電話">
 	<floater.string name="lifetime">
 		5
 	</floater.string>
@@ -10,31 +10,31 @@
 		匿名
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		通話中。
+		來電中。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
-		has joined a Voice Chat call with a conference chat.
+		已加入多方語音通話。
 	</floater.string>
 	<text name="connecting">
-		Connecting to [CALLEE_NAME]
+		正在連通 [CALLEE_NAME]
 	</text>
 	<text name="calling">
-		Calling [CALLEE_NAME]
+		正在打給 [CALLEE_NAME]
 	</text>
 	<text name="noanswer">
-		無應答，請稍候再試。
+		無人接聽。  請稍候再試一次。
 	</text>
 	<text name="nearby">
-		You have been disconnected from [VOICE_CHANNEL_NAME].  [RECONNECT_NEARBY]
+		你的 [VOICE_CHANNEL_NAME] 通話已經中斷。  [RECONNECT_NEARBY]
 	</text>
 	<text name="nearby_P2P_by_other">
-		Your call has ended.  [RECONNECT_NEARBY]
+		你的通話已經結束。  [RECONNECT_NEARBY]
 	</text>
 	<text name="nearby_P2P_by_agent">
-		You have ended the call.  [RECONNECT_NEARBY]
+		你已經結束通話。  [RECONNECT_NEARBY]
 	</text>
 	<text name="leaving">
-		Leaving [CURRENT_CHAT].
+		離開 [CURRENT_CHAT]。
 	</text>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
new file mode 100755
index 0000000000..e6971d111f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="尋徑角色">
+	<floater.string name="messaging_get_inprogress">
+		尋徑角色查詢中…
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		查詢尋徑角色時出錯。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		沒有尋徑角色。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		從 [NUM_TOTAL] 個角色中選取了 [NUM_SELECTED] 個。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		這地區並未啟用尋徑。
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] 微秒
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[group]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名稱" name="name"/>
+			<scroll_list.columns label="描述" name="description"/>
+			<scroll_list.columns label="所有人" name="owner"/>
+			<scroll_list.columns label="中央處理器" name="cpu_time"/>
+			<scroll_list.columns label="高度" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			角色：
+		</text>
+		<button label="刷新清單" name="refresh_objects_list"/>
+		<button label="全選" name="select_all_objects"/>
+		<button label="全都不選" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			所選角色所採動作：
+		</text>
+		<check_box label="顯示指標" name="show_beacon"/>
+		<check_box label="顯示物理囊" name="show_physics_capsule"/>
+		<button label="取得" name="take_objects"/>
+		<button label="拿取副本" name="take_copy_objects"/>
+		<button label="瞬間傳送我到那裡" name="teleport_me_to_object" tool_tip="只在選取了一個角色時啟用。"/>
+		<button label="退回" name="return_objects"/>
+		<button label="刪除" name="delete_objects"/>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
new file mode 100755
index 0000000000..be009b54d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="尋徑察看 / 測試">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		找不到尋徑函式庫實作。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		這地區並未啟用尋徑。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		等待地區完成載入。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		正在檢查導航網面狀態。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		正在下載導航網面。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		伺服器上的導航網面已變更。 正在下載最新的導航網面。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		最新的導航網面下載完成。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		無法完成導航網面下載。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		導航網面有變更待存。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		正在建構導航網面。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		某些導航網面地區有變更待存。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		正在建構某些導航網面地區。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		某些導航網面地區有變更待存，其他的正在建構中。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		導航網面已全面更新。
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		找不到尋徑函式庫實作。
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		這地區並未啟用尋徑。
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		請選擇起點和終點。
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		請選擇起點。
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		請選擇終點。
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		路徑以橘色顯示。
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		在所選的點之間找不到路徑。
+	</floater.string>
+	<floater.string name="pathing_error">
+		產生路徑時出錯。
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="視角" name="view_panel">
+			<text name="show_label">
+				顯示：
+			</text>
+			<check_box label="世界" name="show_world"/>
+			<check_box label="僅限可移動的" name="show_world_movables_only"/>
+			<check_box label="導航網面" name="show_navmesh"/>
+			<text name="show_walkability_label">
+				顯示可行走地圖：
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="不顯示" name="show_heatmap_mode_none"/>
+				<combo_box.item label="類型 A 角色" name="show_heatmap_mode_a"/>
+				<combo_box.item label="類型 B 角色" name="show_heatmap_mode_b"/>
+				<combo_box.item label="類型 C 角色" name="show_heatmap_mode_c"/>
+				<combo_box.item label="類型 D 角色" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="可行走的" name="show_walkables"/>
+			<check_box label="實質體積" name="show_material_volumes"/>
+			<check_box label="靜態障礙" name="show_static_obstacles"/>
+			<check_box label="排除體積" name="show_exclusion_volumes"/>
+			<check_box label="水平面" name="show_water_plane"/>
+			<check_box label="具 X 光透視力" name="show_xray"/>
+		</panel>
+		<panel label="測試路徑" name="test_panel">
+			<text name="ctrl_click_label">
+				按住 Ctrl 並點按即可選擇起點。
+			</text>
+			<text name="shift_click_label">
+				按住 Shift 並點按即可選擇終點。
+			</text>
+			<text name="character_width_label">
+				角色寬度
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				公尺
+			</text>
+			<text name="character_type_label">
+				角色類型
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="無" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="清除路徑" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
new file mode 100755
index 0000000000..22e5d2e846
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="尋徑聯結集">
+	<floater.string name="messaging_get_inprogress">
+		尋徑聯結集查詢中…
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		查詢尋徑聯結集時出錯。
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		正在修改所選尋徑聯結集…
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		修改所選尋徑聯結集時出錯。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		沒有尋徑聯結集。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		從 [NUM_TOTAL] 個聯結集中選取了 [NUM_SELECTED] 個。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		這地區並未啟用尋徑。
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_scripted">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[group]
+	</floater.string>
+	<floater.string name="linkset_is_scripted">
+		是
+	</floater.string>
+	<floater.string name="linkset_is_not_scripted">
+		否
+	</floater.string>
+	<floater.string name="linkset_is_unknown_scripted">
+		未知
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		可行走的
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		靜態障礙
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		可移動障礙
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		實質體積
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		排除體積
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		可移動幻影
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[unmodifiable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restricted]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[concave]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restricted,concave]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		選擇聯結集的使用…
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="按聯結集的使用來過濾…" name="filter_by_linkset_use_none"/>
+			<combo_box.item label="可行走的" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="靜態障礙" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="可移動障礙" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="實質體積" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="排除體積" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="可移動幻影" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="套用" name="apply_filters"/>
+		<button label="清除" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名稱（根幾何元件）" name="name"/>
+			<scroll_list.columns label="描述（根幾何元件）" name="description"/>
+			<scroll_list.columns label="所有人" name="owner"/>
+			<scroll_list.columns label="有腳本" name="scripted"/>
+			<scroll_list.columns label="衝擊" name="land_impact"/>
+			<scroll_list.columns label="距離" name="dist_from_you"/>
+			<scroll_list.columns label="聯結集的使用" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			聯結集：
+		</text>
+		<button label="刷新清單" name="refresh_objects_list"/>
+		<button label="全選" name="select_all_objects"/>
+		<button label="全都不選" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="顯示指標" name="show_beacon"/>
+		<button label="取得" name="take_objects"/>
+		<button label="拿取副本" name="take_copy_objects"/>
+		<button label="瞬間傳送我到那裡" name="teleport_me_to_object"/>
+		<button label="退回" name="return_objects"/>
+		<button label="刪除" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			可行走性：
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="A 類型角色的可行走性。以類人類為範例角色類型。"/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="B 類型角色的可行走性。以獸類為範例角色類型。"/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="C 類型角色的可行走性。以機械類為範例角色類型。"/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="D 類型角色的可行走性。以其他種類為範例角色類型。"/>
+		<button label="套用變更" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			（類人類）
+		</text>
+		<text name="suggested_use_b_label">
+			（獸類）
+		</text>
+		<text name="suggested_use_c_label">
+			（機械類）
+		</text>
+		<text name="suggested_use_d_label">
+			（其他）
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay.xml b/indra/newview/skins/default/xui/zh/floater_pay.xml
index 0a823cd82e..69427605a4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -7,14 +7,14 @@
 		支付居民
 	</string>
 	<text name="payee_name">
-		Test Name That Is Extremely Long To Check Clipping
+		測試一個長度非常非常非常長的名稱，檢查是否被切斷
 	</text>
 	<button label="L$1" label_selected="L$1" name="fastpay 1"/>
 	<button label="L$5" label_selected="L$5" name="fastpay 5"/>
 	<button label="L$10" label_selected="L$10" name="fastpay 10"/>
 	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<text name="amount text">
-		或，選擇一個金額：
+		或選擇一個金額：
 	</text>
 	<button label="支付" label_selected="支付" name="pay btn"/>
 	<button label="取消" label_selected="取消" name="cancel btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 39259524d7..7d20b44bc6 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -14,14 +14,14 @@
 	</text>
 	<icon name="icon_object" tool_tip="物件"/>
 	<text name="object_name_text">
-		My awesome object with a really damn long name
+		這是我名稱很長很長很長很長的一個很棒的物件
 	</text>
 	<button label="L$1" label_selected="L$1" name="fastpay 1"/>
 	<button label="L$5" label_selected="L$5" name="fastpay 5"/>
 	<button label="L$10" label_selected="L$10" name="fastpay 10"/>
 	<button label="L$20" label_selected="L$20" name="fastpay 20"/>
 	<text name="amount text">
-		或者，選擇一個金額：
+		或選擇一個金額：
 	</text>
 	<button label="支付" label_selected="支付" name="pay btn"/>
 	<button label="取消" label_selected="取消" name="cancel btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_people.xml b/indra/newview/skins/default/xui/zh/floater_people.xml
new file mode 100755
index 0000000000..f629f2f184
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_people.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_people" title="人群">
+	<panel_container name="main_panel">
+		<panel label="群組檔案" name="panel_group_info_sidetray"/>
+		<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+	</panel_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
index 498848ee56..b38db59ff3 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perm_prefs.xml
@@ -4,10 +4,10 @@
 		<check_box label="與群組分享" name="share_with_group"/>
 		<check_box label="允許任何人覆製" name="everyone_copy"/>
 		<text name="NextOwnerLabel">
-			下一個擁有者可以：
+			下一個所有人可以：
 		</text>
 		<check_box label="修改" name="next_owner_modify"/>
-		<check_box label="覆製" name="next_owner_copy"/>
+		<check_box label="恚庨" name="next_owner_copy"/>
 		<check_box initial_value="true" label="轉售 / 送人" name="next_owner_transfer"/>
 	</panel>
 	<button label="確定" label_selected="確定" name="ok"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_picks.xml b/indra/newview/skins/default/xui/zh/floater_picks.xml
new file mode 100755
index 0000000000..a8bfcd99e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_picks.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_picks" title="精選地點"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_places.xml b/indra/newview/skins/default/xui/zh/floater_places.xml
new file mode 100755
index 0000000000..f6ef1e2141
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_places.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_places" title="地點">
+	<panel label="地點" name="main_panel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml
index 0972c6dfa6..2908f7c1d0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/zh/floater_post_process.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="POST-PROCESS SETTINGS">
+<floater name="Post-Process Floater" title="後處理設定：">
 	<tab_container name="Post-Process Tabs">
-		<panel label="Color Filter" name="wmiColorFilterPanel">
-			<check_box label="Enable" name="wmiColorFilterToggle"/>
+		<panel label="顏色過濾" name="wmiColorFilterPanel">
+			<check_box label="啟用" name="wmiColorFilterToggle"/>
 			<text name="wmiColorFilterBrightnessText">
-				Brightness
+				亮度
 			</text>
 			<text name="wmiColorFilterSaturationText">
-				Saturation
+				飽和度
 			</text>
 			<text name="wmiColorFilterContrastText">
-				Contrast
+				對比
 			</text>
 			<text name="wmiColorFilterBaseText">
-				Contrast Base Color
+				對比基本色
 			</text>
 			<slider label="R" name="wmiColorFilterBaseR"/>
 			<slider label="G" name="wmiColorFilterBaseG"/>
 			<slider label="B" name="wmiColorFilterBaseB"/>
 			<slider label="I" name="wmiColorFilterBaseI"/>
 		</panel>
-		<panel label="Night Vision" name="wmiNightVisionPanel">
-			<check_box label="Enable" name="wmiNightVisionToggle"/>
+		<panel label="夜視" name="wmiNightVisionPanel">
+			<check_box label="啟用" name="wmiNightVisionToggle"/>
 			<text name="wmiNightVisionBrightMultText">
-				Light Amplification Multiple
+				光放大倍數
 			</text>
 			<text name="wmiNightVisionNoiseSizeText">
-				Noise Size
+				噪音規模
 			</text>
 			<text name="wmiNightVisionNoiseStrengthText">
-				Noise Strength
+				噪音強度
 			</text>
 		</panel>
-		<panel label="Bloom" name="wmiBloomPanel">
-			<check_box label="Enable" name="wmiBloomToggle"/>
+		<panel label="開花" name="wmiBloomPanel">
+			<check_box label="啟用" name="wmiBloomToggle"/>
 			<text name="wmiBloomExtractText">
-				Luminosity Extraction
+				光度萃取
 			</text>
 			<text name="wmiBloomSizeText">
-				Bloom Size
+				開花大小
 			</text>
 			<text name="wmiBloomStrengthText">
-				Bloom Strength
+				開花強度
 			</text>
 		</panel>
-		<panel label="Extras" name="Extras">
+		<panel label="其他" name="Extras">
 			<button label="LoadEffect" label_selected="LoadEffect" name="PPLoadEffect"/>
 			<button label="SaveEffect" label_selected="SaveEffect" name="PPSaveEffect"/>
 			<line_editor label="效果名稱" name="PPEffectNameEditor"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences.xml b/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 396a4893e0..b0a27e8c1f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preferences.xml
@@ -3,11 +3,11 @@
 	<button label="確定" label_selected="確定" name="OK"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 	<tab_container name="pref core">
-		<panel label="一般" name="general"/>
-		<panel label="圖形" name="display"/>
+		<panel label="基本設定" name="general"/>
+		<panel label="顯像" name="display"/>
 		<panel label="聲音與媒體" name="audio"/>
 		<panel label="聊天" name="chat"/>
-		<panel label="移動與視角" name="move"/>
+		<panel label="移動/視野" name="move"/>
 		<panel label="通知" name="msgs"/>
 		<panel label="顏色" name="colors"/>
 		<panel label="隱私" name="im"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
new file mode 100755
index 0000000000..f91d5c5cdb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_proxy.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Proxy Settings Floater" title="代理伺服器設定">
+	<check_box initial_value="false" label="使用 HTTP 代理伺服器瀏覽網頁" name="web_proxy_enabled"/>
+	<text name="http_proxy_label">
+		HTTP 代理伺服器：
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="你希望使用的 HTTP 代理伺服器的 DNS 名稱或 IP 位址。"/>
+	<spinner label="埠號：" name="web_proxy_port" tool_tip="你希望使用的 HTTP 代理伺服器的埠號。"/>
+	<check_box label="使用 SOCKS 5 代理伺服器處理 UDP 資料流" name="socks_proxy_enabled"/>
+	<text name="socks5_proxy_label">
+		SOCKS 5 代理伺服器：
+	</text>
+	<line_editor name="socks_proxy_editor" tool_tip="你希望使用的 SOCKS 5 代理伺服器的 DNS 名稱或 IP 位址。"/>
+	<spinner label="埠號：" name="socks_proxy_port" tool_tip="你希望使用的 SOCKS 5 代理伺服器的埠號。"/>
+	<text name="socks_auth_label">
+		SOCKS 鑒認：
+	</text>
+	<radio_group name="socks5_auth_type">
+		<radio_item label="無鑒認" name="Socks5NoAuth" tool_tip="Socks5 代理伺服器無需鑒認。" value="無"/>
+		<radio_item label="使用者名稱 / 密碼" name="Socks5UserPass" tool_tip="Socks5 代理伺服器需要透過使用者名稱 / 密碼鑒認。" value="UserPass"/>
+	</radio_group>
+	<text name="socks5_username_label">
+		使用者名稱：
+	</text>
+	<text name="socks5_password_label">
+		密碼：
+	</text>
+	<line_editor name="socks5_username" tool_tip="你的 SOCKS 5 伺服器鑒認所用的使用者名稱"/>
+	<line_editor name="socks5_password" tool_tip="你的 SOCKS 5 伺服器鑒認所用的密碼"/>
+	<text name="other_proxy_label">
+		其他 HTTP 資料流代理伺服器：
+	</text>
+	<radio_group name="other_http_proxy_type">
+		<radio_item label="不使用代理伺服器" name="OtherNoProxy" tool_tip="非網頁的 HTTP 資料流不會被導向任何代理伺服器。" value="無"/>
+		<radio_item label="使用 HTTP 代理伺服器" name="OtherHTTPProxy" tool_tip="非網頁的 HTTP 資料流將導向所設的網頁代理伺服器。" value="網頁"/>
+		<radio_item label="使用 SOCKS 5 代理伺服器" name="OtherSocksProxy" tool_tip="非網頁的 HTTP 資料流將導向所設的 Socks 5 代理伺服器。" value="網路套接"/>
+	</radio_group>
+	<button label="確定" label_selected="確定" name="OK"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index c435ddc0bd..b94d67b7ef 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_anim">
 	<floater.string name="Title">
-		動作： [NAME]
+		動作：[NAME]
 	</floater.string>
 	<text name="desc txt">
 		描述：
 	</text>
-	<button label="播放於虛擬世界" label_selected="停止" name="Anim play btn" tool_tip="Play this animation so that others can see it"/>
-	<button label="播放於本地" label_selected="停止" name="Anim audition btn" tool_tip="Play this animation so that only you can see it"/>
+	<button label="在虛擬世界播放" label_selected="停止" name="Inworld" tool_tip="播放此動作讓他人看見"/>
+	<button label="在本地播放" label_selected="停止" name="Locally" tool_tip="播放此動作，只給自己看"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index ad49370423..be75038a09 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
 	<floater.string name="step_anim">
-		Animation to play:
+		要播放的動作：
 	</floater.string>
 	<floater.string name="step_sound">
-		Sound to play:
+		要播放的聲音：
 	</floater.string>
 	<floater.string name="step_chat">
-		Chat to say:
+		要說出的聊天文字：
 	</floater.string>
 	<floater.string name="step_wait">
-		Wait:
+		等待：
 	</floater.string>
 	<floater.string name="stop_txt">
 		停止
@@ -22,20 +22,20 @@
 		-- 無 --
 	</floater.string>
 	<floater.string name="Title">
-		Gesture: [NAME]
+		姿勢：[NAME]
 	</floater.string>
 	<text name="desc_label">
 		描述：
 	</text>
 	<text name="trigger_label">
-		Trigger:
+		觸發：
 	</text>
-	<text name="replace_text" tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!">
-		Replace with:
+	<text name="replace_text" tool_tip="用這些字眼取代觸發字眼。 例如，觸發 &apos;hello&apos; 取代為 &apos;howdy&apos; 後，將使得聊天文字「我想說 hello」變成「我想說 howdy」，同時還會播放該姿勢！">
+		取代成：
 	</text>
-	<line_editor name="replace_editor" tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture"/>
+	<line_editor name="replace_editor" tool_tip="用這些字眼取代觸發字眼。 例如，觸發 &apos;hello&apos; 取代為 &apos;howdy&apos; 後，將使得聊天文字「我想說 hello」變成「我想說 howdy」，同時還會播放該姿勢。"/>
 	<text name="key_label">
-		Shortcut Key:
+		快捷鍵：
 	</text>
 	<combo_box label="無" name="modifier_combo"/>
 	<combo_box label="無" name="key_combo"/>
@@ -50,10 +50,10 @@
 	</scroll_list>
 	<button label="添加 &gt;&gt;" name="add_btn"/>
 	<text name="steps_label">
-		Steps:
+		步驟：
 	</text>
-	<button label="Up" name="up_btn"/>
-	<button label="Down" name="down_btn"/>
+	<button label="上移鍵" name="up_btn"/>
+	<button label="下移鍵" name="down_btn"/>
 	<button label="移除" name="delete_btn"/>
 	<text name="options_text">
 		（選項）
@@ -63,11 +63,11 @@
 		<radio_item label="停止" name="stop"/>
 	</radio_group>
 	<check_box label="直到動作結束。" name="wait_anim_check"/>
-	<check_box label="time in seconds:" name="wait_time_check"/>
+	<check_box label="時間（秒）：" name="wait_time_check"/>
 	<text name="help_label">
-		All steps happen simultaneously, unless you add wait steps.
+		所有步驟都會同時進行，除非你加入「等待」步驟。
 	</text>
-	<check_box label="Active" name="active_check" tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys.  Gestures usually become inactive when there is a key binding conflict."/>
+	<check_box label="可用" name="active_check" tool_tip="你可以在聊天中鍵入「觸發字眼」，或按某姿勢的熱鍵來啟動可用的姿勢。  熱鍵的綁定若有衝突，通常會使姿勢變成不可用。"/>
 	<button label="預覽" name="preview_btn"/>
 	<button label="儲存" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index 9447939801..9447939801 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index 46844349de..d04428a36d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -6,6 +6,6 @@
 	<text name="desc txt">
 		描述：
 	</text>
-	<button label="播放於虛擬世界" label_selected="播放於虛擬世界" name="Sound play btn" tool_tip="Play this sound so that others can hear it"/>
-	<button label="播放於本地" label_selected="播放於本地" name="Sound audition btn" tool_tip="Play this sound so that only you can hear it"/>
+	<button label="在虛擬世界播放" label_selected="在虛擬世界播放" name="Sound play btn" tool_tip="播放此聲音讓他人聽見"/>
+	<button label="在本地播放" label_selected="在本地播放" name="Sound audition btn" tool_tip="播放此聲音，只讓自己聽見"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
index 02e26cea24..c56b1c2987 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
@@ -10,31 +10,31 @@
 		描述：
 	</text>
 	<text name="dimensions">
-		[WIDTH]px x [HEIGHT]px
+		[WIDTH] 像素 X [HEIGHT] 像素
 	</text>
 	<text name="aspect_ratio">
-		Preview aspect ratio
+		預覽長寬比
 	</text>
-	<combo_box name="combo_aspect_ratio" tool_tip="Preview at a fixed aspect ratio">
+	<combo_box name="combo_aspect_ratio" tool_tip="以固定長寬比預覽">
 		<combo_item name="Unconstrained">
-			Unconstrained
+			不受限
 		</combo_item>
-		<combo_item name="1:1" tool_tip="Group insignia or Real World profile">
+		<combo_item name="1:1" tool_tip="群組徽章或現實世界小檔案">
 			1:1
 		</combo_item>
 		<combo_item name="4:3" tool_tip="[SECOND_LIFE] 檔案">
 			4:3
 		</combo_item>
-		<combo_item name="10:7" tool_tip="Classifieds and search listings, landmarks">
+		<combo_item name="10:7" tool_tip="個人廣告和搜索刊登廣告、地標">
 			10:7
 		</combo_item>
-		<combo_item name="3:2" tool_tip="關於土地">
+		<combo_item name="3:2" tool_tip="土地資料">
 			3:2
 		</combo_item>
 		<combo_item name="16:10">
 			16:10
 		</combo_item>
-		<combo_item name="16:9" tool_tip="Profile picks">
+		<combo_item name="16:9" tool_tip="個人檔案精選">
 			16:9
 		</combo_item>
 		<combo_item name="2:1">
@@ -42,6 +42,6 @@
 		</combo_item>
 	</combo_box>
 	<button label="確定" name="Keep"/>
-	<button label="Discard" name="Discard"/>
-	<button label="另存" name="save_tex_btn"/>
+	<button label="丟棄" name="Discard"/>
+	<button label="另存為" name="save_tex_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
new file mode 100755
index 0000000000..078b490655
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="刊登個人廣告">
+	<text name="explanation_text">
+		你的個人廣告將從刊登日起連續刊載一星期。
+
+你的廣告在個人廣告欄出現的位置，取決於你決定付費的多寡。
+
+付費越多的個人廣告會出現在接近最上方位置，並顯示於搜尋結果的前面。
+	</text>
+	<text name="price_text">
+		刊登費：
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="確定" name="set_price_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
index 5f0ffea182..b810af0145 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
+++ b/indra/newview/skins/default/xui/zh/floater_publish_classified.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="publish_classified" title="Publishing Classified">
+<floater name="publish_classified" title="刊登個人廣告">
 	<text name="explanation_text">
-		Your classified ad will run for one week from the date it is published.
+		你的個人廣告將從刊登日起連續刊載一星期。
         
-Remember, Classified fees are non-refundable.
+請注意，個人廣告刊登費恕不退還。
 	</text>
-	<spinner label="價格： L$" name="price_for_listing" tool_tip="刊登費用。" value="50"/>
+	<spinner label="價格： L$" name="price_for_listing" tool_tip="刊登費。" value="50"/>
 	<button label="發布" name="publish_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
index 4ff2a3fc79..4ff2a3fc79 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_debug_console.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_region_info.xml b/indra/newview/skins/default/xui/zh/floater_region_info.xml
index 0e4879f555..0e4879f555 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/zh/floater_region_info.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index 436f5cdcc5..8dbc216ab5 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -14,66 +14,66 @@
 		地區名稱
 	</text>
 	<text name="pos_title">
-		Position:
+		位置：
 	</text>
 	<text name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
 	<text name="select_object_label">
-		Click the button, then the abusive object:
+		點按按鈕，再點按違紀的物件：
 	</text>
-	<button name="pick_btn" tool_tip="Object Picker - Identify an object as the subject of this report"/>
+	<button name="pick_btn" tool_tip="物件選取器 - 指明本舉報的對象物件"/>
 	<text name="object_name_label">
 		物件：
 	</text>
 	<text name="owner_name_label">
-		擁有者：
+		所有人：
 	</text>
-	<combo_box name="category_combo" tool_tip="Category -- select the category that best describes this report">
+	<combo_box name="category_combo" tool_tip="類別 -- 選擇最符合此次舉報內容的類別">
 		<combo_box.item label="選擇類別" name="Select_category"/>
-		<combo_box.item label="Age &gt; Age play" name="Age__Age_play"/>
-		<combo_box.item label="Age &gt; Adult Resident on Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/>
-		<combo_box.item label="Age &gt; Underage Resident outside of Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
-		<combo_box.item label="Assault &gt; Combat sandbox / unsafe area" name="Assault__Combat_sandbox___unsafe_area"/>
-		<combo_box.item label="Assault &gt; Safe area" name="Assault__Safe_area"/>
-		<combo_box.item label="Assault &gt; Weapons testing sandbox" name="Assault__Weapons_testing_sandbox"/>
-		<combo_box.item label="Commerce &gt; Failure to deliver product or service" name="Commerce__Failure_to_deliver_product_or_service"/>
-		<combo_box.item label="Disclosure &gt; Real world information" name="Disclosure__Real_world_information"/>
-		<combo_box.item label="Disclosure &gt; Remotely monitoring chat" name="Disclosure__Remotely_monitoring chat"/>
-		<combo_box.item label="Disclosure &gt; Second Life information/chat/IMs" name="Disclosure__Second_Life_information_chat_IMs"/>
-		<combo_box.item label="Disturbing the peace &gt; Unfair use of region resources" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
-		<combo_box.item label="Disturbing the peace &gt; Excessive scripted objects" name="Disturbing_the_peace__Excessive_scripted_objects"/>
-		<combo_box.item label="Disturbing the peace &gt; Object littering" name="Disturbing_the_peace__Object_littering"/>
-		<combo_box.item label="Disturbing the peace &gt; Repetitive spam" name="Disturbing_the_peace__Repetitive_spam"/>
-		<combo_box.item label="Disturbing the peace &gt; Unwanted advert spam" name="Disturbing_the_peace__Unwanted_advert_spam"/>
-		<combo_box.item label="Fraud &gt; L$" name="Fraud__L$"/>
-		<combo_box.item label="Fraud &gt; Land" name="Fraud__Land"/>
-		<combo_box.item label="Fraud &gt; Pyramid scheme or chain letter" name="Fraud__Pyramid_scheme_or_chain_letter"/>
-		<combo_box.item label="Fraud &gt; US$" name="Fraud__US$"/>
-		<combo_box.item label="Harassment &gt; Advert farms / visual spam" name="Harassment__Advert_farms___visual_spam"/>
-		<combo_box.item label="Harassment &gt; Defaming individuals or groups" name="Harassment__Defaming_individuals_or_groups"/>
-		<combo_box.item label="Harassment &gt; Impeding movement" name="Harassment__Impeding_movement"/>
-		<combo_box.item label="Harassment &gt; Sexual harassment" name="Harassment__Sexual_harassment"/>
-		<combo_box.item label="Harassment &gt; Solicting/inciting others to violate ToS" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
-		<combo_box.item label="Harassment &gt; Verbal abuse" name="Harassment__Verbal_abuse"/>
-		<combo_box.item label="Indecency &gt; Broadly offensive content or conduct" name="Indecency__Broadly_offensive_content_or_conduct"/>
-		<combo_box.item label="Indecency &gt; Inappropriate avatar name" name="Indecency__Inappropriate_avatar_name"/>
-		<combo_box.item label="Indecency &gt; Inappropriate content or conduct in a PG region" name="Indecency__Mature_content_in_PG_region"/>
-		<combo_box.item label="Indecency &gt; Inappropriate content or conduct in a Moderate region" name="Indecency__Inappropriate_content_in_Mature_region"/>
-		<combo_box.item label="Intellectual property infringement &gt; Content Removal" name="Intellectual_property_infringement_Content_Removal"/>
-		<combo_box.item label="Intellectual property infringement &gt; CopyBot or Permissions Exploit" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
-		<combo_box.item label="Intolerance" name="Intolerance"/>
-		<combo_box.item label="Land &gt; Abuse of sandbox resources" name="Land__Abuse_of_sandbox_resources"/>
-		<combo_box.item label="Land &gt; Encroachment &gt; Objects/textures" name="Land__Encroachment__Objects_textures"/>
-		<combo_box.item label="Land &gt; Encroachment &gt; Particles" name="Land__Encroachment__Particles"/>
-		<combo_box.item label="Land &gt; Encroachment &gt; Trees/plants" name="Land__Encroachment__Trees_plants"/>
-		<combo_box.item label="Wagering/gambling" name="Wagering_gambling"/>
+		<combo_box.item label="年齡 &gt; 年齡 play" name="Age__Age_play"/>
+		<combo_box.item label="年齡 &gt; 成人居民出現在青少年專用第二人生" name="Age__Adult_resident_on_Teen_Second_Life"/>
+		<combo_box.item label="年齡 &gt; 未成年居民出現在青少年專用第二人生以外場所" name="Age__Underage_resident_outside_of_Teen_Second_Life"/>
+		<combo_box.item label="攻擊 &gt; 戰鬥沙盤 / 不安全區域" name="Assault__Combat_sandbox___unsafe_area"/>
+		<combo_box.item label="攻擊 &gt; 安全區域" name="Assault__Safe_area"/>
+		<combo_box.item label="攻擊 &gt; 測試武器的沙盤" name="Assault__Weapons_testing_sandbox"/>
+		<combo_box.item label="商業 &gt; 未送交產品或履行服務" name="Commerce__Failure_to_deliver_product_or_service"/>
+		<combo_box.item label="揭露 &gt; 真實世界資訊" name="Disclosure__Real_world_information"/>
+		<combo_box.item label="揭露 &gt; 遠端監控聊天內容" name="Disclosure__Remotely_monitoring chat"/>
+		<combo_box.item label="揭露 &gt; 第二人生資訊 / 聊天內容 / 即時訊息" name="Disclosure__Second_Life_information_chat_IMs"/>
+		<combo_box.item label="擾亂 &gt; 不公平使用地區資源" name="Disturbing_the_peace__Unfair_use_of_region_resources"/>
+		<combo_box.item label="擾亂 &gt; 過度使用帶腳本的物件" name="Disturbing_the_peace__Excessive_scripted_objects"/>
+		<combo_box.item label="擾亂 &gt; 任意棄置物件" name="Disturbing_the_peace__Object_littering"/>
+		<combo_box.item label="擾亂 &gt; 一再發出垃圾訊息" name="Disturbing_the_peace__Repetitive_spam"/>
+		<combo_box.item label="擾亂 &gt; 不受歡迎的垃圾廣告" name="Disturbing_the_peace__Unwanted_advert_spam"/>
+		<combo_box.item label="詐欺 &gt; L$" name="Fraud__L$"/>
+		<combo_box.item label="詐欺 &gt; 土地" name="Fraud__Land"/>
+		<combo_box.item label="詐欺 &gt; 層壓式推銷或連環信" name="Fraud__Pyramid_scheme_or_chain_letter"/>
+		<combo_box.item label="詐欺 &gt; 美金" name="Fraud__US$"/>
+		<combo_box.item label="騷擾 &gt; 廣告農場 / 視覺轟炸" name="Harassment__Advert_farms___visual_spam"/>
+		<combo_box.item label="騷擾 &gt; 詆譭個人或群組" name="Harassment__Defaming_individuals_or_groups"/>
+		<combo_box.item label="騷擾 &gt; 阻撓移動" name="Harassment__Impeding_movement"/>
+		<combo_box.item label="騷擾 &gt; 性騷擾" name="Harassment__Sexual_harassment"/>
+		<combo_box.item label="騷擾 &gt; 鼓吹 / 教唆他人違反服務條款" name="Harassment__Solicting_inciting_others_to_violate_ToS"/>
+		<combo_box.item label="騷擾 &gt; 言語暴力" name="Harassment__Verbal_abuse"/>
+		<combo_box.item label="不雅 &gt; 令大多人不快的內容或行為" name="Indecency__Broadly_offensive_content_or_conduct"/>
+		<combo_box.item label="不雅 &gt; 冒犯人的化身名稱" name="Indecency__Inappropriate_avatar_name"/>
+		<combo_box.item label="不雅 &gt; 在一般普級地區出現冒犯人的內容或行為" name="Indecency__Mature_content_in_PG_region"/>
+		<combo_box.item label="不雅 &gt; 在適度成人地區出現冒犯人的內容或行為" name="Indecency__Inappropriate_content_in_Mature_region"/>
+		<combo_box.item label="侵犯智產權 &gt; 移除內容" name="Intellectual_property_infringement_Content_Removal"/>
+		<combo_box.item label="侵犯智產權 &gt; 複製機器程式碼 CopyBot 或濫用權限" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/>
+		<combo_box.item label="不容異己" name="Intolerance"/>
+		<combo_box.item label="土地 &gt; 不當使用沙盤資源" name="Land__Abuse_of_sandbox_resources"/>
+		<combo_box.item label="土地 &gt; 侵佔 &gt; 物件 / 材質" name="Land__Encroachment__Objects_textures"/>
+		<combo_box.item label="土地 &gt; 侵佔 &gt; 粒子" name="Land__Encroachment__Particles"/>
+		<combo_box.item label="土地 &gt; 侵佔 &gt; 樹種 / 植物" name="Land__Encroachment__Trees_plants"/>
+		<combo_box.item label="下注 / 賭博" name="Wagering_gambling"/>
 		<combo_box.item label="其他" name="Other"/>
 	</combo_box>
 	<text name="abuser_name_title">
 		濫用者名稱：
 	</text>
-	<button label="選擇" name="select_abuser" tool_tip="Select the name of the abuser from a list"/>
+	<button label="選擇" name="select_abuser" tool_tip="從清單中選擇違紀者姓名"/>
 	<text name="abuser_name_title2">
 		濫用位置：
 	</text>
@@ -84,11 +84,11 @@
 		細節：
 	</text>
 	<text name="bug_aviso">
-		Please be as specific as possible
+		請盡可能提供具體細節
 	</text>
 	<text name="incomplete_title">
-		* Incomplete reports won&apos;t be investigated
+		* 不完整的舉報內容概不受理調查
 	</text>
-	<button label="舉報濫用" label_selected="舉報濫用" name="send_btn"/>
+	<button label="違規舉報" label_selected="違規舉報" name="send_btn"/>
 	<button label="取消" label_selected="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
index 5b3500c018..5b3500c018 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_debug.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
index e70a30fa24..e70a30fa24 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_debug_panel.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_limits.xml b/indra/newview/skins/default/xui/zh/floater_script_limits.xml
index 7cd2c8e6c6..7cd2c8e6c6 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_limits.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_limits.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_script_preview.xml b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
index c3d05402c0..a6c6c76181 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="SCRIPT: ROTATION SCRIPT">
+<floater name="preview lsl text" title="腳本：旋轉腳本">
 	<floater.string name="Title">
 		腳本：[NAME]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/zh/floater_script_queue.xml b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
index ff02946d86..7c253aa74c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_queue.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="RESET PROGRESS">
+<floater name="queue" title="重設進度">
 	<floater.string name="Starting">
-		Starting [START] of [COUNT] items.
+		正在啟動 [START] 項，共 [COUNT] 項。
 	</floater.string>
 	<floater.string name="Done">
-		Done.
+		完成。
 	</floater.string>
 	<floater.string name="Resetting">
 		重設中
diff --git a/indra/newview/skins/default/xui/zh/floater_script_search.xml b/indra/newview/skins/default/xui/zh/floater_script_search.xml
index 400ef4be81..11c23d933f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_script_search.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script search" title="腳本搜尋">
-	<check_box label="Case Insensitive" name="case_text"/>
+	<check_box label="大小寫視為相同" name="case_text"/>
 	<button label="搜尋" label_selected="搜尋" name="search_btn"/>
 	<button label="取代" label_selected="取代" name="replace_btn"/>
 	<button label="全部取代" label_selected="全部取代" name="replace_all_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
index bb693b7a70..3e85a529ae 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_search.xml
+++ b/indra/newview/skins/default/xui/zh/floater_search.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="尋找">
+<floater name="floater_search" title="">
 	<floater.string name="loading_text">
 		載入中...
 	</floater.string>
 	<floater.string name="done_text">
-		Done
+		完成
 	</floater.string>
 	<layout_stack name="stack1">
 		<layout_panel name="browser_layout">
 			<text name="refresh_search">
-				Redo search to reflect current God level
+				以目前具備的神階級再搜尋一次
 			</text>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/floater_select_key.xml b/indra/newview/skins/default/xui/zh/floater_select_key.xml
index c1661635f1..231eb48b04 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/zh/floater_select_key.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container">
 	<text name="Save item as:">
-		Press a key to set your Speak button trigger.
+		按任一鍵設定「說話」按鈕的觸發。
 	</text>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 19580c99a1..9030f7eb63 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -12,16 +12,16 @@
 				尺寸：
 			</text>
 			<text name="info_size">
-				[AREA] m²
+				[AREA] 平方公尺
 			</text>
 			<text name="info_action">
-				To sell this parcel:
+				出售地段：
 			</text>
 			<text name="price_label">
-				1. Set a price:
+				1. 訂定價格：
 			</text>
 			<text name="price_text">
-				Choose an appropriate price.
+				選擇適合的價格。
 			</text>
 			<text name="price_ld">
 				L$
@@ -30,13 +30,13 @@
 				0
 			</line_editor>
 			<text name="price_per_m">
-				(L$[PER_METER] per m²)
+				（每平方公尺 L$[PER_METER]）
 			</text>
 			<text name="sell_to_label">
-				2. Sell the land to:
+				2. 出售土地給：
 			</text>
 			<text name="sell_to_text">
-				Choose whether to sell to anyone or a particular buyer.
+				選擇要賣給任何人或賣給特定買主。
 			</text>
 			<combo_box name="sell_to">
 				<combo_box.item label="- 選擇一個 -" name="--selectone--"/>
@@ -45,20 +45,20 @@
 			</combo_box>
 			<button label="選擇" name="sell_to_select_agent"/>
 			<text name="sell_objects_label">
-				3. Sell the objects with the land?
+				3. 物件連同土地一起售出？
 			</text>
 			<text name="sell_objects_text">
-				Land owner&apos;s transferable objects on parcel will change ownership.
+				地段上地主的可轉讓物件將過繼所有權。
 			</text>
 			<radio_group name="sell_objects">
-				<radio_item label="No, keep ownership of objects" name="no"/>
-				<radio_item label="Yes, sell objects with land" name="yes"/>
+				<radio_item label="不，我要保留物件所有權" name="no"/>
+				<radio_item label="好，物件連同土地一起售出" name="yes"/>
 			</radio_group>
 			<button label="顯示物件" name="show_objects"/>
 			<text name="nag_message_label">
-				REMEMBER: All sales are final.
+				請記住：售後一概不退。
 			</text>
-			<button label="Set Land For Sale" name="sell_btn"/>
+			<button label="設定土地待售" name="sell_btn"/>
 			<button label="取消" name="cancel_btn"/>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index 56a31bc292..56a31bc292 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 9edc19969f..e86e20829f 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -1,74 +1,65 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="SNAPSHOT PREVIEW">
+<floater name="Snapshot" title="快照預覽">
 	<floater.string name="unknown">
 		未知
 	</floater.string>
-	<radio_group label="Snapshot type" name="snapshot_type_radio">
-		<radio_item label="Email" name="postcard"/>
-		<radio_item label="我的收納區（L$[AMOUNT]）" name="texture"/>
-		<radio_item label="Save to my computer" name="local"/>
-	</radio_group>
+	<string name="postcard_progress_str">
+		正在發送電郵
+	</string>
+	<string name="profile_progress_str">
+		發佈
+	</string>
+	<string name="inventory_progress_str">
+		儲存到收納區
+	</string>
+	<string name="local_progress_str">
+		正在存到電腦
+	</string>
+	<string name="profile_succeeded_str">
+		圖像已上傳
+	</string>
+	<string name="postcard_succeeded_str">
+		電郵發送成功！
+	</string>
+	<string name="inventory_succeeded_str">
+		成功存入收納區！
+	</string>
+	<string name="local_succeeded_str">
+		成功存入電腦！
+	</string>
+	<string name="profile_failed_str">
+		上傳圖像到你的檔案訊息發佈時出錯。
+	</string>
+	<string name="postcard_failed_str">
+		電郵傳送失敗。
+	</string>
+	<string name="inventory_failed_str">
+		無法存入收納區。
+	</string>
+	<string name="local_failed_str">
+		無法儲入電腦。
+	</string>
+	<button name="advanced_options_btn" tool_tip="進階選項"/>
+	<text name="image_res_text">
+		[WIDTH] x [HEIGHT] 像素
+	</text>
 	<text name="file_size_label">
 		[SIZE] KB
 	</text>
-	<button label="送出" name="send_btn"/>
-	<button label="儲存（L$[AMOUNT]）" name="upload_btn"/>
-	<flyout_button label="儲存" name="save_btn" tool_tip="儲存圖像到檔案">
-		<flyout_button.item label="儲存" name="save_item"/>
-		<flyout_button.item label="另存..." name="saveas_item"/>
-	</flyout_button>
-	<button label="更多" name="more_btn" tool_tip="進階選項"/>
-	<button label="更少" name="less_btn" tool_tip="進階選項"/>
-	<button label="取消" name="discard_btn"/>
-	<text name="type_label2">
-		尺寸
-	</text>
-	<text name="format_label">
-		Format
-	</text>
-	<combo_box label="Resolution" name="postcard_size_combo">
-		<combo_box.item label="目前視窗" 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="自訂" name="Custom"/>
-	</combo_box>
-	<combo_box label="Resolution" name="texture_size_combo">
-		<combo_box.item label="目前視窗" name="CurrentWindow"/>
-		<combo_box.item label="Small (128x128)" name="Small(128x128)"/>
-		<combo_box.item label="Medium (256x256)" name="Medium(256x256)"/>
-		<combo_box.item label="Large (512x512)" name="Large(512x512)"/>
-		<combo_box.item label="自訂" name="Custom"/>
-	</combo_box>
-	<combo_box label="Resolution" name="local_size_combo">
-		<combo_box.item label="目前視窗" 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="Custom" 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="Width" name="snapshot_width"/>
-	<spinner label="Height" name="snapshot_height"/>
-	<check_box label="Constrain proportions" name="keep_aspect_check"/>
-	<slider label="圖像品質" name="image_quality_slider"/>
-	<text name="layer_type_label">
-		Capture:
-	</text>
-	<combo_box label="圖層" name="layer_types">
-		<combo_box.item label="Colors" name="Colors"/>
-		<combo_box.item label="Depth" name="Depth"/>
-	</combo_box>
-	<check_box label="Interface" name="ui_check"/>
-	<check_box label="HUDs" name="hud_check"/>
-	<check_box label="Keep open after saving" name="keep_open_check"/>
-	<check_box label="凍結框架（全螢幕）" name="freeze_frame_check"/>
-	<check_box label="Auto-refresh" name="auto_snapshot_check"/>
+	<panel name="advanced_options_panel">
+		<text name="advanced_options_label">
+			進階選項
+		</text>
+		<text name="layer_type_label">
+			擷取快照：
+		</text>
+		<combo_box label="圖層" name="layer_types">
+			<combo_box.item label="顏色" name="Colors"/>
+			<combo_box.item label="深度" name="Depth"/>
+		</combo_box>
+		<check_box label="介面" name="ui_check"/>
+		<check_box label="擡頭顯示" name="hud_check"/>
+		<check_box label="將幀凍結（全螢幕）" name="freeze_frame_check"/>
+		<check_box label="自動刷新" name="auto_snapshot_check"/>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
new file mode 100755
index 0000000000..0374c74f8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="聲音裝置">
+	<text name="voice_label">
+		語音聊天
+	</text>
+	<check_box label="已啟用" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index c942ba1cfb..c942ba1cfb 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
new file mode 100755
index 0000000000..f5a6665844
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="拼字檢查設定">
+	<check_box label="啟用拼字檢查" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		主要字典：
+	</text>
+	<text label="記錄：" name="spellcheck_additional">
+		附加字典：
+	</text>
+	<text name="spellcheck_available">
+		可用的
+	</text>
+	<text name="spellcheck_active">
+		可用
+	</text>
+	<button label="移除" name="spellcheck_remove_btn"/>
+	<button label="匯入…" name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
new file mode 100755
index 0000000000..6094a3bbce
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="匯入字典">
+	<button label="瀏覽" label_selected="瀏覽" name="dictionary_path_browse"/>
+	<button label="匯入" name="ok_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index 582572d0e2..4af5684ec1 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -3,67 +3,84 @@
 	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
 			<stat_view label="基本" name="basic">
-				<stat_bar label="FPS" name="fps"/>
+				<stat_bar label="每秒幀數" name="fps"/>
 				<stat_bar label="頻寬" name="bandwidth"/>
 				<stat_bar label="封包損失" name="packet_loss"/>
-				<stat_bar label="Ping Sim" name="ping"/>
+				<stat_bar label="探詢模擬器有無反應" name="ping"/>
 			</stat_view>
 			<stat_view label="進階" name="advanced">
-				<stat_view label="Render" name="render">
-					<stat_bar label="KTris Drawn" name="ktrisframe"/>
-					<stat_bar label="KTris Drawn" name="ktrissec"/>
+				<stat_view label="呈像" name="render">
+					<stat_bar label="繪出的 KTris（每幀）" name="ktrisframe"/>
+					<stat_bar label="繪出的 KTris（每秒）" name="ktrissec"/>
 					<stat_bar label="物件總計" name="objs"/>
 					<stat_bar label="新物件" name="newobjs"/>
+					<stat_bar label="物件快取讀取率" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="材質" name="texture">
+					<stat_bar label="快取讀取率" name="texture_cache_hits"/>
+					<stat_bar label="快取讀取延遲" name="texture_cache_read_latency"/>
 					<stat_bar label="計數" name="numimagesstat"/>
-					<stat_bar label="Raw Count" name="numrawimagesstat"/>
-					<stat_bar label="GL Mem" name="gltexmemstat"/>
-					<stat_bar label="Formatted Mem" name="formattedmemstat"/>
-					<stat_bar label="Raw Mem" name="rawmemstat"/>
-					<stat_bar label="Bound Mem" name="glboundmemstat"/>
+					<stat_bar label="原始計數" name="numrawimagesstat"/>
+					<stat_bar label="GL 記憶" name="gltexmemstat"/>
+					<stat_bar label="格式化記憶" name="formattedmemstat"/>
+					<stat_bar label="原始記憶" name="rawmemstat"/>
+					<stat_bar label="界限記憶" name="glboundmemstat"/>
 				</stat_view>
 				<stat_view label="網路" name="network">
-					<stat_bar label="Packets In" name="packetsinstat"/>
-					<stat_bar label="Packets Out" name="packetsoutstat"/>
+					<stat_bar label="進入封包" name="packetsinstat"/>
+					<stat_bar label="出去封包" name="packetsoutstat"/>
 					<stat_bar label="物件" name="objectkbitstat"/>
 					<stat_bar label="材質" name="texturekbitstat"/>
 					<stat_bar label="資產" name="assetkbitstat"/>
-					<stat_bar label="Layers" name="layerskbitstat"/>
-					<stat_bar label="Actual In" name="actualinkbitstat"/>
-					<stat_bar label="Actual Out" name="actualoutkbitstat"/>
-					<stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
+					<stat_bar label="層次" name="layerskbitstat"/>
+					<stat_bar label="實入" name="actualinkbitstat"/>
+					<stat_bar label="實出" name="actualoutkbitstat"/>
+					<stat_bar label="VFS 待行作業" name="vfspendingoperations"/>
 				</stat_view>
 			</stat_view>
 			<stat_view label="模擬器" name="sim">
-				<stat_bar label="Time Dilation" name="simtimedilation"/>
-				<stat_bar label="Sim FPS" name="simfps"/>
-				<stat_bar label="Physics FPS" name="simphysicsfps"/>
-				<stat_view label="Physics Details" name="physicsdetail">
-					<stat_bar label="Pinned Objects" name="physicspinnedtasks"/>
-					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>
+				<stat_bar label="時間膨脹" name="simtimedilation"/>
+				<stat_bar label="模擬器每秒幀數" name="simfps"/>
+				<stat_bar label="物理引擎每秒幀數" name="simphysicsfps"/>
+				<stat_view label="物理細節" name="physicsdetail">
+					<stat_bar label="固位物件" name="physicspinnedtasks"/>
+					<stat_bar label="低細節層次物件" name="physicslodtasks"/>
 					<stat_bar label="記憶體配置" name="physicsmemoryallocated"/>
 				</stat_view>
-				<stat_bar label="Agent Updates/Sec" name="simagentups"/>
-				<stat_bar label="Main Agents" name="simmainagents"/>
-				<stat_bar label="Child Agents" name="simchildagents"/>
+				<stat_bar label="用戶更新 / 秒" name="simagentups"/>
+				<stat_bar label="主要用戶" name="simmainagents"/>
+				<stat_bar label="兒童用戶" name="simchildagents"/>
 				<stat_bar label="物件" name="simobjects"/>
-				<stat_bar label="Active Objects" name="simactiveobjects"/>
-				<stat_bar label="Active Scripts" name="simactivescripts"/>
+				<stat_bar label="使用中物件" name="simactiveobjects"/>
+				<stat_bar label="使用中腳本" name="simactivescripts"/>
+				<stat_bar label="腳本執行" name="simpctscriptsrun"/>
 				<stat_bar label="腳本事件" name="simscripteps"/>
+				<stat_view label="尋徑" name="simpathfinding">
+					<stat_bar label="人工智慧步驟時間" name="simsimaistepmsec"/>
+					<stat_bar label="已略過輪廓步驟" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="角色已更新" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="進入封包" name="siminpps"/>
 				<stat_bar label="出去封包" name="simoutpps"/>
 				<stat_bar label="擱置下載" name="simpendingdownloads"/>
 				<stat_bar label="擱置上傳" name="simpendinguploads"/>
-				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
-				<stat_view label="Time (ms)" name="simperf">
-					<stat_bar label="Total Frame Time" name="simframemsec"/>
-					<stat_bar label="Net Time" name="simnetmsec"/>
-					<stat_bar label="Physics Time" name="simsimphysicsmsec"/>
-					<stat_bar label="Simulation Time" name="simsimothermsec"/>
-					<stat_bar label="Agent Time" name="simagentmsec"/>
-					<stat_bar label="Images Time" name="simimagesmsec"/>
+				<stat_bar label="未承認的總位元組數" name="simtotalunackedbytes"/>
+				<stat_view label="時間（毫秒）" name="simperf">
+					<stat_bar label="總禎時間" name="simframemsec"/>
+					<stat_bar label="淨時間" name="simnetmsec"/>
+					<stat_bar label="物理時間" name="simsimphysicsmsec"/>
+					<stat_bar label="模擬時間" name="simsimothermsec"/>
+					<stat_bar label="用戶時間" name="simagentmsec"/>
+					<stat_bar label="圖像時間" name="simimagesmsec"/>
 					<stat_bar label="腳本時間" name="simscriptmsec"/>
+					<stat_bar label="閒置時間" name="simsparemsec"/>
+					<stat_view label="時間細節（毫秒）" name="timedetails">
+						<stat_bar label="物理步驟" name="simsimphysicsstepmsec"/>
+						<stat_bar label="更新物理形狀" name="simsimphysicsshapeupdatemsec"/>
+						<stat_bar label="物理（其他）" name="simsimphysicsothermsec"/>
+						<stat_bar label="睡眠時間" name="simsleepmsec"/>
+						<stat_bar label="Pump IO" name="simpumpiomsec"/>
+					</stat_view>
 				</stat_view>
 			</stat_view>
 		</container_view>
diff --git a/indra/newview/skins/default/xui/zh/floater_sys_well.xml b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
index fd27e944ac..ca0b7f146d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/zh/floater_sys_well.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sys_well_window" title="通知">
 	<string name="title_im_well_window">
-		CONVERSATIONS
+		交談
 	</string>
 	<string name="title_notification_well_window">
 		通知
diff --git a/indra/newview/skins/default/xui/zh/floater_telehub.xml b/indra/newview/skins/default/xui/zh/floater_telehub.xml
index b4c9f3ab29..ee21a78e90 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/zh/floater_telehub.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Explicit left edge to avoid overlapping build tools -->
-<floater name="telehub" title="TELEHUB">
+<floater name="telehub" title="瞬間傳送中心">
 	<text name="status_text_connected">
-		Telehub connected to object [OBJECT]
+		瞬間傳送中心已連通物件 [OBJECT]
 	</text>
 	<text name="status_text_not_connected">
-		No telehub connected.
+		無連通的瞬間傳送中心。
 	</text>
 	<text name="help_text_connected">
-		To remove, click Disconnect.
+		點按「中斷」即可移除。
 	</text>
 	<text name="help_text_not_connected">
-		Select object and click Connect Telehub.
+		選擇物件，並點按「連通瞬間傳送中心」。
 	</text>
-	<button label="Connect Telehub" name="connect_btn"/>
-	<button label="Disconnect" name="disconnect_btn"/>
+	<button label="連通瞬間傳送中心" name="connect_btn"/>
+	<button label="中斷" name="disconnect_btn"/>
 	<text name="spawn_points_text">
-		Spawn Points (positions, not objects):
+		產生點（位置而非物件）：
 	</text>
-	<button label="Add Spawn" name="add_spawn_point_btn"/>
-	<button label="Remove Spawn" name="remove_spawn_point_btn"/>
+	<button label="新增產生" name="add_spawn_point_btn"/>
+	<button label="移除產生" name="remove_spawn_point_btn"/>
 	<text name="spawn_point_help">
-		Select object and click &quot;Add Spawn&quot; to specify position.
-You can then move or delete the object.
-Positions are relative to the telehub center.
-Select an item in list to highlight it inworld.
+		選擇物件，並點按「新增產生」來指定位置。
+你可以接著移動或刪除該物件。
+位置是與瞬間傳送中心相對。
+從清單中選取一項，在虛擬世界中以高亮顯示。
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
new file mode 100755
index 0000000000..68fcf3f7f7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_test_layout_stacks.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Test Floater" title="LAYOUTSTACK 測試"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
new file mode 100755
index 0000000000..83b6df6fe5
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_test_text_vertical_aligment.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Test Floater" title="測試浮動視窗"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index 01586ac153..02d06323d4 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -1,23 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="PICK: TEXTURE">
+<floater name="texture picker" title="精選：材質">
 	<floater.string name="choose_picture">
-		點擊以挑選圖像
+		點按以挑選圖片
 	</floater.string>
 	<floater.string name="pick title">
-		Pick:
+		精選地點：
 	</floater.string>
 	<text name="Multiple">
-		Multiple textures
+		多重材質
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="收納區" name="inventory" value="0"/>
+		<radio_item label="本地" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		尺寸：[DIMENSIONS]
 	</text>
 	<button label="預設" label_selected="預設" name="Default"/>
+	<button label="空白" label_selected="空白" name="Blank"/>
 	<button label="無" label_selected="無" name="None"/>
-	<button label="Blank" label_selected="Blank" name="Blank"/>
 	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
+	<text name="preview_disabled" value="已停用預覽"/>
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
+	<button label="添加" label_selected="添加" name="l_add_btn"/>
+	<button label="移除" label_selected="移除" name="l_rem_btn"/>
+	<button label="上傳" label_selected="上傳" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="名稱" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="確定" label_selected="確定" name="Select"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
new file mode 100755
index 0000000000..0dcac17a75
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_texture_fetch_debugger.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="材質擷取除錯器">
+	<text name="total_num_fetched_label">
+		1. 已擷取材質總數：[NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2. 總擷取請求數：[NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3. 快取總讀取數：[NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4. 可見材質總數：[NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5. 可見材質擷取總請求數：[NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6. 總擷取資料量：[SIZE1] KB，解碼資料量：[SIZE2] KB，[PIXEL] 百萬像素
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7. 可見資料總量：[SIZE1] KB，解碼資料量：[SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8. 總呈像資料量：[SIZE1] KB，解碼資料量：[SIZE2] KB，[PIXEL] 百萬像素
+	</text>
+	<text name="total_time_cache_read_label">
+		9. 快取讀取總時間：[TIME] 秒
+	</text>
+	<text name="total_time_cache_write_label">
+		10. 快取寫入總時間：[TIME] 秒
+	</text>
+	<text name="total_time_decode_label">
+		11. 解碼總時間：[TIME] 秒
+	</text>
+	<text name="total_time_gl_label">
+		12. 建立 gl 材質總時間：[TIME] 秒
+	</text>
+	<text name="total_time_http_label">
+		13. HTTP 擷取總時間：[TIME] 秒
+	</text>
+	<text name="total_time_fetch_label">
+		14. 所有擷取動作總時間：[TIME] 秒
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15. 自快取重新擷取可見材質，時間：[TIME] 秒，擷取量：[SIZE] KB，[PIXEL] 百萬像素
+	</text>
+	<text name="total_time_refetch_all_cache_label">
+		16. 從快取重新擷取所有材質，時間：[TIME] 秒，擷取量：[SIZE] KB，[PIXEL] 百萬像素
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		17. 自 HTTP 重新擷取可見材質，時間：[TIME] 秒，擷取量：[SIZE] KB，[PIXEL] 百萬像素
+	</text>
+	<text name="total_time_refetch_all_http_label">
+		18. 自 HTTP 重新擷取所有材質，時間：[TIME] 秒，擷取量：[SIZE] KB，[PIXEL] 百萬像素
+	</text>
+	<spinner label="19. 材質/像素比率：" name="texel_pixel_ratio"/>
+	<text name="texture_source_label">
+		20. 材質來源：
+	</text>
+	<radio_group name="texture_source">
+		<radio_item label="快取 + HTTP" name="0"/>
+		<radio_item label="僅限 HTTP" name="1"/>
+	</radio_group>
+	<button label="開始" name="start_btn"/>
+	<button label="重設" name="clear_btn"/>
+	<button label="關閉" name="close_btn"/>
+	<button label="快取讀取" name="cacheread_btn"/>
+	<button label="快取寫入" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="解碼" name="decode_btn"/>
+	<button label="GL 材質" name="gl_btn"/>
+	<button label="快取重取可見材質" name="refetchviscache_btn"/>
+	<button label="重新擷取所有快取" name="refetchallcache_btn"/>
+	<button label="HTTP 重取可見材質" name="refetchvishttp_btn"/>
+	<button label="重新擷取所有 HTTP" name="refetchallhttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 2db98eb3d7..7e6c972f40 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -1,43 +1,49 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="toolbox floater" short_title="建造工具">
+	<floater.string name="grid_screen_text">
+		螢幕
+	</floater.string>
+	<floater.string name="grid_local_text">
+		本地
+	</floater.string>
+	<floater.string name="grid_world_text">
+		世界
+	</floater.string>
+	<floater.string name="grid_reference_text">
+		參考
+	</floater.string>
+	<floater.string name="grid_attachment_text">
+		附件
+	</floater.string>
 	<floater.string name="status_rotate">
-		Drag colored bands to rotate object
+		拖曳色條可以旋轉物件
 	</floater.string>
 	<floater.string name="status_scale">
-		Click and drag to stretch selected side
+		按住並拖曳，可以拉伸所選的一面
 	</floater.string>
 	<floater.string name="status_move">
-		Drag to move, shift-drag to copy
+		拖曳就會移動，按下 Shift 再拖曳則可複製
 	</floater.string>
 	<floater.string name="status_modifyland">
-		Click and hold to modify land
+		按住不放開，可以修改土地
 	</floater.string>
 	<floater.string name="status_camera">
-		Click and drag to move camera
+		按住並拖曳，可以移動攝影機
 	</floater.string>
 	<floater.string name="status_grab">
-		Drag to move, Ctrl to lift, Ctrl+Shift to rotate
+		拖曳就可移動，按下 Ctrl 可以拿起，按下 Ctrl+Shift 可以旋轉
 	</floater.string>
 	<floater.string name="status_place">
-		Click inworld to build
+		在虛擬世界裡點按一下，可以建製物件
 	</floater.string>
 	<floater.string name="status_selectland">
-		Click and drag to select land
+		按住並拖曳，可以選取土地
 	</floater.string>
-	<floater.string name="grid_screen_text">
-		Screen
+	<floater.string name="status_selectcount">
+		選取了 [OBJ_COUNT] 個物件，土地衝擊量 [LAND_IMPACT]
 	</floater.string>
-	<floater.string name="grid_local_text">
-		Local
-	</floater.string>
-	<floater.string name="grid_world_text">
-		World
-	</floater.string>
-	<floater.string name="grid_reference_text">
-		Reference
-	</floater.string>
-	<floater.string name="grid_attachment_text">
-		Attachment
+	<floater.string name="status_remaining_capacity">
+		剩餘容納量 [LAND_CAPACITY]。
 	</floater.string>
 	<button name="button focus" tool_tip="聚焦"/>
 	<button name="button move" tool_tip="移動"/>
@@ -45,7 +51,7 @@
 	<button name="button create" tool_tip="創造"/>
 	<button name="button land" tool_tip="土地"/>
 	<text name="text status">
-		Drag to move, shift-drag to copy
+		拖曳就會移動，按下 Shift 再拖曳則可複製
 	</text>
 	<radio_group name="focus_radio_group">
 		<radio_item label="縮放" name="radio zoom"/>
@@ -56,7 +62,7 @@
 	<radio_group name="move_radio_group">
 		<radio_item label="移動" name="radio move"/>
 		<radio_item label="舉起（Ctrl）" name="radio lift"/>
-		<radio_item label="Spin (Ctrl+Shift)" name="radio spin"/>
+		<radio_item label="旋轉（Ctrl+Shift）" name="radio spin"/>
 	</radio_group>
 	<radio_group name="edit_radio_group">
 		<radio_item label="移動" name="radio position"/>
@@ -67,39 +73,36 @@
 	<check_box label="編輯聯結部分" name="checkbox edit linked parts"/>
 	<button label="聯結" name="link_btn"/>
 	<button label="取消聯結" name="unlink_btn"/>
-	<text name="RenderingCost" tool_tip="Shows the rendering cost calculated for this object">
-		þ: [COUNT]
-	</text>
 	<text label="同時伸展兩側" name="checkbox uniform label">
 		同時伸展兩側
 	</text>
 	<check_box initial_value="true" label="伸展材質" name="checkbox stretch textures"/>
-	<check_box initial_value="true" label="貼齊格線" name="checkbox snap to grid"/>
+	<check_box initial_value="true" label="Snap" name="checkbox snap to grid"/>
 	<combo_box name="combobox grid mode" tool_tip="選擇物件定位參考的格線尺度類型">
-		<combo_box.item label="世界格線" name="World"/>
-		<combo_box.item label="地方格線" name="Local"/>
-		<combo_box.item label="參考格線" name="Reference"/>
+		<combo_box.item label="世界" name="World"/>
+		<combo_box.item label="本地" name="Local"/>
+		<combo_box.item label="參考" name="Reference"/>
 	</combo_box>
-	<button name="Options..." tool_tip="察看更多格線選項"/>
-	<button name="ToolCube" tool_tip="Cube"/>
-	<button name="ToolPrism" tool_tip="Prism"/>
-	<button name="ToolPyramid" tool_tip="Pyramid"/>
-	<button name="ToolTetrahedron" tool_tip="Tetrahedron"/>
-	<button name="ToolCylinder" tool_tip="Cylinder"/>
-	<button name="ToolHemiCylinder" tool_tip="Hemicylinder"/>
-	<button name="ToolCone" tool_tip="Cone"/>
-	<button name="ToolHemiCone" tool_tip="Hemicone"/>
-	<button name="ToolSphere" tool_tip="Sphere"/>
-	<button name="ToolHemiSphere" tool_tip="Hemisphere"/>
-	<button name="ToolTorus" tool_tip="Torus"/>
-	<button name="ToolTube" tool_tip="Tube"/>
-	<button name="ToolRing" tool_tip="Ring"/>
-	<button name="ToolTree" tool_tip="Tree"/>
-	<button name="ToolGrass" tool_tip="Grass"/>
+	<button label="" name="Options..." tool_tip="察看更多格線選項"/>
+	<button name="ToolCube" tool_tip="立方體"/>
+	<button name="ToolPrism" tool_tip="稜鏡體"/>
+	<button name="ToolPyramid" tool_tip="金字塔"/>
+	<button name="ToolTetrahedron" tool_tip="正四面體"/>
+	<button name="ToolCylinder" tool_tip="圓柱體"/>
+	<button name="ToolHemiCylinder" tool_tip="半圓柱體"/>
+	<button name="ToolCone" tool_tip="圓錐"/>
+	<button name="ToolHemiCone" tool_tip="半圓錐"/>
+	<button name="ToolSphere" tool_tip="球體"/>
+	<button name="ToolHemiSphere" tool_tip="半球體"/>
+	<button name="ToolTorus" tool_tip="環面"/>
+	<button name="ToolTube" tool_tip="圓管"/>
+	<button name="ToolRing" tool_tip="圓環"/>
+	<button name="ToolTree" tool_tip="樹木"/>
+	<button name="ToolGrass" tool_tip="草地"/>
 	<check_box label="保持已選擇的工具" name="checkbox sticky"/>
-	<check_box label="覆製選擇" name="checkbox copy selection"/>
-	<check_box initial_value="true" label="Center Copy" name="checkbox copy centers"/>
-	<check_box label="Rotate Copy" name="checkbox copy rotates"/>
+	<check_box label="複製選擇" name="checkbox copy selection"/>
+	<check_box initial_value="true" label="複製物置中" name="checkbox copy centers"/>
+	<check_box label="旋轉複製物" name="checkbox copy rotates"/>
 	<radio_group name="land_radio_group">
 		<radio_item label="選擇土地" name="radio select land"/>
 		<radio_item label="攤平" name="radio flatten"/>
@@ -121,11 +124,11 @@
 	</text>
 	<slider_bar initial_value="0.00" name="slider force"/>
 	<button label="套用" label_selected="套用" name="button apply to selection" tool_tip="修改所選擇的土地"/>
-	<text name="obj_count">
-		物件： [COUNT]
+	<text name="selection_empty">
+		未做任何選擇。
 	</text>
-	<text name="prim_count">
-		幾何元件： [COUNT]
+	<text name="remaining_capacity">
+		[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights 詳情]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
@@ -147,6 +150,12 @@
 			<panel.string name="text modify info 4">
 				你不能修改這些物件
 			</panel.string>
+			<panel.string name="text modify info 5">
+				無法跨地區修改這個物件
+			</panel.string>
+			<panel.string name="text modify info 6">
+				無法跨地區修改這些物件
+			</panel.string>
 			<panel.string name="text modify warning">
 				你必須選取整個物件以設定權限
 			</panel.string>
@@ -154,16 +163,16 @@
 				價格： L$
 			</panel.string>
 			<panel.string name="Cost Total">
-				總價： L$
+				總價：L$
 			</panel.string>
 			<panel.string name="Cost Per Unit">
-				單價每個： L$
+				單價：L$
 			</panel.string>
 			<panel.string name="Cost Mixed">
-				Mixed Price
+				混合價格
 			</panel.string>
 			<panel.string name="Sale Mixed">
-				Mixed Sale
+				混合銷售
 			</panel.string>
 			<text name="Name:">
 				名稱：
@@ -175,49 +184,49 @@
 				創造者：
 			</text>
 			<text name="Owner:">
-				擁有者：
+				所有人：
 			</text>
 			<text name="Group:">
 				群組：
 			</text>
 			<name_box initial_value="載入中..." name="Group Name Proxy"/>
-			<button name="button set group" tool_tip="選擇一個群組以分享這物件權限"/>
-			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
-			<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
+			<button name="button set group" tool_tip="選擇一個群組以分享這物件的權限"/>
+			<check_box label="分享" name="checkbox share with group" tool_tip="允許此群組所有成員共享你修改此物件的權限。 你必須讓渡才能啟動角色限制。"/>
+			<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="「讓渡」會把這物件贈送出去並賦予「下一個所有人」權限。 群組所分享的物件可由群組職員加以讓渡。"/>
 			<text name="label click action">
-				點擊以：
+				點按以：
 			</text>
 			<combo_box name="clickaction">
 				<combo_box.item label="觸碰（預設）" name="Touch/grab(default)"/>
 				<combo_box.item label="坐在物件上" name="Sitonobject"/>
 				<combo_box.item label="購買物件" name="Buyobject"/>
 				<combo_box.item label="支付物件" name="Payobject"/>
-				<combo_box.item label="開啟" name="Open"/>
+				<combo_box.item label="打開" name="Open"/>
 				<combo_box.item label="縮放" name="Zoom"/>
 			</combo_box>
-			<check_box label="出售：" name="checkbox for sale"/>
+			<check_box label="出售中：" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
-				<combo_box.item label="副本" name="Copy"/>
+				<combo_box.item label="恚庨" name="Copy"/>
 				<combo_box.item label="內容" name="Contents"/>
 				<combo_box.item label="原件" name="Original"/>
 			</combo_box>
-			<spinner label="價格： L$" name="Edit Cost"/>
-			<check_box label="顯示在搜尋中" name="search_check" tool_tip="讓其他人可以在搜尋結果中看到這物件"/>
+			<check_box label="顯示在搜尋中" name="search_check" tool_tip="讓其他人可以在搜尋結果中察看到此物件"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
-					你可以修改這個物件
+					你能修改這個物件
 				</text>
 				<text name="Anyone can:">
 					任何人：
 				</text>
 				<check_box label="移動" name="checkbox allow everyone move"/>
-				<check_box label="覆製" name="checkbox allow everyone copy"/>
+				<check_box label="恚庨" name="checkbox allow everyone copy"/>
 				<text name="Next owner can:">
-					下一個擁有者：
+					下一個所有人：
 				</text>
 				<check_box label="修改" name="checkbox next owner can modify"/>
-				<check_box label="覆製" name="checkbox next owner can copy"/>
-				<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個擁有者可以送人或轉售這個物件"/>
+				<check_box label="恚庨" name="checkbox next owner can copy"/>
+				<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個所有人可贈送或轉售這個物件"/>
 				<text name="B:">
 					B:
 				</text>
@@ -237,9 +246,14 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					尋徑屬性：
+				</text>
+			</panel>
 		</panel>
 		<panel label="物件" name="Object">
-			<check_box label="鎖定" name="checkbox locked" tool_tip="預防物件被移動或刪除，最常使用的狀況是在建造過程中避免被意外的編輯。"/>
+			<check_box label="已鎖住" name="checkbox locked" tool_tip="避免物件被移動或刪除。 這在建製過程中非常有用，可避免意外的編輯更動。"/>
 			<check_box label="物理性" name="Physical Checkbox Ctrl" tool_tip="允許物件被推撞與受重力影響"/>
 			<check_box label="暫時性" name="Temporary Checkbox Ctrl" tool_tip="使物件在建造後的一分鐘自動刪除"/>
 			<check_box label="幻影性" name="Phantom Checkbox Ctrl" tool_tip="使物件不會與其他物件或化身產生碰撞"/>
@@ -262,26 +276,17 @@
 			<spinner label="Y" name="Rot Y"/>
 			<spinner label="Z" name="Rot Z"/>
 			<combo_box name="comboBaseType">
-				<combo_box.item label="Box" name="Box"/>
-				<combo_box.item label="Cylinder" name="Cylinder"/>
-				<combo_box.item label="Prism" name="Prism"/>
-				<combo_box.item label="Sphere" name="Sphere"/>
-				<combo_box.item label="Torus" name="Torus"/>
-				<combo_box.item label="Tube" name="Tube"/>
-				<combo_box.item label="Ring" name="Ring"/>
-				<combo_box.item label="Sculpted" name="Sculpted"/>
-			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="石頭" name="Stone"/>
-				<combo_box.item label="金屬" name="Metal"/>
-				<combo_box.item label="玻璃" name="Glass"/>
-				<combo_box.item label="木頭" name="Wood"/>
-				<combo_box.item label="肌肉" name="Flesh"/>
-				<combo_box.item label="塑膠" name="Plastic"/>
-				<combo_box.item label="橡膠" name="Rubber"/>
+				<combo_box.item label="箱子" name="Box"/>
+				<combo_box.item label="圓柱體" name="Cylinder"/>
+				<combo_box.item label="稜鏡體" name="Prism"/>
+				<combo_box.item label="球體" name="Sphere"/>
+				<combo_box.item label="環面" name="Torus"/>
+				<combo_box.item label="圓管" name="Tube"/>
+				<combo_box.item label="圓環" name="Ring"/>
+				<combo_box.item label="雕刻的" name="Sculpted"/>
 			</combo_box>
 			<text name="text cut">
-				Path Cut (begin/end)
+				路徑切斷（開始 / 結束）
 			</text>
 			<spinner label="B" name="cut begin"/>
 			<spinner label="E" name="cut end"/>
@@ -289,24 +294,24 @@
 				中空
 			</text>
 			<text name="text skew">
-				Skew
+				偏斜
 			</text>
 			<text name="Hollow Shape">
 				中空形狀
 			</text>
 			<combo_box name="hole">
 				<combo_box.item label="預設" name="Default"/>
-				<combo_box.item label="Circle" name="Circle"/>
-				<combo_box.item label="Square" name="Square"/>
-				<combo_box.item label="Triangle" name="Triangle"/>
+				<combo_box.item label="圓圈" name="Circle"/>
+				<combo_box.item label="方形" name="Square"/>
+				<combo_box.item label="三角形" name="Triangle"/>
 			</combo_box>
 			<text name="text twist">
-				Twist (begin/end)
+				扭曲（開始 / 結束）
 			</text>
 			<spinner label="B" name="Twist Begin"/>
 			<spinner label="E" name="Twist End"/>
 			<text name="scale_taper">
-				Taper
+				錐化
 			</text>
 			<text name="scale_hole">
 				洞尺寸
@@ -314,54 +319,62 @@
 			<spinner label="X" name="Taper Scale X"/>
 			<spinner label="Y" name="Taper Scale Y"/>
 			<text name="text topshear">
-				Top Shear
+				頂部斜變
 			</text>
 			<spinner label="X" name="Shear X"/>
 			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
-				Profile Cut (begin/end)
+				側面切斷（開始 / 結束）
 			</text>
 			<text name="advanced_dimple">
-				Dimple (begin/end)
+				凹陷（開始 / 結束）
 			</text>
 			<text name="advanced_slice">
-				Slice (begin/end)
+				Slice（開始 / 結束）
 			</text>
 			<spinner label="B" name="Path Limit Begin"/>
 			<spinner label="E" name="Path Limit End"/>
 			<text name="text taper2">
-				Taper
+				錐化
 			</text>
 			<spinner label="X" name="Taper X"/>
 			<spinner label="Y" name="Taper Y"/>
 			<text name="text radius delta">
-				Radius
+				半徑
 			</text>
 			<text name="text revolutions">
-				Revolutions
+				旋轉
 			</text>
-			<texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="點擊以挑選圖像"/>
-			<check_box label="Mirror" name="sculpt mirror control" tool_tip="Flips sculpted prim along the X axis"/>
-			<check_box label="Inside-out" name="sculpt invert control" tool_tip="Inverts the sculpted prims normals, making it appear inside-out"/>
+			<texture_picker label="雕刻材質" name="sculpt texture control" tool_tip="點按以挑選圖片"/>
+			<check_box label="鏡像" name="sculpt mirror control" tool_tip="沿X軸翻轉雕刻幾何元件"/>
+			<check_box label="內外倒翻" name="sculpt invert control" tool_tip="將雕刻幾何元件的正常值顛倒，使其看來有如內外倒翻"/>
 			<text name="label sculpt type">
-				Stitching type
+				縫合類型
 			</text>
 			<combo_box name="sculpt type control">
-				<combo_box.item label="（無）" name="None"/>
-				<combo_box.item label="Sphere" name="Sphere"/>
-				<combo_box.item label="Torus" name="Torus"/>
-				<combo_box.item label="Plane" name="Plane"/>
-				<combo_box.item label="Cylinder" name="Cylinder"/>
+				<combo_box.item label="球體" name="Sphere"/>
+				<combo_box.item label="環面" name="Torus"/>
+				<combo_box.item label="平面" name="Plane"/>
+				<combo_box.item label="圓柱體" name="Cylinder"/>
 			</combo_box>
 		</panel>
 		<panel label="特性" name="Features">
+			<panel.string name="None">
+				無
+			</panel.string>
+			<panel.string name="Prim">
+				幾何元件
+			</panel.string>
+			<panel.string name="Convex Hull">
+				凸包
+			</panel.string>
 			<text name="select_single">
 				只能選擇一個幾何元件去編輯細節。
 			</text>
 			<text name="edit_object">
 				編輯物件特性：
 			</text>
-			<check_box label="彈性路徑" name="Flexible1D Checkbox Ctrl" tool_tip="Allows object to flex about the Z axis (Client-side only)"/>
+			<check_box label="彈性路徑" name="Flexible1D Checkbox Ctrl" tool_tip="允許物件繞 Z 軸伸展（僅限客戶端）"/>
 			<spinner label="柔軟" name="FlexNumSections"/>
 			<spinner label="重力" name="FlexGravity"/>
 			<spinner label="拖曳" name="FlexFriction"/>
@@ -371,14 +384,31 @@
 			<spinner label="強制 Y 軸" name="FlexForceY"/>
 			<spinner label="強制 Z 軸" name="FlexForceZ"/>
 			<check_box label="光源" name="Light Checkbox Ctrl" tool_tip="導致物件發光"/>
-			<color_swatch name="colorswatch" tool_tip="點擊以開啟顏色挑選器"/>
-			<texture_picker label="" name="light texture control" tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"/>
+			<color_swatch name="colorswatch" tool_tip="點按以開啟顏色挑選器"/>
+			<texture_picker label="" name="light texture control" tool_tip="點選投影圖像（只在啟用延遲呈像時生效）"/>
 			<spinner label="強度" name="Light Intensity"/>
-			<spinner label="FOV" name="Light FOV"/>
+			<spinner label="視角" name="Light FOV"/>
 			<spinner label="半徑" name="Light Radius"/>
-			<spinner label="Focus" name="Light Focus"/>
+			<spinner label="焦點" name="Light Focus"/>
 			<spinner label="衰減" name="Light Falloff"/>
-			<spinner label="Ambiance" name="Light Ambiance"/>
+			<spinner label="環境" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				物理形狀類型：
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="選擇物理形狀類型"/>
+			<combo_box name="material">
+				<combo_box.item label="石頭" name="Stone"/>
+				<combo_box.item label="金屬" name="Metal"/>
+				<combo_box.item label="玻璃" name="Glass"/>
+				<combo_box.item label="木頭" name="Wood"/>
+				<combo_box.item label="肌肉" name="Flesh"/>
+				<combo_box.item label="塑膠" name="Plastic"/>
+				<combo_box.item label="橡膠" name="Rubber"/>
+			</combo_box>
+			<spinner label="重力" name="Physics Gravity"/>
+			<spinner label="摩擦" name="Physics Friction"/>
+			<spinner label="密度（100 公斤 / 立方公尺）" name="Physics Density"/>
+			<spinner label="恢復" name="Physics Restitution"/>
 		</panel>
 		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
@@ -387,8 +417,8 @@
 			<panel.string name="string repeats per face">
 				每一面重覆次數
 			</panel.string>
-			<texture_picker label="材質" name="texture control" tool_tip="點擊以挑選圖像"/>
-			<color_swatch label="顏色" name="colorswatch" tool_tip="點擊以開啟顏色挑選器"/>
+			<texture_picker label="材質" name="texture control" tool_tip="點按以挑選圖片"/>
+			<color_swatch label="顏色" name="colorswatch" tool_tip="點按以開啟顏色挑選器"/>
 			<text name="color trans">
 				透明度 %
 			</text>
@@ -417,34 +447,29 @@
 			</text>
 			<combo_box name="combobox bumpiness">
 				<combo_box.item label="無" name="None"/>
-				<combo_box.item label="Brightness" name="Brightness"/>
-				<combo_box.item label="Darkness" name="Darkness"/>
-				<combo_box.item label="woodgrain" name="woodgrain"/>
-				<combo_box.item label="bark" name="bark"/>
-				<combo_box.item label="bricks" name="bricks"/>
-				<combo_box.item label="checker" name="checker"/>
-				<combo_box.item label="concrete" name="concrete"/>
-				<combo_box.item label="crustytile" name="crustytile"/>
-				<combo_box.item label="cutstone" name="cutstone"/>
-				<combo_box.item label="discs" name="discs"/>
-				<combo_box.item label="gravel" name="gravel"/>
-				<combo_box.item label="petridish" name="petridish"/>
-				<combo_box.item label="siding" name="siding"/>
-				<combo_box.item label="stonetile" name="stonetile"/>
-				<combo_box.item label="stucco" name="stucco"/>
-				<combo_box.item label="suction" name="suction"/>
-				<combo_box.item label="weave" name="weave"/>
+				<combo_box.item label="亮度" name="Brightness"/>
+				<combo_box.item label="暗度" name="Darkness"/>
+				<combo_box.item label="木紋" name="woodgrain"/>
+				<combo_box.item label="樹皮" name="bark"/>
+				<combo_box.item label="磚" name="bricks"/>
+				<combo_box.item label="格子" name="checker"/>
+				<combo_box.item label="混凝土" name="concrete"/>
+				<combo_box.item label="粗花磚" name="crustytile"/>
+				<combo_box.item label="石磚" name="cutstone"/>
+				<combo_box.item label="圓盤" name="discs"/>
+				<combo_box.item label="碎石" name="gravel"/>
+				<combo_box.item label="培養皿" name="petridish"/>
+				<combo_box.item label="側邊片" name="siding"/>
+				<combo_box.item label="石磚格" name="stonetile"/>
+				<combo_box.item label="彩色沙岩" name="stucco"/>
+				<combo_box.item label="吸附" name="suction"/>
+				<combo_box.item label="編織" name="weave"/>
 			</combo_box>
-			<check_box initial_value="false" label="對齊平面" name="checkbox planar align" tool_tip="以最後所選擇的面為基準，對齊全部所選擇的面上的材質。這必須使用平面材質映射方式。"/>
-			<text name="rpt">
-				重覆次數 / 面
-			</text>
 			<spinner label="水平（U）" name="TexScaleU"/>
 			<check_box label="翻轉" name="checkbox flip s"/>
 			<spinner label="垂直（V）" name="TexScaleV"/>
 			<check_box label="翻轉" name="checkbox flip t"/>
 			<spinner label="旋轉˚" name="TexRot"/>
-			<spinner label="重覆次數 / 公尺" name="rptctrl"/>
 			<button label="套用" label_selected="套用" name="button apply"/>
 			<text name="tex offset">
 				材質位移
@@ -476,15 +501,8 @@
 		<text name="label_area">
 			面積： [AREA] m²
 		</text>
-		<button label="關於土地" label_selected="關於土地" name="button about land"/>
-		<check_box label="顯示擁有者" name="checkbox show owners" tool_tip="Colorize the parcels according to the type of owner: 
-
-綠色 = 你的土地 
-水藍 = 你群組的土地 
-紅色 = 其他人所有 
-黃色 = 出售 
-紫色 = 拍賣 
-灰色 = 公有地"/>
+		<button label="土地資料" label_selected="土地資料" name="button about land"/>
+		<check_box label="顯示所有人" name="checkbox show owners" tool_tip="根據所有人將地段分類上色：   綠色 = 你的土地  水藍 = 你群組的土地  紅色 = 其他人所有  黃色 = 出售  紫色 = 拍賣  灰色 = 公有地"/>
 		<text name="label_parcel_modify">
 			修改地段
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index 0e7e0c5b1a..6f50be0855 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="Top Objects">
+<floater name="top_objects" title="排行最高的物件">
 	<floater.string name="top_scripts_title">
-		Top Scripts
+		排行最高的腳本
 	</floater.string>
 	<floater.string name="top_scripts_text">
-		[COUNT] scripts taking a total of [TIME] ms
+		[COUNT] 個腳本共需時 [TIME] 毫秒
 	</floater.string>
 	<floater.string name="scripts_score_label">
-		Time
-	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Mono Time
+		時間
 	</floater.string>
 	<floater.string name="top_colliders_title">
-		Top Colliders
+		最常碰撞物項
 	</floater.string>
 	<floater.string name="top_colliders_text">
-		Top [COUNT] objects experiencing many potential collisions
+		排行最高的 [COUNT] 個物件可能發生多次碰撞
 	</floater.string>
 	<floater.string name="colliders_score_label">
 		積分
 	</floater.string>
 	<floater.string name="none_descriptor">
-		未發現。
+		查無結果。
 	</floater.string>
 	<text name="title_text">
 		載入中...
@@ -30,11 +27,12 @@
 	<scroll_list name="objects_list">
 		<scroll_list.columns label="積分" name="score"/>
 		<scroll_list.columns label="名稱" name="name"/>
-		<scroll_list.columns label="擁有者" name="owner"/>
+		<scroll_list.columns label="所有人" name="owner"/>
 		<scroll_list.columns label="位置" name="location"/>
-		<scroll_list.columns label="Time" name="time"/>
-		<scroll_list.columns label="Mono Time" name="mono_time"/>
-		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="地段" name="parcel"/>
+		<scroll_list.columns label="時間" name="time"/>
+		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="記憶體 (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		物件 ID:
@@ -45,11 +43,15 @@
 	</text>
 	<button label="過濾器" name="filter_object_btn"/>
 	<text name="owner_name_text">
-		擁有者：
+		所有人：
 	</text>
 	<button label="過濾器" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		地段：
+	</text>
+	<button label="過濾器" name="filter_parcel_btn"/>
 	<button label="退回所選擇的" name="return_selected_btn"/>
 	<button label="全部退回" name="return_all_btn"/>
-	<button label="關閉所選擇的" name="disable_selected_btn"/>
-	<button label="全部關閉" name="disable_all_btn"/>
+	<button label="停用所選的" name="disable_selected_btn"/>
+	<button label="全部停用" name="disable_all_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
index 5f9e16afe1..3da9445a55 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -4,12 +4,12 @@
 		http://secondlife.com/app/tos/
 	</floater.string>
 	<floater.string name="loading_url">
-		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
+		data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E 正在載入 %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E
 	</floater.string>
 	<button label="繼續" label_selected="繼續" name="Continue"/>
 	<button label="取消" label_selected="取消" name="Cancel"/>
 	<check_box label="我同意接受服務條款及隱私政策" name="agree_chk"/>
 	<text name="tos_heading">
-		請謹慎閱讀以下的服務條款及隱私政策。要繼續登入到 [SECOND_LIFE]，你必須接受這些協議。
+		請仔細閱讀以下服務條款及隱私政策。 繼續登入 [SECOND_LIFE] 前，你必須同意條款。
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_toybox.xml b/indra/newview/skins/default/xui/zh/floater_toybox.xml
new file mode 100755
index 0000000000..fc6b6ea611
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_toybox.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Toybox" title="工具列按鈕">
+	<text name="toybox label 1">
+		將按鈕拖入或拖離工具列，即可新增或移除該按鈕。
+	</text>
+	<text name="toybox label 2">
+		按鈕將根據每一個工具列的設定，僅顯示圖示或一併顯示文字標籤。
+	</text>
+	<button label="清除所有工具列" label_selected="清除所有工具列" name="btn_clear_all"/>
+	<button label="還原預設值" label_selected="還原預設值" name="btn_restore_defaults"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_translation_settings.xml b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
new file mode 100755
index 0000000000..fe84872557
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_translation_settings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_translation_settings" title="聊天內容翻譯設定">
+	<string name="bing_api_key_not_verified">
+		Bing AppID 未通過驗證。 請再試一次。
+	</string>
+	<string name="google_api_key_not_verified">
+		Google API 鍵值未通過驗證。 請再試一次。
+	</string>
+	<string name="bing_api_key_verified">
+		Bing AppID 驗證成功。
+	</string>
+	<string name="google_api_key_verified">
+		Google API 鍵值驗證成功。
+	</string>
+	<check_box label="聊天時啟用機器翻譯" name="translate_chat_checkbox"/>
+	<text name="translate_language_label">
+		將聊天內容翻譯成：
+	</text>
+	<combo_box name="translate_language_combo">
+		<combo_box.item label="系統預設" name="System Default Language"/>
+		<combo_box.item label="英語" name="English"/>
+		<combo_box.item label="Dansk（丹麥語）" name="Danish"/>
+		<combo_box.item label="Deutsch（德語）" name="German"/>
+		<combo_box.item label="Español（西班牙語）" name="Spanish"/>
+		<combo_box.item label="Français（法語）" name="French"/>
+		<combo_box.item label="Italiano（義大利語）" name="Italian"/>
+		<combo_box.item label="Magyar（匈牙利語）" name="Hungarian"/>
+		<combo_box.item label="Nederlands（荷蘭語）" name="Dutch"/>
+		<combo_box.item label="Polski（波蘭語）" name="Polish"/>
+		<combo_box.item label="Português（葡萄牙語）" name="Portugese"/>
+		<combo_box.item label="Русский（俄羅斯語）" name="Russian"/>
+		<combo_box.item label="Türkçe（土耳其語）" name="Turkish"/>
+		<combo_box.item label="Українська（烏克蘭語）" name="Ukrainian"/>
+		<combo_box.item label="中文（正體）" name="Chinese"/>
+		<combo_box.item label="日本語（日語）" name="Japanese"/>
+		<combo_box.item label="한국어（漢語）" name="Korean"/>
+	</combo_box>
+	<text name="tip">
+		選擇翻譯服務：
+	</text>
+	<radio_group name="translation_service_rg">
+		<radio_item initial_value="bing" label="Bing 翻譯器" name="bing"/>
+		<radio_item initial_value="google" label="Google 翻譯" name="google"/>
+	</radio_group>
+	<text name="bing_api_key_label">
+		Bing [http://www.bing.com/developers/createapp.aspx AppID]：
+	</text>
+	<button label="驗證" name="verify_bing_api_key_btn"/>
+	<text name="google_api_key_label">
+		Google [http://code.google.com/apis/language/translate/v2/getting_started.html#auth API 鍵值]：
+	</text>
+	<button label="驗證" name="verify_google_api_key_btn"/>
+	<text name="google_links_text">
+		[http://code.google.com/apis/language/translate/v2/pricing.html 價格表] | [https://code.google.com/apis/console 統計]
+	</text>
+	<button label="確定" name="ok_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
index 9e3f3cd47d..9e3f3cd47d 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_url_entry.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
new file mode 100644
index 0000000000..96caa7d333
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_voice_volume" title="語音聊天音量">
+	<slider label="語音聊天" name="chat_voice_volume"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
index 24b7efea4f..a3a7679957 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_controls.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_voice_controls" title="語音控制">
 	<string name="title_nearby">
-		附近的語音
+		語音設定
 	</string>
 	<string name="title_group">
 		與 [GROUP] 進行群組通話
 	</string>
 	<string name="title_adhoc">
-		會議通話
+		多方通話
 	</string>
 	<string name="title_peer_2_peer">
-		與 [NAME] 進行通話
+		和 [NAME] 通話
 	</string>
 	<string name="no_one_near">
 		附近沒有一人開啟語音
@@ -22,7 +22,7 @@
 		<layout_panel name="leave_call_panel">
 			<layout_stack name="voice_effect_and_leave_call_stack">
 				<layout_panel name="leave_call_btn_panel">
-					<button label="結束通話" name="leave_call_btn"/>
+					<button label="離開通話" name="leave_call_btn"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index 36efe20b65..aab5fa6028 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,29 +1,158 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲">
+<floater label="地點" name="voice_effects" title="語音變聲試聽">
 	<string name="no_voice_effect">
-		(No Voice Morph)
+		（無變聲效果）
 	</string>
 	<string name="active_voice_effect">
-		(Active)
+		（使用中）
 	</string>
 	<string name="unsubscribed_voice_effect">
-		(Unsubscribed)
+		（已停止訂用）
 	</string>
 	<string name="new_voice_effect">
-		(New!)
+		（新的！）
+	</string>
+	<string name="effect_Arena">
+		競技場
+	</string>
+	<string name="effect_Beast">
+		野獸
+	</string>
+	<string name="effect_Buff">
+		Buff
+	</string>
+	<string name="effect_Buzz">
+		Buzz
+	</string>
+	<string name="effect_Camille">
+		卡蜜兒
+	</string>
+	<string name="effect_Creepy">
+		怪異
+	</string>
+	<string name="effect_CreepyBot">
+		怪異機器人
+	</string>
+	<string name="effect_Cyber">
+		科幻
+	</string>
+	<string name="effect_DeepBot">
+		深沉機器人
+	</string>
+	<string name="effect_Demon">
+		魔鬼
+	</string>
+	<string name="effect_Female Elf">
+		女性 - 小精靈
+	</string>
+	<string name="effect_Flirty">
+		調情
+	</string>
+	<string name="effect_Foxy">
+		香豔
+	</string>
+	<string name="effect_Halloween 2010 Bonus">
+		2010萬聖節加贈
+	</string>
+	<string name="effect_Helium">
+		氦氣
+	</string>
+	<string name="effect_Husky">
+		沙啞
+	</string>
+	<string name="effect_Husky Whisper">
+		沙啞耳語
+	</string>
+	<string name="effect_Intercom">
+		對講機
+	</string>
+	<string name="effect_Julia">
+		茱莉亞
+	</string>
+	<string name="effect_Lo Lilt">
+		輕微抑揚頓挫
+	</string>
+	<string name="effect_Macho">
+		陽剛
+	</string>
+	<string name="effect_Micro">
+		Micro
+	</string>
+	<string name="effect_Mini">
+		迷你
+	</string>
+	<string name="effect_Model">
+		模型
+	</string>
+	<string name="effect_Nano">
+		Nano
+	</string>
+	<string name="effect_Nightmare">
+		惡夢
+	</string>
+	<string name="effect_PopBot">
+		PopBot
+	</string>
+	<string name="effect_Rachel">
+		瑞秋
+	</string>
+	<string name="effect_Radio">
+		收音機
+	</string>
+	<string name="effect_Robot">
+		機器人
+	</string>
+	<string name="effect_Roxanne">
+		蘿姍
+	</string>
+	<string name="effect_Rumble">
+		低沉隆隆聲
+	</string>
+	<string name="effect_Sabrina">
+		薩賓娜
+	</string>
+	<string name="effect_Samantha">
+		姍曼莎
+	</string>
+	<string name="effect_Sexy">
+		性感
+	</string>
+	<string name="effect_Shorty">
+		矮個兒
+	</string>
+	<string name="effect_Smaller">
+		較小
+	</string>
+	<string name="effect_Sneaky">
+		鬼祟
+	</string>
+	<string name="effect_Stallion">
+		種馬
+	</string>
+	<string name="effect_Sultry">
+		勾魂
+	</string>
+	<string name="effect_Thunder">
+		雷聲
+	</string>
+	<string name="effect_Vixen">
+		潑婦
+	</string>
+	<string name="effect_WhinyBot">
+		哭鬧機器人
 	</string>
 	<text name="preview_text">
-		To Preview
+		預覽
 	</text>
 	<text name="status_text">
-		Record a sample, then click on a voice to hear how it will sound.
+		錄下一段樣本，再點按聲音檢查結果。
 	</text>
-	<button label="Record" name="record_btn" tool_tip="Record a sample of your voice."/>
+	<button label="錄音" name="record_btn" tool_tip="錄下一段你的聲音。"/>
 	<button label="停止" name="record_stop_btn"/>
 	<text name="voice_morphing_link">
-		[[URL] Subscribe Now]
+		[[URL] 現在訂用]
 	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Record a sample of your voice, then click an effect to preview.">
+	<scroll_list name="voice_effect_list" tool_tip="錄下一段你的聲音，再點選一個效果試聽。">
 		<scroll_list.columns label="語音名稱" name="name"/>
 		<scroll_list.columns label="過期" name="expires"/>
 	</scroll_list>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
new file mode 100644
index 0000000000..4260a8d331
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--
+  Not can_close / no title to avoid window chrome
+  Single instance - only have one at a time, recycle it each spawn
+-->
+<floater name="floater_voice_volume" title="音量">
+	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
deleted file mode 100644
index 5fb57272af..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="進階水文編輯器">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Water Presets:
-	</text>
-	<button label="新增" label_selected="新增" name="WaterNewPreset"/>
-	<button label="儲存" label_selected="儲存" name="WaterSavePreset"/>
-	<button label="刪除" label_selected="刪除" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="設定" name="Settings">
-			<text name="BHText">
-				Water Fog Color
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/>
-			<text name="WaterFogDensText">
-				Fog Density Exponent
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Underwater Fog Modifier
-			</text>
-			<text name="BDensText">
-				Reflection Wavelet Scale
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel Scale
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel Offset
-			</text>
-			<text name="DensMultText">
-				Refract Scale Above
-			</text>
-			<text name="WaterScaleBelowText">
-				Refract Scale Below
-			</text>
-			<text name="MaxAltText">
-				Blur Multiplier
-			</text>
-		</panel>
-		<panel label="圖像" name="Waves">
-			<text name="BHText">
-				Big Wave Direction
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Little Wave Direction
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				正常地圖
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_web_content.xml b/indra/newview/skins/default/xui/zh/floater_web_content.xml
index be6bf8bb27..be6bf8bb27 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/zh/floater_web_content.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
index 967e36ead7..967e36ead7 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/zh/floater_whitelist_entry.xml
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
deleted file mode 100644
index 383e35d50d..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="進階天空編輯器">
-	<floater.string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		天空預設值：
-	</text>
-	<button label="新增" label_selected="新增" name="WLNewPreset"/>
-	<button label="儲存" label_selected="儲存" name="WLSavePreset"/>
-	<button label="刪除" label_selected="刪除" name="WLDeletePreset"/>
-	<button label="日循環編輯器" label_selected="日循環編輯器" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="大氣" name="Atmosphere">
-			<text name="BHText">
-				藍天水平線
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				陰霾水平線
-			</text>
-			<text name="BDensText2">
-				藍天密度
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				陰霾密度
-			</text>
-			<text name="DensMultText">
-				密度倍增
-			</text>
-			<text name="WLDistanceMultText">
-				距離倍增
-			</text>
-			<text name="MaxAltText">
-				最大高度
-			</text>
-		</panel>
-		<panel label="照明" name="Lighting">
-			<text name="SLCText">
-				日／月 顏色
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				日／月 位置
-			</text>
-			<text name="WLAmbientText">
-				環境
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				東升角度
-			</text>
-			<text name="SunGlowText">
-				太陽光輝
-			</text>
-			<slider label="焦點" name="WLGlowB"/>
-			<slider label="尺寸" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				場景 Gamma 值
-			</text>
-			<text name="WLStarText">
-				星空量度
-			</text>
-		</panel>
-		<panel label="雲彩" name="Clouds">
-			<text name="WLCloudColorText">
-				雲彩顏色
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				雲彩 XY 軸 / 密度
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				雲彩覆蓋
-			</text>
-			<text name="WLCloudScaleText">
-				雲彩規模
-			</text>
-			<text name="WLCloudDetailText">
-				雲彩細節（XY 軸 / 密度）
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				雲彩 X 滾軸
-			</text>
-			<check_box label="鎖定" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				雲彩 Y 滾軸
-			</text>
-			<check_box label="鎖定" name="WLCloudLockY"/>
-			<check_box label="描繪傳統雲彩" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_window_size.xml b/indra/newview/skins/default/xui/zh/floater_window_size.xml
index 54b72afccc..3942f72d76 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/zh/floater_window_size.xml
@@ -7,10 +7,17 @@
 		設定視窗尺寸大小：
 	</text>
 	<combo_box name="window_size_combo" tool_tip="寬度 x 高度">
-		<combo_box.item label="1000 x 700 （預設）" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 （720p）" name="item2"/>
-		<combo_box.item label="1920 x 1080 （1080p）" name="item3"/>
+		<combo_box.item label="1000 x 700 （預設）" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="取消" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_world_map.xml b/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 6ac6fb76b7..4cd05ebaa0 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -8,7 +8,7 @@
 	<panel name="layout_panel_2">
 		<button name="Show My Location" tool_tip="以我的化身所在位置居中地圖"/>
 		<text name="me_label">
-			自己
+			我自己
 		</text>
 		<text name="person_label">
 			人
@@ -23,14 +23,14 @@
 			土地拍賣
 		</text>
 		<text name="by_owner_label">
-			依擁有者
+			依所有人
 		</text>
-		<button name="Go Home" tool_tip="瞬間傳送到我的家位置"/>
+		<button name="Go Home" tool_tip="瞬間返回我的家"/>
 		<text name="Home_label">
-			家
+			我的家
 		</text>
 		<text name="events_label">
-			事件：
+			活動：
 		</text>
 		<text name="pg_label">
 			一般普級
@@ -57,17 +57,17 @@
 		</combo_box>
 		<search_editor label="地區依名稱" name="location" tool_tip="輸入一個地區的名稱"/>
 		<button label="尋找" name="DoSearch" tool_tip="搜尋地區"/>
-		<button name="Clear" tool_tip="Clear tracking lines and reset map"/>
+		<button name="Clear" tool_tip="清楚追蹤線並重設地圖"/>
 		<text name="events_label">
 			位置：
 		</text>
 		<button label="瞬間傳送" name="Teleport" tool_tip="瞬間傳送到所選的位置"/>
-		<button label="覆製 SLurl" name="copy_slurl" tool_tip="Copies current location as SLurl to be used on the web."/>
-		<button label="Show Selection" name="Show Destination" tool_tip="Center map on selected location"/>
+		<button label="覆製 SLurl" name="copy_slurl" tool_tip="將目前位置複製為可在網路上使用的 SLurl。"/>
+		<button label="顯示選擇" name="Show Destination" tool_tip="將所選位置移到地圖中央"/>
 	</panel>
 	<panel name="layout_panel_5">
 		<text name="zoom_label">
-			Zoom
+			縮放
 		</text>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/inspect_avatar.xml b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
index 02e81983a6..ef10e5d2d0 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_avatar.xml
@@ -10,16 +10,16 @@
 	<string name="Details">
 		[SL_PROFILE]
 	</string>
-	<text name="user_subtitle" value="11 Months, 3 days old"/>
+	<text name="user_subtitle" value="年齡 11 個月又 3 天"/>
 	<text name="user_details">
-		This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot
+		這是我的「第二人生」資訊。這地方太棒了！ 只不過，可是嘛……我的訊息相當相當的冗長，因為……我滿愛七嘴八舌的啦。
 	</text>
-	<slider name="volume_slider" tool_tip="Voice volume" value="0.5"/>
+	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
 	<button label="加為朋友" name="add_friend_btn"/>
 	<button label="IM" name="im_btn"/>
 	<button label="檔案" name="view_profile_btn"/>
 	<panel name="moderator_panel">
-		<button label="Disable Voice" name="disable_voice"/>
-		<button label="Enable Voice" name="enable_voice"/>
+		<button label="停用語音" name="disable_voice"/>
+		<button label="啟用語音" name="enable_voice"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/inspect_group.xml b/indra/newview/skins/default/xui/zh/inspect_group.xml
index ac331be203..ca5ccc3349 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_group.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_group.xml
@@ -17,14 +17,14 @@
 		你是成員
 	</string>
 	<text name="group_subtitle">
-		123 members
+		123 位成員
 	</text>
 	<text name="group_details">
-		A group of folks charged with creating a room with a moose.
-Fear the moose!  Fear it!  And the mongoose too!
+		這一群人責在建立有麋鹿的房間。
+麋鹿萬歲！貓鼬萬歲！
 	</text>
 	<text name="group_cost">
-		L$123 to join
+		加入費用 L$123
 	</text>
 	<button label="加入" name="join_btn"/>
 	<button label="退出" name="leave_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/inspect_object.xml b/indra/newview/skins/default/xui/zh/inspect_object.xml
index 58091b3aef..377b8b7c78 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_object.xml
@@ -5,40 +5,40 @@
 -->
 <floater name="inspect_object">
 	<string name="Creator">
-		By [CREATOR]
+		創作人 [CREATOR]
 	</string>
 	<string name="CreatorAndOwner">
-		By [CREATOR]
-Owner [OWNER]
+		創作人 [CREATOR]
+所有人 [OWNER]
 	</string>
 	<string name="Price">
 		L$[AMOUNT]
 	</string>
 	<string name="PriceFree">
-		Free!
+		免費！
 	</string>
 	<string name="Touch">
-		Touch
+		觸碰
 	</string>
 	<string name="Sit">
-		Sit
+		坐下
 	</string>
 	<text name="object_creator">
-		by secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-owner secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+		創作人 secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+所有人 secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 	</text>
 	<text name="price_text">
 		L$30,000
 	</text>
-	<icon name="secure_browsing" tool_tip="Secure Browsing"/>
+	<icon name="secure_browsing" tool_tip="安全瀏覽"/>
 	<text name="object_media_url">
 		http://www.superdupertest.com
 	</text>
 	<button label="購買" name="buy_btn"/>
 	<button label="支付" name="pay_btn"/>
 	<button label="取得副本" name="take_free_copy_btn"/>
-	<button label="Touch" name="touch_btn"/>
-	<button label="Sit" name="sit_btn"/>
-	<button label="Open" name="open_btn"/>
-	<button label="More" name="more_info_btn"/>
+	<button label="觸碰" name="touch_btn"/>
+	<button label="坐下" name="sit_btn"/>
+	<button label="打開" name="open_btn"/>
+	<button label="更多" name="more_info_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
index bed19d6d78..b8418fc8a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
+++ b/indra/newview/skins/default/xui/zh/inspect_remote_object.xml
@@ -5,10 +5,10 @@
 -->
 <floater name="inspect_remote_object">
 	<text name="object_name">
-		Test Object Name That Is Really Long OMG so long I can&apos;t believe how long the name of this object is, I mean really.
+		測試很長很長、長到不可思議的、落落長的、長得不得了的、很長很長很長、長到我快發瘋、長之又長的物件名稱。
 	</text>
 	<text name="object_owner_label">
-		擁有者：
+		所有人：
 	</text>
 	<text name="object_owner">
 		Longavatarname Johnsonlongstonnammer
diff --git a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
index 3c8c3e4a31..3c8c3e4a31 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_add_wearable_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index 885c4b9add..41b3409627 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -11,7 +11,9 @@
 	<menu_item_call label="凍結" name="Freeze..."/>
 	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
index 1911a1aeff..eb1bad0ca2 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_self.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Attachment Pie">
-	<menu_item_call label="Touch" name="Attachment Object Touch"/>
+	<menu_item_call label="觸碰" name="Attachment Object Touch"/>
 	<menu_item_call label="編輯" name="Edit..."/>
 	<menu_item_call label="卸下" name="Detach"/>
 	<menu_item_call label="坐下" name="Sit Down Here"/>
@@ -10,7 +10,9 @@
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
 	<menu_item_call label="我的群組" name="Groups..."/>
-	<menu_item_call label="我的檔案" name="Profile..."/>
+	<menu_item_call label="我的個人檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="丟棄" name="Drop"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
index ef0986a13b..ef0986a13b 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_icon.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index 260571eb54..dc035bafa0 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -6,11 +6,13 @@
 	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="邀請加入群組" name="Invite..."/>
-	<menu_item_call label="Block" name="Avatar Mute"/>
+	<menu_item_call label="封鎖" name="Avatar Mute"/>
 	<menu_item_call label="回報" name="abuse"/>
 	<menu_item_call label="凍結" name="Freeze..."/>
 	<menu_item_call label="踢出" name="Eject..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
-	<menu_item_call label="Zoom In" name="Zoom In"/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
+	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
index d516e3ab58..68d0600141 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_self.xml
@@ -14,19 +14,21 @@
 			<menu_item_call label="內衣" name="Self Undershirt"/>
 			<menu_item_call label="內褲" name="Self Underpants"/>
 			<menu_item_call label="刺青" name="Self Tattoo"/>
-			<menu_item_call label="Physics" name="Self Physics"/>
+			<menu_item_call label="身體物理" name="Self Physics"/>
 			<menu_item_call label="半透明" name="Self Alpha"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="擡頭顯示" name="Object Detach HUD"/>
 		<context_menu label="卸下" name="Object Detach"/>
 		<menu_item_call label="全部卸下" name="Detach All"/>
 	</context_menu>
 	<menu_item_call label="我的外觀" name="Chenge Outfit"/>
-	<menu_item_call label="編輯我裝扮" name="Edit Outfit"/>
+	<menu_item_call label="編輯我的裝扮" name="Edit Outfit"/>
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
 	<menu_item_call label="我的群組" name="Groups..."/>
-	<menu_item_call label="我的檔案" name="Profile..."/>
+	<menu_item_call label="我的個人檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
+	<menu_item_call label="傾印 XML" name="Dump XML"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_bottomtray.xml b/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
deleted file mode 100644
index a00aa7cd35..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="講話按鈕" name="EnableVoiceChat"/>
-	<menu_item_check label="姿勢按鈕" name="ShowGestureButton"/>
-	<menu_item_check label="移動按鈕" name="ShowMoveButton"/>
-	<menu_item_check label="視角按鈕" name="ShowCameraButton"/>
-	<menu_item_check label="快照按鈕" name="ShowSnapshotButton"/>
-	<menu_item_check label="建造按鈕" name="ShowBuildButton"/>
-	<menu_item_check label="搜尋按鈕" name="ShowSearchButton"/>
-	<menu_item_check label="地圖按鈕" name="ShowWorldMapButton"/>
-	<menu_item_check label="迷你地圖按鈕" name="ShowMiniMapButton"/>
-	<menu_item_call label="剪下" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="覆製" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="貼上" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="刪除" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="全選" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
index 876fef16df..876fef16df 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_attachment.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
index d06207b19d..d06207b19d 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_body_part.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
index 300ff47b12..300ff47b12 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_clothing.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index cd069f9601..eb7093a23c 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
-	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
+	<menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
new file mode 100644
index 0000000000..adfeefc337
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_participant">
+	<menu_item_call label="關閉交談" name="close_conversation"/>
+	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
+	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
+	<menu_item_call label="關閉所選" name="close_selected_conversations"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="新增朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="禁止語音" name="block_unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+	<menu_item_call label="群組檔案" name="group_profile"/>
+	<menu_item_call label="啟用群組" name="activate_group"/>
+	<menu_item_call label="離開群組" name="leave_group"/>
+	<context_menu label="主持人選項" name="Moderator Options">
+		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
+		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
+		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
+	</context_menu>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
new file mode 100644
index 0000000000..49e91417e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Context Menu">
+	<menu_item_call label="IM…" name="IM"/>
+	<menu_item_call label="語音通話…" name="Call"/>
+	<menu_item_call label="開啟聊天歷史…" name="Chat history"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="Invite"/>
+	<menu_item_call label="地圖" name="Map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
new file mode 100644
index 0000000000..3fa99a5cd7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_conversation_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依日期排序" name="sort_by_date"/>
+	<menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
+	<menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_edit.xml b/indra/newview/skins/default/xui/zh/menu_edit.xml
index d6eb87a6b0..bda640e5f3 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_edit.xml
+++ b/indra/newview/skins/default/xui/zh/menu_edit.xml
@@ -3,7 +3,7 @@
 	<menu_item_call label="復原" name="Undo"/>
 	<menu_item_call label="重做" name="Redo"/>
 	<menu_item_call label="剪下" name="Cut"/>
-	<menu_item_call label="覆製" name="Copy"/>
+	<menu_item_call label="恚庨" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="覆製貼上" name="Duplicate"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_favorites.xml b/indra/newview/skins/default/xui/zh/menu_favorites.xml
index c60bebd3dc..a01412ce1c 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_favorites.xml
+++ b/indra/newview/skins/default/xui/zh/menu_favorites.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="察看 / 編輯 地標" name="Landmark Open"/>
 	<menu_item_call label="覆製 SLurl" name="Copy slurl"/>
 	<menu_item_call label="顯示在地圖上" name="Show On Map"/>
-	<menu_item_call label="覆製" name="Landmark Copy"/>
+	<menu_item_call label="恚庨" name="Landmark Copy"/>
 	<menu_item_call label="貼上" name="Landmark Paste"/>
 	<menu_item_call label="刪除" name="Delete"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
index a331c47a6e..5a38197e4c 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_gesture_gear.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_gesture_gear">
 	<menu_item_call label="由我的最愛中 添加/移除" name="activate"/>
-	<menu_item_call label="覆製" name="copy_gesture"/>
+	<menu_item_call label="恚庨" name="copy_gesture"/>
 	<menu_item_call label="貼上" name="paste"/>
 	<menu_item_call label="覆製 UUID" name="copy_uuid"/>
 	<menu_item_call label="儲存到目前裝扮" name="save_to_outfit"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_group_plus.xml b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
index d4a5a69104..d4a5a69104 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_group_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_group_plus.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
index dbb8ececaa..3f6820cb32 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_hide_navbar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="hide_navbar_menu">
-	<menu_item_check label="顯示導覽列" name="ShowNavbarNavigationPanel"/>
+	<menu_item_check label="顯示導覽列和我的最愛" name="ShowNavbarNavigationPanel"/>
 	<menu_item_check label="顯示最愛列" name="ShowNavbarFavoritesPanel"/>
 	<menu_item_check label="顯示迷你位置列" name="ShowMiniLocationPanel"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
new file mode 100644
index 0000000000..815b0b594c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="Conversation Gear Menu">
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="加為朋友" name="Add Friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="聊天歷史……" name="chat_history"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="禁止語音" name="Block/Unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
new file mode 100644
index 0000000000..a7006e524a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_modes">
+	<menu_item_check label="精簡視野" name="compact_view"/>
+	<menu_item_check label="全展視野" name="expanded_view"/>
+	<menu_item_check label="顯示時間" name="IMShowTime"/>
+	<menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml b/indra/newview/skins/default/xui/zh/menu_im_well_button.xml
deleted file mode 100644
index 4b9b4b2758..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_well_button.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<context_menu name="IM Well Button Context Menu">
-	<menu_item_call label="全部關閉" name="Close All"/>
-</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
index 85417d554e..85417d554e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_adhoc.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
index 4664fcb027..4664fcb027 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_group.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
index 636bdaae09..636bdaae09 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
+++ b/indra/newview/skins/default/xui/zh/menu_imchiclet_p2p.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
index 7385764e4c..f4e886ff67 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_avatar_gear.xml
@@ -6,16 +6,16 @@
 	<menu_item_call label="通話" name="call"/>
 	<menu_item_call label="瞬間傳送" name="teleport"/>
 	<menu_item_call label="邀請加入群組" name="invite_to_group"/>
-	<menu_item_call label="Block" name="block"/>
-	<menu_item_call label="Unblock" name="unblock"/>
+	<menu_item_call label="封鎖" name="block"/>
+	<menu_item_call label="解除封鎖" name="unblock"/>
 	<menu_item_call label="回報" name="report"/>
 	<menu_item_call label="凍結" name="freeze"/>
 	<menu_item_call label="踢出" name="eject"/>
 	<menu_item_call label="踢出" name="kick"/>
-	<menu_item_call label="CSR" name="csr"/>
+	<menu_item_call label="客服" name="csr"/>
 	<menu_item_call label="材質除錯" name="debug"/>
 	<menu_item_call label="在地圖上尋找" name="find_on_map"/>
-	<menu_item_call label="Zoom In" name="zoom_in"/>
+	<menu_item_call label="放大" name="zoom_in"/>
 	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="分享" name="share"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
index 94ab82b8a9..abff0f64ac 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_object_gear.xml
@@ -2,17 +2,18 @@
 <toggleable_menu name="Gear Menu">
 	<menu_item_call label="觸碰" name="touch"/>
 	<menu_item_call label="坐下" name="sit"/>
-	<menu_item_call label="Pay" name="pay"/>
+	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="購買" name="buy"/>
 	<menu_item_call label="取得" name="take"/>
 	<menu_item_call label="取得副本" name="take_copy"/>
-	<menu_item_call label="開啟" name="open"/>
+	<menu_item_call label="打開" name="open"/>
 	<menu_item_call label="編輯" name="edit"/>
 	<menu_item_call label="穿上" name="wear"/>
 	<menu_item_call label="添加" name="add"/>
 	<menu_item_call label="回報" name="report"/>
-	<menu_item_call label="Block" name="block"/>
-	<menu_item_call label="Zoom In" name="zoom_in"/>
+	<menu_item_call label="封鎖" name="block"/>
+	<menu_item_call label="解除封鎖" name="unblock"/>
+	<menu_item_call label="放大" name="zoom_in"/>
 	<menu_item_call label="移除" name="remove"/>
 	<menu_item_call label="更多資訊" name="more_info"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
index 1c75705743..c48ee0c9be 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
@@ -17,7 +17,7 @@
 			<menu_item_call label="半透明" name="Self Alpha"/>
 			<menu_item_call label="全部衣服" name="All Clothes"/>
 		</context_menu>
-		<context_menu label="HUD" name="Object Detach HUD"/>
+		<context_menu label="擡頭顯示" name="Object Detach HUD"/>
 		<context_menu label="卸下" name="Object Detach"/>
 		<menu_item_call label="全部卸下" name="Detach All"/>
 	</context_menu>
@@ -26,6 +26,6 @@
 	<menu_item_call label="編輯我的體形" name="Edit My Shape"/>
 	<menu_item_call label="我的朋友" name="Friends..."/>
 	<menu_item_call label="我的群組" name="Groups..."/>
-	<menu_item_call label="我的檔案" name="Profile..."/>
+	<menu_item_call label="我的個人檔案" name="Profile..."/>
 	<menu_item_call label="材質除錯" name="Debug..."/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
index 577e5988f8..577e5988f8 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inv_offer_chiclet.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory.xml b/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 87d769af0d..7f745ffaa7 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -2,13 +2,13 @@
 <menu name="Popup">
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="購買" name="Task Buy"/>
-	<menu_item_call label="開啟" name="Task Open"/>
+	<menu_item_call label="打開" name="Task Open"/>
 	<menu_item_call label="播放" name="Task Play"/>
 	<menu_item_call label="屬性" name="Task Properties"/>
 	<menu_item_call label="更名" name="Task Rename"/>
 	<menu_item_call label="刪除" name="Task Remove"/>
 	<menu_item_call label="清空垃圾筒" name="Empty Trash"/>
-	<menu_item_call label="清空 Lost And Found" name="Empty Lost And Found"/>
+	<menu_item_call label="清空所有失物" name="Empty Lost And Found"/>
 	<menu_item_call label="新資料夾" name="New Folder"/>
 	<menu_item_call label="新腳本" name="New Script"/>
 	<menu_item_call label="新記事卡" name="New Note"/>
@@ -18,7 +18,7 @@
 		<menu_item_call label="新褲子" name="New Pants"/>
 		<menu_item_call label="新鞋子" name="New Shoes"/>
 		<menu_item_call label="新襪子" name="New Socks"/>
-		<menu_item_call label="新夾克" name="New Jacket"/>
+		<menu_item_call label="新外套" name="New Jacket"/>
 		<menu_item_call label="新裙子" name="New Skirt"/>
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
@@ -46,42 +46,46 @@
 		<menu_item_call label="內衣" name="Undershirt"/>
 	</menu>
 	<menu_item_call label="瞬間傳送" name="Landmark Open"/>
-	<menu_item_call label="開啟" name="Animation Open"/>
-	<menu_item_call label="開啟" name="Sound Open"/>
+	<menu_item_call label="打開" name="Animation Open"/>
+	<menu_item_call label="打開" name="Sound Open"/>
 	<menu_item_call label="取代目前的裝扮" name="Replace Outfit"/>
 	<menu_item_call label="添加到目前裝扮" name="Add To Outfit"/>
 	<menu_item_call label="由目前的裝扮移除" name="Remove From Outfit"/>
 	<menu_item_call label="尋找原件" name="Find Original"/>
 	<menu_item_call label="清空物品" name="Purge Item"/>
-	<menu_item_call label="恢復物品" name="Restore Item"/>
-	<menu_item_call label="開啟" name="Open"/>
+	<menu_item_call label="還原物品" name="Restore Item"/>
+	<menu_item_call label="打開" name="Open"/>
 	<menu_item_call label="開啟原件" name="Open Original"/>
 	<menu_item_call label="屬性" name="Properties"/>
 	<menu_item_call label="更名" name="Rename"/>
 	<menu_item_call label="覆製資產 UUID" name="Copy Asset UUID"/>
-	<menu_item_call label="覆製" name="Copy"/>
+	<menu_item_call label="剪下" name="Cut"/>
+	<menu_item_call label="恚庨" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
-	<menu_item_call label="Paste As Link" name="Paste As Link"/>
+	<menu_item_call label="以連結格式貼上" name="Paste As Link"/>
 	<menu_item_call label="刪除" name="Remove Link"/>
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="刪除系統資料夾" name="Delete System Folder"/>
-	<menu_item_call label="Start Conference Chat" name="Conference Chat Folder"/>
+	<menu_item_call label="發起多方通話" name="Conference Chat Folder"/>
 	<menu_item_call label="播放" name="Sound Play"/>
+	<menu_item_call label="覆製 SLurl" name="url_copy"/>
 	<menu_item_call label="添加地標" name="About Landmark"/>
-	<menu_item_call label="播放於虛擬世界" name="Animation Play"/>
-	<menu_item_call label="播放於本地" name="Animation Audition"/>
+	<menu_item_call label="在虛擬世界播放" name="Animation Play"/>
+	<menu_item_call label="在本地播放" name="Animation Audition"/>
 	<menu_item_call label="送出即時訊息" name="Send Instant Message"/>
-	<menu_item_call label="發給瞬間傳送請求..." name="Offer Teleport..."/>
-	<menu_item_call label="開始會議交談" name="Conference Chat"/>
-	<menu_item_call label="Activate" name="Activate"/>
-	<menu_item_call label="Deactivate" name="Deactivate"/>
-	<menu_item_call label="另存" name="Save As"/>
-	<menu_item_call label="Detach From Yourself" name="Detach From Yourself"/>
-	<menu_item_call label="Wear" name="Wearable And Object Wear"/>
-	<menu label="Attach To" name="Attach To"/>
-	<menu label="Attach To HUD" name="Attach To HUD"/>
+	<menu_item_call label="發出瞬間傳送邀請..." name="Offer Teleport..."/>
+	<menu_item_call label="發起多方通話" name="Conference Chat"/>
+	<menu_item_call label="啟動" name="Activate"/>
+	<menu_item_call label="停用" name="Deactivate"/>
+	<menu_item_call label="另存為" name="Save As"/>
+	<menu_item_call label="從你身上移除" name="Detach From Yourself"/>
+	<menu_item_call label="穿上" name="Wearable And Object Wear"/>
+	<menu label="附著到..." name="Attach To"/>
+	<menu label="附著到擡頭顯示" name="Attach To HUD"/>
 	<menu_item_call label="編輯" name="Wearable Edit"/>
 	<menu_item_call label="添加" name="Wearable Add"/>
 	<menu_item_call label="脫下" name="Take Off"/>
+	<menu_item_call label="複製到商家發件匣" name="Merchant Copy"/>
+	<menu_item_call label="送往第二人生購物市集" name="Marketplace Send"/>
 	<menu_item_call label="-- 無選項 --" name="--no options--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
index a0fc060e27..30bf5a7e75 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
@@ -4,7 +4,9 @@
 		<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 		<menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/>
 		<menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/>
-		<menu_item_call label="大批（L$[COST] 每檔案）..." name="Bulk Upload"/>
+		<menu_item_call label="模型…" name="Upload Model"/>
+		<menu_item_call label="模型精靈…" name="Upload Model Wizard"/>
+		<menu_item_call label="批量（每檔案 L$[COST] ）..." name="Bulk Upload"/>
 		<menu_item_call label="設定預設上傳權限" name="perm prefs"/>
 	</menu>
 	<menu_item_call label="新資料夾" name="New Folder"/>
@@ -16,7 +18,7 @@
 		<menu_item_call label="新褲子" name="New Pants"/>
 		<menu_item_call label="新鞋子" name="New Shoes"/>
 		<menu_item_call label="新襪子" name="New Socks"/>
-		<menu_item_call label="新夾克" name="New Jacket"/>
+		<menu_item_call label="新外套" name="New Jacket"/>
 		<menu_item_call label="新裙子" name="New Skirt"/>
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
index 8ad0e7324f..8ad0e7324f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_land.xml b/indra/newview/skins/default/xui/zh/menu_land.xml
index 84941d138c..3ad9c0ab31 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_land.xml
+++ b/indra/newview/skins/default/xui/zh/menu_land.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Land Pie">
-	<menu_item_call label="關於土地" name="Place Information..."/>
-	<menu_item_call label="坐在此處" name="Sit Here"/>
+	<menu_item_call label="土地資料" name="Place Information..."/>
+	<menu_item_call label="坐在這裡" name="Sit Here"/>
 	<menu_item_call label="購買這塊土地" name="Land Buy"/>
 	<menu_item_call label="購買通行權" name="Land Buy Pass"/>
 	<menu_item_call label="建造" name="Create"/>
 	<menu_item_call label="編輯地形" name="Edit Terrain"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_landmark.xml b/indra/newview/skins/default/xui/zh/menu_landmark.xml
index 7372b223cf..7372b223cf 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_landmark.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index d6bf34c66e..1d3d771efb 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Login Menu">
-	<menu label="自己" name="File">
-		<menu_item_call label="偏好設定" name="Preferences..."/>
-		<menu_item_call label="結束退出 [APP_NAME]" name="Quit"/>
+	<menu label="我自己" name="File">
+		<menu_item_call label="偏好設定…" name="Preferences..."/>
+		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="幫助" name="Help">
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
@@ -14,11 +14,17 @@
 		<menu_item_call label="UI / 顏色 設定" name="UI/Color Settings"/>
 		<menu_item_call label="XUI 預覽工具" name="UI Preview Tool"/>
 		<menu label="UI 測試" name="UI Tests"/>
-		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
+		<menu_item_call label="設定視窗大小..." name="Set Window Size..."/>
 		<menu_item_call label="顯示 TOS" name="TOS"/>
 		<menu_item_call label="顯示嚴重訊息" name="Critical"/>
-		<menu_item_call label="媒體瀏覽器測試" name="Web Browser Test"/>
-		<menu_item_call label="網頁內容浮動視窗測試" name="Web Content Floater Test"/>
+		<menu_item_call label="網頁內容浮動視窗除錯測試" name="Web Content Floater Debug Test"/>
+		<menu label="設定記錄細節" name="Set Logging Level">
+			<menu_item_check label="除錯" name="Debug"/>
+			<menu_item_check label="資訊" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="錯誤" name="Error"/>
+			<menu_item_check label="無" name="None"/>
+		</menu>
 		<menu_item_check label="顯示網格挑選器" name="Show Grid Picker"/>
 		<menu_item_call label="顯示通知控制台" name="Show Notifications Console"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
index 2ec95aa4f9..d222d7f658 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_media_ctrl.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="media ctrl context menu">
 	<menu_item_call label="剪下" name="Cut"/>
-	<menu_item_call label="覆製" name="Copy"/>
+	<menu_item_call label="恚庨" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
+	<menu_item_call label="開啟網頁偵查器" name="open_webinspector"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_mini_map.xml b/indra/newview/skins/default/xui/zh/menu_mini_map.xml
index 24bc6355c7..7fd629471a 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/zh/menu_mini_map.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="Zoom Close" name="Zoom Close"/>
-	<menu_item_call label="Zoom Medium" name="Zoom Medium"/>
-	<menu_item_call label="Zoom Far" name="Zoom Far"/>
-	<menu_item_call label="Zoom Default" name="Zoom Default"/>
+	<menu_item_call label="放大靠近" name="Zoom Close"/>
+	<menu_item_call label="遠近適距" name="Zoom Medium"/>
+	<menu_item_call label="縮小遠離" name="Zoom Far"/>
+	<menu_item_call label="縮放恢復預設" name="Zoom Default"/>
 	<menu_item_check label="旋轉地圖" name="Rotate Map"/>
 	<menu_item_check label="自動居中" name="Auto Center"/>
 	<menu_item_call label="停止追蹤" name="Stop Tracking"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
new file mode 100755
index 0000000000..5f82685632
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="顯示側邊" name="show_edges"/>
+	<menu_item_check label="顯示物理" name="show_physics"/>
+	<menu_item_check label="顯示材質" name="show_textures"/>
+	<menu_item_check label="顯示表皮重量" name="show_skin_weight"/>
+	<menu_item_check label="顯示接點位置" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_mute_particle.xml b/indra/newview/skins/default/xui/zh/menu_mute_particle.xml
new file mode 100644
index 0000000000..fbde9b435d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_mute_particle.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- *NOTE: See also menu_attachment_other.xml -->
+<context_menu name="Mute Particle Pie">
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_navbar.xml b/indra/newview/skins/default/xui/zh/menu_navbar.xml
index 69df4929f2..d8356e6277 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_navbar.xml
@@ -4,7 +4,7 @@
 	<menu_item_check label="顯示地段屬性" name="Show Parcel Properties"/>
 	<menu_item_call label="地標" name="Landmark"/>
 	<menu_item_call label="剪下" name="Cut"/>
-	<menu_item_call label="覆製" name="Copy"/>
+	<menu_item_call label="恚庨" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="全選" name="Select All"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
index cad462eebb..ce5f5b6e17 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/zh/menu_nearby_chat.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="NearBy Chat Menu">
 	<menu_item_call label="顯示附近的人..." name="nearby_people"/>
-	<menu_item_check label="Show Blocked Text" name="muted_text"/>
-	<menu_item_check label="Show Buddy Icons" name="show_buddy_icons"/>
-	<menu_item_check label="Show Names" name="show_names"/>
-	<menu_item_check label="Show Icons and Names" name="show_icons_and_names"/>
+	<menu_item_check label="顯示被封鎖文字" name="muted_text"/>
+	<menu_item_check label="顯示密友圖示" name="show_buddy_icons"/>
+	<menu_item_check label="顯示名字" name="show_names"/>
+	<menu_item_check label="顯示圖示和名字" name="show_icons_and_names"/>
 	<menu_item_call label="字型尺寸" name="font_size"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
index b629f73584..b629f73584 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_notification_well_button.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_object.xml b/indra/newview/skins/default/xui/zh/menu_object.xml
index ed41a4f0bf..f6657d876e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_object.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object.xml
@@ -3,19 +3,21 @@
 	<menu_item_call label="觸碰" name="Object Touch"/>
 	<menu_item_call label="編輯" name="Edit..."/>
 	<menu_item_call label="建造" name="Build"/>
-	<menu_item_call label="開啟" name="Open"/>
-	<menu_item_call label="坐下" name="Object Sit"/>
+	<menu_item_call label="打開" name="Open"/>
+	<menu_item_call label="坐在這裡" name="Object Sit"/>
 	<menu_item_call label="起立" name="Object Stand Up"/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
-	<menu_item_call label="Zoom In" name="Zoom In"/>
+	<menu_item_call label="放大" name="Zoom In"/>
+	<menu_item_call label="在聯結集裡顯示" name="show_in_linksets"/>
+	<menu_item_call label="在角色中顯示" name="show_in_characters"/>
 	<context_menu label="穿上" name="Put On">
 		<menu_item_call label="穿上" name="Wear"/>
 		<menu_item_call label="添加" name="Add"/>
-		<context_menu label="Attach" name="Object Attach"/>
-		<context_menu label="Attach HUD" name="Object Attach HUD"/>
+		<context_menu label="附著" name="Object Attach"/>
+		<context_menu label="附加擡頭顯示" name="Object Attach HUD"/>
 	</context_menu>
 	<context_menu label="管理" name="Remove">
-		<menu_item_call label="舉報濫用" name="Report Abuse..."/>
+		<menu_item_call label="違規舉報" name="Report Abuse..."/>
 		<menu_item_call label="封鎖" name="Object Mute"/>
 		<menu_item_call label="退回" name="Return..."/>
 	</context_menu>
@@ -24,4 +26,5 @@
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="購買" name="Buy..."/>
 	<menu_item_call label="刪除" name="Delete"/>
+	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index d27e75b830..9655732f2e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Object Icon Menu">
 	<menu_item_call label="物件檔案..." name="Object Profile"/>
-	<menu_item_call label="Block..." name="Block"/>
+	<menu_item_call label="封鎖…" name="Block"/>
+	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
+	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index 90704fee65..258d0d6b20 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -8,7 +8,7 @@
 		<menu_item_call label="新褲子" name="New Pants"/>
 		<menu_item_call label="新鞋子" name="New Shoes"/>
 		<menu_item_call label="新襪子" name="New Socks"/>
-		<menu_item_call label="新夾克" name="New Jacket"/>
+		<menu_item_call label="新外套" name="New Jacket"/>
 		<menu_item_call label="新裙子" name="New Skirt"/>
 		<menu_item_call label="新手套" name="New Gloves"/>
 		<menu_item_call label="新內衣" name="New Undershirt"/>
@@ -23,6 +23,8 @@
 		<menu_item_call label="新頭髮" name="New Hair"/>
 		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
+	<menu_item_call label="展開全部資料夾" name="expand"/>
+	<menu_item_call label="摺疊全部資料夾" name="collapse"/>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
index a4614710f4..a4614710f4 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_tab.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_list.xml b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
index 81ae6e4e85..2456e9fee9 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/zh/menu_participant_list.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Participant List Context Menu">
 	<menu_item_check label="依名稱排序" name="SortByName"/>
-	<menu_item_check label="Sort by Recent Speakers" name="SortByRecentSpeakers"/>
+	<menu_item_check label="依最近說話者排序" name="SortByRecentSpeakers"/>
 	<menu_item_call label="察看檔案" name="View Profile"/>
 	<menu_item_call label="加為朋友" name="Add Friend"/>
 	<menu_item_call label="IM" name="IM"/>
@@ -9,13 +9,13 @@
 	<menu_item_call label="分享" name="Share"/>
 	<menu_item_call label="支付" name="Pay"/>
 	<menu_item_check label="察看人群圖示" name="View Icons"/>
-	<menu_item_check label="Block Voice" name="Block/Unblock"/>
-	<menu_item_check label="Block Text" name="MuteText"/>
-	<context_menu label="Moderator Options" name="Moderator Options">
-		<menu_item_check label="Allow text chat" name="AllowTextChat"/>
-		<menu_item_call label="Mute this participant" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Unmute this participant" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Mute everyone" name="ModerateVoiceMute"/>
-		<menu_item_call label="Unmute everyone" name="ModerateVoiceUnmute"/>
+	<menu_item_check label="禁止語音" name="Block/Unblock"/>
+	<menu_item_check label="禁止文字" name="MuteText"/>
+	<context_menu label="主持人選項" name="Moderator Options">
+		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
+		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
+		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
+		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
+		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
 	</context_menu>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
new file mode 100644
index 0000000000..8b35860eb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="participant_manu_view">
+	<menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
+	<menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
+	<menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
+	<menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
+	<menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
+	<menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
+	<menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
+	<menu_item_check label="交談記錄……" name="Conversation"/>
+	<menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
+	<menu_item_check label="翻譯設定……" name="Translation_settings"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
new file mode 100644
index 0000000000..9a2a3c403d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_gear">
+	<menu_item_call label="解除封鎖" name="unblock"/>
+	<menu_item_call label="檔案..." name="profile"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
new file mode 100644
index 0000000000..a8cecb4e14
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_plus">
+	<menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
+	<menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
new file mode 100644
index 0000000000..5b70cd35bf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_blocked_view">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依類型排序" name="sort_by_type"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
new file mode 100644
index 0000000000..4251238fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依狀態排序" name="sort_status"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看許可權限" name="view_permissions"/>
+	<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
index 59854faeec..59854faeec 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_friends_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index 1d78c1de0a..b4b566f5ca 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="Activate" name="Activate"/>
-	<menu_item_call label="Leave" name="Leave"/>
+	<menu_item_call label="語音通話" name="Call"/>
+	<menu_item_call label="啟動" name="Activate"/>
+	<menu_item_call label="退出" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
new file mode 100644
index 0000000000..05a30d938f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
index 1be5c69b94..1be5c69b94 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index 9faa35001c..d25adaf8fb 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="Remove Friend" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="地圖" name="Map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="Block/Unblock" name="Block/Unblock"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="察看檔案" name="view_profile"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+	<menu_item_call label="語音通話" name="voice_call"/>
+	<menu_item_call label="檢視聊天歷史……" name="chat_history"/>
+	<menu_item_call label="加為朋友" name="add_friend"/>
+	<menu_item_call label="移除朋友" name="remove_friend"/>
+	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
+	<menu_item_call label="放大" name="zoom_in"/>
+	<menu_item_call label="地圖" name="map"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 1380e0b307..69f0eab7dc 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="加為朋友" name="Add Friends"/>
-	<menu_item_call label="移除朋友" name="Remove Friend"/>
-	<menu_item_call label="IM" name="IM"/>
-	<menu_item_call label="通話" name="Call"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
+	<menu_item_call label="加為朋友" name="add_friends"/>
+	<menu_item_call label="移除朋友" name="remove_friends"/>
+	<menu_item_call label="IM" name="im"/>
+	<menu_item_call label="通話" name="call"/>
+	<menu_item_call label="分享" name="share"/>
+	<menu_item_call label="支付" name="pay"/>
+	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
new file mode 100644
index 0000000000..9bc5638472
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="依距離排序" name="sort_distance"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+	<menu_item_check label="察看地圖" name="view_map"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
index a7f5c74b82..6cb0ac3c89 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_view_sort.xml
@@ -4,5 +4,6 @@
 	<menu_item_check label="依名稱排序" name="sort_name"/>
 	<menu_item_check label="依距離排序" name="sort_distance"/>
 	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_call label="顯示笨封鎖的居民與物件" name="show_blocked_list"/>
+	<menu_item_check label="察看地圖" name="view_map"/>
+	<menu_item_call label="顯示被封鎖的居民與物件" name="show_blocked_list"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
new file mode 100644
index 0000000000..382234c3ec
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="menu_group_plus">
+	<menu_item_check label="依最近排序" name="sort_most"/>
+	<menu_item_check label="依名稱排序" name="sort_name"/>
+	<menu_item_check label="察看人群圖示" name="view_icons"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
index 5b6e7335d6..5b6e7335d6 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_recent_view_sort.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_picks.xml b/indra/newview/skins/default/xui/zh/menu_picks.xml
index 2e88ac2d39..2e88ac2d39 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_picks.xml
+++ b/indra/newview/skins/default/xui/zh/menu_picks.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
index e962bd90d5..80922a757d 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
+++ b/indra/newview/skins/default/xui/zh/menu_picks_plus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="picks_plus_menu">
 	<menu_item_call label="新精選地點" name="create_pick"/>
-	<menu_item_call label="New Classified" name="create_classified"/>
+	<menu_item_call label="新個人廣告" name="create_classified"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_place.xml b/indra/newview/skins/default/xui/zh/menu_place.xml
index 3733baf119..3733baf119 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_place.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
index 95f8917234..95f8917234 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
+++ b/indra/newview/skins/default/xui/zh/menu_place_add_button.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
index 7f4144d14d..27f0c7ebdb 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_folder.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="添加資料夾" name="add_folder"/>
 	<menu_item_call label="還原物品" name="restore_item"/>
 	<menu_item_call label="剪下" name="cut"/>
-	<menu_item_call label="覆製" name="copy_folder"/>
+	<menu_item_call label="恚庨" name="copy_folder"/>
 	<menu_item_call label="貼上" name="paste"/>
 	<menu_item_call label="更名" name="rename"/>
 	<menu_item_call label="刪除" name="delete"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
index f23d970b78..f23d970b78 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/zh/menu_places_gear_landmark.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
index ca637ae54d..f77e7090c4 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/zh/menu_profile_overflow.xml
@@ -3,10 +3,10 @@
 	<menu_item_call label="地圖" name="show_on_map"/>
 	<menu_item_call label="支付" name="pay"/>
 	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="Block" name="block"/>
-	<menu_item_call label="Unblock" name="unblock"/>
+	<menu_item_call label="封鎖" name="block"/>
+	<menu_item_call label="解除封鎖" name="unblock"/>
 	<menu_item_call label="踢出" name="kick"/>
 	<menu_item_call label="凍結" name="freeze"/>
 	<menu_item_call label="解凍" name="unfreeze"/>
-	<menu_item_call label="CSR" name="csr"/>
+	<menu_item_call label="客服" name="csr"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
index 7884df5b01..53ee6ee977 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
+++ b/indra/newview/skins/default/xui/zh/menu_save_outfit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="save_outfit_menu">
 	<menu_item_call label="儲存" name="save_outfit"/>
-	<menu_item_call label="另存" name="save_as_new_outfit"/>
+	<menu_item_call label="另存為" name="save_as_new_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
index e9817dd2bc..e9817dd2bc 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
+++ b/indra/newview/skins/default/xui/zh/menu_script_chiclet.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_slurl.xml b/indra/newview/skins/default/xui/zh/menu_slurl.xml
index 2cea18105a..2cea18105a 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_slurl.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
index d188840588..d188840588 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_gear.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
index c636e108ad..c636e108ad 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
index f9107a96ed..90e8098348 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_teleport_history_tab.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Teleport History Item Context Menu">
-	<menu_item_call label="開啟" name="TabOpen"/>
+	<menu_item_call label="打開" name="TabOpen"/>
 	<menu_item_call label="關閉" name="TabClose"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_text_editor.xml b/indra/newview/skins/default/xui/zh/menu_text_editor.xml
index c25f5128c3..febc0b8b67 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/zh/menu_text_editor.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="（未知）" name="Suggestion 1"/>
+	<menu_item_call label="（未知）" name="Suggestion 2"/>
+	<menu_item_call label="（未知）" name="Suggestion 3"/>
+	<menu_item_call label="（未知）" name="Suggestion 4"/>
+	<menu_item_call label="（未知）" name="Suggestion 5"/>
+	<menu_item_call label="新增到字典" name="Add to Dictionary"/>
+	<menu_item_call label="新增到忽略清單" name="Add to Ignore"/>
 	<menu_item_call label="剪下" name="Cut"/>
-	<menu_item_call label="覆製" name="Copy"/>
+	<menu_item_call label="恚庨" name="Copy"/>
 	<menu_item_call label="貼上" name="Paste"/>
 	<menu_item_call label="刪除" name="Delete"/>
 	<menu_item_call label="全選" name="Select All"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_toolbars.xml b/indra/newview/skins/default/xui/zh/menu_toolbars.xml
new file mode 100755
index 0000000000..d318992dd5
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_toolbars.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Toolbars Popup">
+	<menu_item_call label="移除此按鈕" name="Remove button"/>
+	<menu_item_call label="工具列按鈕…" name="Choose Buttons"/>
+	<menu_item_check label="圖示和標籤" name="icons_with_text"/>
+	<menu_item_check label="僅用圖示" name="icons_only"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
index debaafaa10..b07e9890ff 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
+++ b/indra/newview/skins/default/xui/zh/menu_topinfobar.xml
@@ -3,5 +3,5 @@
 	<menu_item_check label="顯示座標" name="Show Coordinates"/>
 	<menu_item_check label="顯示地段屬性" name="Show Parcel Properties"/>
 	<menu_item_call label="地標" name="Landmark"/>
-	<menu_item_call label="覆製" name="Copy"/>
+	<menu_item_call label="恚庨" name="Copy"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 592bb6561e..752634dc6b 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示居民檔案" name="show_agent"/>
+	<menu_item_call label="察看檔案" name="show_agent"/>
+	<menu_item_call label="送出 IM..." name="send_im"/>
+	<menu_item_call label="加為朋友..." name="add_friend"/>
+	<menu_item_call label="移除朋友…" name="remove_friend"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_group.xml b/indra/newview/skins/default/xui/zh/menu_url_group.xml
index de97bb731f..de97bb731f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_group.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_group.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_http.xml b/indra/newview/skins/default/xui/zh/menu_url_http.xml
index cf953576f3..861cbfb975 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="開啟網頁" name="url_open"/>
-	<menu_item_call label="Open in Internal Browser" name="url_open_internal"/>
-	<menu_item_call label="Open in External Browser" name="url_open_external"/>
-	<menu_item_call label="Copy URL to clipboard" name="url_copy"/>
+	<menu_item_call label="用內部瀏覽器開啟" name="url_open_internal"/>
+	<menu_item_call label="用外部瀏覽器開啟" name="url_open_external"/>
+	<menu_item_call label="覆製 URL 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
index 8eaea68c6f..8eaea68c6f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_inventory.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_map.xml b/indra/newview/skins/default/xui/zh/menu_url_map.xml
index fbda20fd2f..fbda20fd2f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_map.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_map.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index b344b21c62..ac366f92ef 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="顯示物件資訊" name="show_object"/>
+	<menu_item_call label="物件檔案..." name="show_object"/>
+	<menu_item_call label="封鎖…" name="block_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
index 330c28238f..330c28238f 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_parcel.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
index afc15ce13c..6ce9a10d3e 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_slapp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Run This Command" name="run_slapp"/>
+	<menu_item_call label="執行這個指令" name="run_slapp"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
index 2fb247f250..2fb247f250 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_slurl.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
index e3e4b4716d..e3e4b4716d 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_teleport.xml
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index b6bb79bcbc..b267bda2bb 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -1,65 +1,98 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
-	<menu label="自己" name="Me">
-		<menu_item_call label="偏好設定" name="Preferences"/>
-		<menu_item_call label="我的塗鴉牆" name="Manage My Account"/>
-		<menu_item_call label="購買 L$" name="Buy and Sell L$"/>
-		<menu_item_call label="我的個人檔案" name="Profile"/>
-		<menu_item_call label="我的外觀" name="ChangeOutfit"/>
-		<menu_item_check label="我的庫存" name="Inventory"/>
-		<menu_item_check label="我的庫存" name="ShowSidetrayInventory"/>
-		<menu_item_check label="我的姿勢" name="Gestures"/>
-		<menu_item_check label="我的聲音" name="ShowVoice"/>
-		<menu label="移動" name="Movement">
+	<menu label="我自己" name="Me">
+		<menu_item_call label="檔案..." name="Profile"/>
+		<menu_item_call label="外觀…" name="ChangeOutfit"/>
+		<menu_item_call label="選擇一個化身…" name="Avatar Picker"/>
+		<menu_item_check label="收納區…" name="Inventory"/>
+		<menu_item_call label="新收納區視窗" name="NewInventoryWindow"/>
+		<menu_item_call label="地點…" name="Places"/>
+		<menu_item_call label="精選地點…" name="Picks"/>
+		<menu_item_call label="攝影機控制…" name="Camera Controls"/>
+		<menu label="動作" name="Movement">
 			<menu_item_call label="坐下" name="Sit Down Here"/>
 			<menu_item_check label="飛行" name="Fly"/>
-			<menu_item_check label="總是奔跑" name="Always Run"/>
+			<menu_item_check label="以跑代步" name="Always Run"/>
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
-		</menu>
-		<menu label="我的狀態" name="Status">
-			<menu_item_call label="離開" name="Set Away"/>
-			<menu_item_call label="忙碌" name="Set Busy"/>
-		</menu>
-		<menu_item_call label="結束退出 [APP_NAME]" name="Quit"/>
+			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
+		</menu>
+		<menu label="狀態" name="Status">
+			<menu_item_check label="離開" name="Away"/>
+			<menu_item_check label="請勿打擾" name="Do Not Disturb"/>
+		</menu>
+		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
+		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
+		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
+		<menu_item_call label="偏好設定…" name="Preferences"/>
+		<menu_item_call label="工具列按鈕…" name="Toolbars"/>
+		<menu_item_call label="隱藏所有控制" name="Hide UI"/>
+		<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
+		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_call label="我的朋友" name="My Friends"/>
-		<menu_item_call label="我的群組" name="My Groups"/>
-		<menu_item_check label="附近的聊天" name="Nearby Chat"/>
-		<menu_item_call label="附近的人群" name="Active Speakers"/>
+		<menu_item_check label="交談……" name="Conversations"/>
+		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
+		<menu_item_check label="說話" name="Speak"/>
+		<menu_item_check label="交談記錄…" name="Conversation Log..."/>
+		<menu label="語音變聲" name="VoiceMorphing">
+			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
+			<menu_item_check label="預覽……" name="Preview"/>
+			<menu_item_call label="訂閱……" name="Subscribe"/>
+		</menu>
+		<menu_item_check label="姿勢…" name="Gestures"/>
+		<menu_item_check label="朋友" name="My Friends"/>
+		<menu_item_check label="群組" name="My Groups"/>
+		<menu_item_check label="附近的人群" name="Active Speakers"/>
+		<menu_item_call label="封鎖清單" name="Block List"/>
+		<menu_item_check label="請勿打擾" name="Do Not Disturb"/>
 	</menu>
 	<menu label="世界" name="World">
-		<menu_item_check label="迷你地圖" name="Mini-Map"/>
+		<menu_item_call label="將此處記為地標" name="Create Landmark Here"/>
+		<menu_item_call label="目的地…" name="Destinations"/>
 		<menu_item_check label="世界地圖" name="World Map"/>
+		<menu_item_check label="迷你地圖" name="Mini-Map"/>
 		<menu_item_check label="搜尋" name="Search"/>
-		<menu_item_call label="拍攝快照" name="Take Snapshot"/>
-		<menu_item_call label="將此處記下地標" name="Create Landmark Here"/>
-		<menu_item_separator/>
-		<menu_item_call label="地點檔案" name="Place Profile"/>
-		<menu_item_call label="關於土地" name="About Land"/>
-		<menu_item_call label="地區 / 領地" name="Region/Estate"/>
+		<menu_item_call label="瞬間傳送回家" name="Teleport Home"/>
+		<menu_item_call label="把這裡設為我的家" name="Set Home to Here"/>
+		<menu_item_call label="快照" name="Take Snapshot"/>
+		<menu_item_call label="地點小檔案" name="Place Profile"/>
+		<menu_item_call label="土地資料" name="About Land"/>
+		<menu_item_call label="地區/領地" name="Region/Estate"/>
+		<menu_item_call label="我所擁有的土地…" name="My Land"/>
 		<menu_item_call label="購買這塊土地" name="Buy Land"/>
-		<menu_item_call label="我的土地" name="My Land"/>
 		<menu label="顯示" name="LandShow">
-			<menu_item_check label="移動控制" name="Movement Controls"/>
-			<menu_item_check label="視角控制" name="Camera Controls"/>
 			<menu_item_check label="禁越線" name="Ban Lines"/>
 			<menu_item_check label="指標" name="beacons"/>
-			<menu_item_check label="土地邊界" name="Property Lines"/>
+			<menu_item_check label="地產邊界" name="Property Lines"/>
 			<menu_item_check label="地主" name="Land Owners"/>
 			<menu_item_check label="座標" name="Coordinates"/>
 			<menu_item_check label="地段屬性" name="Parcel Properties"/>
 			<menu_item_check label="進階選單" name="Show Advanced Menu"/>
 		</menu>
-		<menu_item_call label="瞬間瞬間傳送回家" name="Teleport Home"/>
-		<menu_item_call label="設定家在此處" name="Set Home to Here"/>
 		<menu label="太陽" name="Sun">
 			<menu_item_call label="日出" name="Sunrise"/>
 			<menu_item_call label="中午" name="Noon"/>
 			<menu_item_call label="日落" name="Sunset"/>
 			<menu_item_call label="午夜" name="Midnight"/>
-			<menu_item_call label="領地時間" name="Revert to Region Default"/>
-			<menu_item_call label="環境編輯器" name="Environment Editor"/>
+			<menu_item_call label="使用地區設定" name="Use Region Settings"/>
+		</menu>
+		<menu label="環境編輯器" name="Environment Editor">
+			<menu_item_call label="環境設定…" name="Environment Settings"/>
+			<menu label="水的自訂配置" name="Water Presets">
+				<menu_item_call label="新的自訂配置…" name="new_water_preset"/>
+				<menu_item_call label="編輯自訂配置…" name="edit_water_preset"/>
+				<menu_item_call label="刪除自訂配置…" name="delete_water_preset"/>
+			</menu>
+			<menu label="天空自訂配置" name="Sky Presets">
+				<menu_item_call label="新的自訂配置…" name="new_sky_preset"/>
+				<menu_item_call label="編輯自訂配置…" name="edit_sky_preset"/>
+				<menu_item_call label="刪除自訂配置…" name="delete_sky_preset"/>
+			</menu>
+			<menu label="日的自訂配置" name="Day Presets">
+				<menu_item_call label="新的自訂配置…" name="new_day_preset"/>
+				<menu_item_call label="編輯自訂配置…" name="edit_day_preset"/>
+				<menu_item_call label="刪除自訂配置…" name="delete_day_preset"/>
+			</menu>
 		</menu>
 	</menu>
 	<menu label="建造" name="BuildTools">
@@ -80,13 +113,13 @@
 			<menu_item_call label="包括下一部位" name="Include Next Part"/>
 			<menu_item_call label="包括上一部位" name="Include Previous Part"/>
 		</menu>
+		<menu_item_call label="聯結集…" name="pathfinding_linkset_menu_item"/>
 		<menu_item_call label="聚焦於所選部位" name="Focus on Selection"/>
 		<menu_item_call label="縮放至所選部位" name="Zoom to Selection"/>
 		<menu label="物件" name="Object">
 			<menu_item_call label="購買" name="Menu Object Buy"/>
 			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
-			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
@@ -97,65 +130,77 @@
 			<menu_item_call label="設定腳本為執行中" name="Set Scripts to Running"/>
 			<menu_item_call label="設定腳本為非執行中" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="尋徑" name="Pathfinding">
+			<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
+			<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
+			<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
+			<menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/>
+		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
 			<menu_item_check label="只選取我的物件" name="Select Only My Objects"/>
 			<menu_item_check label="只選取可移動的物件" name="Select Only Movable Objects"/>
-			<menu_item_check label="Select By Surrounding" name="Select By Surrounding"/>
-			<menu_item_check label="Show Selection Outlines" name="Show Selection Outlines"/>
-			<menu_item_check label="Show Hidden Selection" name="Show Hidden Selection"/>
-			<menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/>
-			<menu_item_check label="Show Selection Beam" name="Show Selection Beam"/>
+			<menu_item_check label="環繞選取" name="Select By Surrounding"/>
+			<menu_item_check label="顯示選取輪廓線" name="Show Selection Outlines"/>
+			<menu_item_check label="顯示隱藏的選取" name="Show Hidden Selection"/>
+			<menu_item_check label="顯示選擇的 Light 半徑" name="Show Light Radius for Selection"/>
+			<menu_item_check label="顯示選擇導引線" name="Show Selection Beam"/>
 			<menu_item_check label="貼齊格線" name="Snap to Grid"/>
 			<menu_item_call label="貼齊物件 XY 軸到格線" name="Snap Object XY to Grid"/>
-			<menu_item_call label="Use Selection for Grid" name="Use Selection for Grid"/>
+			<menu_item_call label="以所選擇作為格線" name="Use Selection for Grid"/>
 			<menu_item_call label="格線選項" name="Grid Options"/>
 		</menu>
 		<menu label="上傳" name="Upload">
 			<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 			<menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/>
 			<menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/>
-			<menu_item_call label="大量上傳（每檔案 L$[COST] ）..." name="Bulk Upload"/>
+			<menu_item_call label="模型…" name="Upload Model"/>
+			<menu_item_call label="批量（每檔案 L$[COST] ）..." name="Bulk Upload"/>
 			<menu_item_call label="設定預設上傳權限" name="perm prefs"/>
 		</menu>
 		<menu_item_call label="復原" name="Undo"/>
 		<menu_item_call label="重做" name="Redo"/>
 	</menu>
 	<menu label="幫助" name="Help">
+		<menu_item_call label="簡易教學…" name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
-		<menu_item_check label="啟用提示" name="Enable Hints"/>
-		<menu_item_call label="舉報濫用" name="Report Abuse"/>
+		<menu_item_call label="使用者指南" name="User’s guide"/>
+		<menu_item_call label="知識庫" name="Knowledge Base"/>
+		<menu_item_call label="維基" name="Wiki"/>
+		<menu_item_call label="社群論壇" name="Community Forums"/>
+		<menu_item_call label="支援入口" name="Support portal"/>
+		<menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/>
+		<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
+		<menu_item_call label="違規舉報" name="Report Abuse"/>
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
 	</menu>
 	<menu label="進階" name="Advanced">
-		<menu_item_call label="Rebake Textures" name="Rebake Texture"/>
-		<menu_item_call label="設定使用者界面大小至預設值" name="Set UI Size to Default"/>
-		<menu_item_call label="設定視窗尺寸大小..." name="Set Window Size..."/>
+		<menu_item_call label="重新產出材質" name="Rebake Texture"/>
+		<menu_item_call label="以預設值設定使用者界面大小" name="Set UI Size to Default"/>
+		<menu_item_call label="設定視窗大小..." name="Set Window Size..."/>
 		<menu_item_check label="限制選擇距離" name="Limit Select Distance"/>
-		<menu_item_check label="Disable Camera Constraints" name="Disable Camera Distance"/>
+		<menu_item_check label="取消鏡頭限制" name="Disable Camera Distance"/>
 		<menu_item_check label="高解析度快照" name="HighResSnapshot"/>
 		<menu_item_check label="靜音拍攝快照到硬碟" name="QuietSnapshotsToDisk"/>
-		<menu_item_check label="壓縮快照存到硬碟" name="CompressSnapshotsToDisk"/>
 		<menu label="效能工具" name="Performance Tools">
-			<menu_item_call label="Lag Meter" name="Lag Meter"/>
+			<menu_item_call label="Lag 測量器" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
-			<menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/>
+			<menu_item_check label="顯示化身的繪製重量" name="Avatar Rendering Cost"/>
 		</menu>
 		<menu label="高亮顯示與可見度" name="Highlighting and Visibility">
-			<menu_item_check label="Cheesy Beacon" name="Cheesy Beacon"/>
+			<menu_item_check label="Cheesy 指標" name="Cheesy Beacon"/>
 			<menu_item_check label="隱藏粒子效果" name="Hide Particles"/>
 			<menu_item_check label="隱藏所選擇的" name="Hide Selected"/>
 			<menu_item_check label="高亮顯示透明物件" name="Highlight Transparent"/>
-			<menu_item_check label="顯示 HUD 附件" name="Show HUD Attachments"/>
 			<menu_item_check label="顯示第一人稱視角準星" name="ShowCrosshairs"/>
 		</menu>
-		<menu label="Rendering Types" name="Rendering Types">
+		<menu label="呈像類型" name="Rendering Types">
 			<menu_item_check label="簡單" name="Rendering Type Simple"/>
 			<menu_item_check label="半透明" name="Rendering Type Alpha"/>
 			<menu_item_check label="樹木" name="Rendering Type Tree"/>
 			<menu_item_check label="化身" name="Rendering Type Character"/>
-			<menu_item_check label="地表" name="Rendering Type Surface Patch"/>
+			<menu_item_check label="表面修補" name="Rendering Type Surface Patch"/>
 			<menu_item_check label="天空" name="Rendering Type Sky"/>
 			<menu_item_check label="水文" name="Rendering Type Water"/>
 			<menu_item_check label="地面" name="Rendering Type Ground"/>
@@ -165,32 +210,32 @@
 			<menu_item_check label="粒子效果" name="Rendering Type Particles"/>
 			<menu_item_check label="碰撞" name="Rendering Type Bump"/>
 		</menu>
-		<menu label="Rendering Features" name="Rendering Features">
-			<menu_item_check label="UI" name="ToggleUI"/>
-			<menu_item_check label="Selected" name="Selected"/>
-			<menu_item_check label="Highlighted" name="Highlighted"/>
-			<menu_item_check label="Dynamic Textures" name="Dynamic Textures"/>
+		<menu label="呈像功能" name="Rendering Features">
+			<menu_item_check label="使用者界面" name="ToggleUI"/>
+			<menu_item_check label="選擇" name="Selected"/>
+			<menu_item_check label="高亮顯示" name="Highlighted"/>
+			<menu_item_check label="動態材質" name="Dynamic Textures"/>
 			<menu_item_check label="腳步陰影" name="Foot Shadows"/>
 			<menu_item_check label="霧氣" name="Fog"/>
-			<menu_item_check label="Test FRInfo" name="Test FRInfo"/>
+			<menu_item_check label="測試 FRInfo" name="Test FRInfo"/>
 			<menu_item_check label="彈性物件" name="Flexible Objects"/>
 		</menu>
 		<menu_item_check label="使用外卦讀取緒" name="Use Plugin Read Thread"/>
 		<menu_item_call label="清除群組快取資料" name="ClearGroupCache"/>
 		<menu_item_check label="滑鼠平滑移動" name="Mouse Smoothing"/>
+		<menu_item_call label="釋出按鍵" name="Release Keys"/>
 		<menu label="快速鍵" name="Shortcuts">
-			<menu_item_call label="釋出按鍵" name="Release Keys"/>
 			<menu_item_check label="顯示進階選單 － 舊版捷徑" name="Show Advanced Menu - legacy shortcut"/>
 			<menu_item_call label="關閉視窗" name="Close Window"/>
 			<menu_item_call label="關閉全部視窗" name="Close All Windows"/>
 			<menu_item_call label="拍攝快照到硬碟" name="Snapshot to Disk"/>
 			<menu_item_call label="第一人稱視角" name="Mouselook"/>
-			<menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
+			<menu_item_check label="搖桿移動攝影機" name="Joystick Flycam"/>
 			<menu_item_call label="重設視角" name="Reset View"/>
 			<menu_item_call label="注視上一位聊天者" name="Look at Last Chatter"/>
-			<menu_item_call label="Zoom In" name="Zoom In"/>
-			<menu_item_call label="Zoom Default" name="Zoom Default"/>
-			<menu_item_call label="Zoom Out" name="Zoom Out"/>
+			<menu_item_call label="放大" name="Zoom In"/>
+			<menu_item_call label="縮放恢復預設" name="Zoom Default"/>
+			<menu_item_call label="縮小" name="Zoom Out"/>
 		</menu>
 		<menu_item_call label="顯示除錯設定" name="Debug Settings"/>
 		<menu_item_check label="顯示開發選單" name="Debug Mode"/>
@@ -200,25 +245,27 @@
 			<menu_item_check label="材質控制台" name="Texture Console"/>
 			<menu_item_check label="除錯控制台" name="Debug Console"/>
 			<menu_item_call label="通知控制台" name="Notifications"/>
-			<menu_item_check label="材質尺寸控制台" name="Texture Size"/>
-			<menu_item_check label="材質分類控制台" name="Texture Category"/>
 			<menu_item_check label="快速碼錶" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
+			<menu_item_check label="場景統計資料" name="Scene Statistics"/>
+			<menu_item_call label="材質擷取除錯控制台" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="地區資訊傳至除錯控制台" name="Region Info to Debug Console"/>
 			<menu_item_call label="群組資訊至除錯控制台" name="Group Info to Debug Console"/>
-			<menu_item_call label="Capabilities Info to Debug Console" name="Capabilities Info to Debug Console"/>
+			<menu_item_call label="性能資訊傳至除錯控制台" name="Capabilities Info to Debug Console"/>
 			<menu_item_check label="攝影機" name="Camera"/>
 			<menu_item_check label="風力" name="Wind"/>
-			<menu_item_check label="FOV" name="FOV"/>
-			<menu_item_check label="Badge" name="Badge"/>
+			<menu_item_check label="視角" name="FOV"/>
+			<menu_item_check label="勛章" name="Badge"/>
 		</menu>
 		<menu label="顯示資訊" name="Display Info">
 			<menu_item_check label="顯示時間" name="Show Time"/>
-			<menu_item_check label="Show Render Info" name="Show Render Info"/>
+			<menu_item_check label="顯示上傳費用" name="Show Upload Cost"/>
+			<menu_item_check label="顯示呈像資訊" name="Show Render Info"/>
 			<menu_item_check label="顯示材質資訊" name="Show Texture Info"/>
-			<menu_item_check label="Show Matrices" name="Show Matrices"/>
-			<menu_item_check label="Show Color Under Cursor" name="Show Color Under Cursor"/>
+			<menu_item_check label="顯示矩陣" name="Show Matrices"/>
+			<menu_item_check label="游標下顯示顏色" name="Show Color Under Cursor"/>
 			<menu_item_check label="顯示記憶體" name="Show Memory"/>
+			<menu_item_check label="顯示私區記憶體資訊" name="Show Private Mem Info"/>
 			<menu_item_check label="顯示更新到物件" name="Show Updates"/>
 		</menu>
 		<menu label="強制錯誤" name="Force Errors">
@@ -231,60 +278,72 @@
 			<menu_item_call label="強制瀏覽器斷線" name="Force Disconnect Viewer"/>
 			<menu_item_call label="模擬記憶體不足" name="Memory Leaking Simulation"/>
 		</menu>
-		<menu label="Render Tests" name="Render Tests">
+		<menu label="呈像測試" name="Render Tests">
 			<menu_item_check label="攝影機位移" name="Camera Offset"/>
-			<menu_item_check label="Randomize Framerate" name="Randomize Framerate"/>
-			<menu_item_check label="Periodic Slow Frame" name="Periodic Slow Frame"/>
-			<menu_item_check label="Frame Test" name="Frame Test"/>
-		</menu>
-		<menu label="Render Metadata" name="Render Metadata">
-			<menu_item_check label="Bounding Boxes" name="Bounding Boxes"/>
-			<menu_item_check label="Octree" name="Octree"/>
-			<menu_item_check label="Shadow Frusta" name="Shadow Frusta"/>
-			<menu_item_check label="Occlusion" name="Occlusion"/>
-			<menu_item_check label="Render Batches" name="Render Batches"/>
-			<menu_item_check label="Update Type" name="Update Type"/>
-			<menu_item_check label="Texture Anim" name="Texture Anim"/>
-			<menu_item_check label="Texture Priority" name="Texture Priority"/>
-			<menu_item_check label="Texture Area" name="Texture Area"/>
-			<menu_item_check label="Face Area" name="Face Area"/>
-			<menu_item_check label="Lights" name="Lights"/>
-			<menu_item_check label="Collision Skeleton" name="Collision Skeleton"/>
-			<menu_item_check label="Raycast" name="Raycast"/>
-		</menu>
-		<menu label="Rendering" name="Rendering">
-			<menu_item_check label="Axes" name="Axes"/>
-			<menu_item_check label="Tangent Basis" name="Tangent Basis"/>
-			<menu_item_call label="Selected Texture Info Basis" name="Selected Texture Info Basis"/>
-			<menu_item_check label="Wireframe" name="Wireframe"/>
-			<menu_item_check label="Object-Object Occlusion" name="Object-Object Occlusion"/>
-			<menu_item_check label="Framebuffer Objects" name="Framebuffer Objects"/>
-			<menu_item_check label="Lighting and Shadows" name="Lighting and Shadows"/>
-			<menu_item_check label="Shadows from Sun/Moon/Projectors" name="Shadows from Sun/Moon/Projectors"/>
-			<menu_item_check label="SSAO and Shadow Smoothing" name="SSAO and Shadow Smoothing"/>
-			<menu_item_check label="Global Illumination (experimental)" name="Global Illumination"/>
+			<menu_item_check label="隨機變動幀率" name="Randomize Framerate"/>
+			<menu_item_check label="定期出現慢幀率" name="Periodic Slow Frame"/>
+			<menu_item_check label="畫面測試" name="Frame Test"/>
+			<menu_item_call label="幀特性" name="Frame Profile"/>
+		</menu>
+		<menu label="呈像的元資料" name="Render Metadata">
+			<menu_item_check label="外框箱" name="Bounding Boxes"/>
+			<menu_item_check label="法線" name="Normals"/>
+			<menu_item_check label="八叉樹" name="Octree"/>
+			<menu_item_check label="陰影平截頭體" name="Shadow Frusta"/>
+			<menu_item_check label="物理形狀" name="Physics Shapes"/>
+			<menu_item_check label="遮蔽" name="Occlusion"/>
+			<menu_item_check label="呈像批次" name="Render Batches"/>
+			<menu_item_check label="更新類型" name="Update Type"/>
+			<menu_item_check label="材質動畫" name="Texture Anim"/>
+			<menu_item_check label="材質優先序" name="Texture Priority"/>
+			<menu_item_check label="材質區域" name="Texture Area"/>
+			<menu_item_check label="臉區域" name="Face Area"/>
+			<menu_item_check label="細節層次資訊" name="LOD Info"/>
+			<menu_item_check label="建製佇列" name="Build Queue"/>
+			<menu_item_check label="燈光" name="Lights"/>
+			<menu_item_check label="碰撞骨架" name="Collision Skeleton"/>
+			<menu_item_check label="光線投射" name="Raycast"/>
+			<menu_item_check label="風力向量" name="Wind Vectors"/>
+			<menu_item_check label="繪出複雜度" name="rendercomplexity"/>
+			<menu_item_check label="附件位元組" name="attachment bytes"/>
+			<menu_item_check label="雕刻" name="Sculpt"/>
+			<menu label="材質密度" name="Texture Density">
+				<menu_item_check label="無" name="None"/>
+				<menu_item_check label="目前" name="Current"/>
+				<menu_item_check label="理想" name="Desired"/>
+				<menu_item_check label="完全" name="Full"/>
+			</menu>
+		</menu>
+		<menu label="呈像" name="Rendering">
+			<menu_item_check label="軸" name="Axes"/>
+			<menu_item_check label="切線基礎" name="Tangent Basis"/>
+			<menu_item_call label="已選取材質資訊基礎" name="Selected Texture Info Basis"/>
+			<menu_item_call label="所選材料資訊" name="Selected Material Info"/>
+			<menu_item_check label="線框" name="Wireframe"/>
+			<menu_item_check label="物件導向的遮蔽" name="Object-Object Occlusion"/>
+			<menu_item_check label="進階照明模型" name="Advanced Lighting Model"/>
+			<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
+			<menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/>
 			<menu_item_check label="GL 除錯" name="Debug GL"/>
 			<menu_item_check label="管線除錯" name="Debug Pipeline"/>
 			<menu_item_check label="自動半透明遮罩（遞延）" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="自動半透明遮罩（非遞延）" name="Automatic Alpha Masks (non-deferred)"/>
-			<menu_item_check label="Animation Textures" name="Animation Textures"/>
+			<menu_item_check label="動作材質" name="Animation Textures"/>
 			<menu_item_check label="關閉材質" name="Disable Textures"/>
-			<menu_item_check label="Full Res Textures" name="Rull Res Textures"/>
-			<menu_item_check label="Audit Textures" name="Audit Textures"/>
-			<menu_item_check label="Texture Atlas (experimental)" name="Texture Atlas"/>
-			<menu_item_check label="Render Attached Lights" name="Render Attached Lights"/>
-			<menu_item_check label="Render Attached Particles" name="Render Attached Particles"/>
-			<menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/>
+			<menu_item_check label="全解析度材質" name="Rull Res Textures"/>
+			<menu_item_check label="使附著燈光呈像" name="Render Attached Lights"/>
+			<menu_item_check label="使附著例子效果呈像" name="Render Attached Particles"/>
+			<menu_item_check label="停懸發光物件" name="Hover Glow Objects"/>
 		</menu>
 		<menu label="網路" name="Network">
-			<menu_item_check label="Pause Agent" name="AgentPause"/>
-			<menu_item_call label="Enable Message Log" name="Enable Message Log"/>
-			<menu_item_call label="Disable Message Log" name="Disable Message Log"/>
-			<menu_item_check label="Velocity Interpolate Objects" name="Velocity Interpolate Objects"/>
-			<menu_item_check label="Ping Interpolate Object Positions" name="Ping Interpolate Object Positions"/>
-			<menu_item_call label="Drop a Packet" name="Drop a Packet"/>
-		</menu>
-		<menu_item_call label="Dump Scripted Camera" name="Dump Scripted Camera"/>
+			<menu_item_check label="暫停用戶" name="AgentPause"/>
+			<menu_item_call label="啟用訊息記錄" name="Enable Message Log"/>
+			<menu_item_call label="停用訊息記錄" name="Disable Message Log"/>
+			<menu_item_check label="速度內插物件" name="Velocity Interpolate Objects"/>
+			<menu_item_check label="探詢內插物件位置" name="Ping Interpolate Object Positions"/>
+			<menu_item_call label="丟出一個封包" name="Drop a Packet"/>
+		</menu>
+		<menu_item_call label="傾印腳本控制的攝影機" name="Dump Scripted Camera"/>
 		<menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu label="錄製器" name="Recorder">
 			<menu_item_call label="開始播放" name="Start Playback"/>
@@ -298,24 +357,23 @@
 			<menu_item_check label="固定天氣" name="Fixed Weather"/>
 			<menu_item_call label="傾印地區物件快取" name="Dump Region Object Cache"/>
 		</menu>
-		<menu label="UI" name="UI">
-			<menu_item_call label="測試媒體瀏覽器" name="Web Browser Test"/>
+		<menu label="使用者界面" name="UI">
+			<menu_item_call label="媒體瀏覽器測試" name="Web Browser Test"/>
 			<menu_item_call label="網頁內容瀏覽器" name="Web Content Browser"/>
-			<menu_item_call label="Dump SelectMgr" name="Dump SelectMgr"/>
+			<menu_item_call label="傾印 SelectMgr" name="Dump SelectMgr"/>
 			<menu_item_call label="傾印收納區" name="Dump Inventory"/>
 			<menu_item_call label="傾印碼錶" name="Dump Timers"/>
-			<menu_item_call label="Dump Focus Holder" name="Dump Focus Holder"/>
-			<menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/>
-			<menu_item_call label="Print Agent Info" name="Print Agent Info"/>
-			<menu_item_call label="計憶體狀態" name="Memory Stats"/>
-			<menu_item_check label="Region Debug Console" name="Region Debug Console"/>
-			<menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"/>
-			<menu_item_check label="Debug Clicks" name="Debug Clicks"/>
+			<menu_item_call label="傾印焦點容器" name="Dump Focus Holder"/>
+			<menu_item_call label="列印所選物件資訊" name="Print Selected Object Info"/>
+			<menu_item_call label="列印用戶資訊" name="Print Agent Info"/>
+			<menu_item_check label="地區除錯控制台" name="Region Debug Console"/>
+			<menu_item_check label="除錯 SelectMgr" name="Debug SelectMgr"/>
+			<menu_item_check label="除錯點按動作" name="Debug Clicks"/>
 			<menu_item_check label="視角除錯" name="Debug Views"/>
-			<menu_item_check label="Debug Name Tooltips" name="Debug Name Tooltips"/>
+			<menu_item_check label="除錯名稱訊息提示" name="Debug Name Tooltips"/>
 			<menu_item_check label="滑鼠事件除錯" name="Debug Mouse Events"/>
 			<menu_item_check label="按鍵除錯" name="Debug Keys"/>
-			<menu_item_check label="Debug WindowProc" name="Debug WindowProc"/>
+			<menu_item_check label="除錯 WindowProc" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
 			<menu_item_call label="重新載入顏色設定" name="Reload Color Settings"/>
@@ -325,67 +383,80 @@
 			<menu_item_call label="沖洗名稱快取資料" name="Flush Names Caches"/>
 		</menu>
 		<menu label="化身" name="Character">
-			<menu label="Grab Baked Texture" name="Grab Baked Texture">
-				<menu_item_call label="Iris" name="Grab Iris"/>
+			<menu label="抓取已產出材質" name="Grab Baked Texture">
+				<menu_item_call label="虹膜" name="Grab Iris"/>
 				<menu_item_call label="頭部" name="Grab Head"/>
-				<menu_item_call label="Upper Body" name="Grab Upper Body"/>
-				<menu_item_call label="Lower Body" name="Grab Lower Body"/>
+				<menu_item_call label="上半身" name="Grab Upper Body"/>
+				<menu_item_call label="下半身" name="Grab Lower Body"/>
 				<menu_item_call label="裙子" name="Grab Skirt"/>
 			</menu>
-			<menu label="Character Tests" name="Character Tests">
-				<menu_item_call label="Appearance To XML" name="Appearance To XML"/>
-				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
+			<menu label="字元測試" name="Character Tests">
+				<menu_item_call label="將外觀轉成 XML" name="Appearance To XML"/>
+				<menu_item_call label="切換字元幾何特性" name="Toggle Character Geometry"/>
 				<menu_item_call label="男性測試" name="Test Male"/>
 				<menu_item_call label="女性測試" name="Test Female"/>
-				<menu_item_call label="PG　切換" name="Toggle PG"/>
 				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
+			<menu label="動作速度" name="Animation Speed">
+				<menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/>
+				<menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/>
+				<menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/>
+				<menu_item_check label="慢動作" name="Slow Motion Animations"/>
+			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
-			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
 			<menu_item_check label="顯示指向在" name="Show Point At"/>
-			<menu_item_check label="Debug Joint Updates" name="Debug Joint Updates"/>
-			<menu_item_check label="Disable LOD" name="Disable LOD"/>
-			<menu_item_check label="Debug Character Vis" name="Debug Character Vis"/>
-			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
-			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
+			<menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/>
+			<menu_item_check label="停用細節層次" name="Disable LOD"/>
+			<menu_item_check label="除錯字元可見性" name="Debug Character Vis"/>
+			<menu_item_check label="顯示碰撞骨架" name="Show Collision Skeleton"/>
+			<menu_item_check label="顯示用戶目標" name="Display Agent Target"/>
 			--&gt;
-			<menu_item_call label="Dump Attachments" name="Dump Attachments"/>
-			<menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/>
-			<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
+			<menu_item_call label="傾印附件" name="Dump Attachments"/>
+			<menu_item_call label="除錯化身材質" name="Debug Avatar Textures"/>
+			<menu_item_call label="傾印本地材質" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP 材質" name="HTTP Textures"/>
-		<menu_item_call label="Compress Images" name="Compress Images"/>
-		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
-		<menu_item_check label="Console Window on next Run" name="Console Window"/>
-		<menu_item_call label="Request Admin Status" name="Request Admin Options"/>
-		<menu_item_call label="Leave Admin Status" name="Leave Admin Options"/>
-		<menu_item_check label="Show Admin Menu" name="View Admin Options"/>
+		<menu_item_check label="HTTP 收納區" name="HTTP Inventory"/>
+		<menu_item_call label="壓縮圖像" name="Compress Images"/>
+		<menu_item_call label="啟用記憶體洩漏視覺偵測器" name="Enable Visual Leak Detector"/>
+		<menu_item_check label="輸出除錯小型傾印" name="Output Debug Minidump"/>
+		<menu_item_check label="下次執行時顯示控制台視窗" name="Console Window"/>
+		<menu label="設定記錄細節" name="Set Logging Level">
+			<menu_item_check label="除錯" name="Debug"/>
+			<menu_item_check label="資訊" name="Info"/>
+			<menu_item_check label="警告" name="Warning"/>
+			<menu_item_check label="錯誤" name="Error"/>
+			<menu_item_check label="無" name="None"/>
+		</menu>
+		<menu_item_call label="要求管理員狀態" name="Request Admin Options"/>
+		<menu_item_call label="離開管理員狀態" name="Leave Admin Options"/>
+		<menu_item_check label="顯示管理員選單" name="View Admin Options"/>
 	</menu>
-	<menu label="Admin" name="Admin">
-		<menu label="Object" name="AdminObject">
+	<menu label="管理員" name="Admin">
+		<menu label="物件" name="AdminObject">
 			<menu_item_call label="取得副本" name="Admin Take Copy"/>
-			<menu_item_call label="強制擁有者為我" name="Force Owner To Me"/>
-			<menu_item_call label="Force Owner Permissive" name="Force Owner Permissive"/>
+			<menu_item_call label="將所有人強設為我自己" name="Force Owner To Me"/>
+			<menu_item_call label="強設為「准許所有人」" name="Force Owner Permissive"/>
 			<menu_item_call label="刪除" name="Delete"/>
-			<menu_item_call label="Lock" name="Lock"/>
-			<menu_item_call label="Get Assets IDs" name="Get Assets IDs"/>
+			<menu_item_call label="鎖定" name="Lock"/>
+			<menu_item_call label="取得資產 ID" name="Get Assets IDs"/>
 		</menu>
 		<menu label="地段" name="Parcel">
-			<menu_item_call label="強制擁有者為我" name="Owner To Me"/>
-			<menu_item_call label="Set to Linden Content" name="Set to Linden Content"/>
-			<menu_item_call label="Claim Public Land" name="Claim Public Land"/>
+			<menu_item_call label="將所有人強設為我自己" name="Owner To Me"/>
+			<menu_item_call label="設為 Linden 內容" name="Set to Linden Content"/>
+			<menu_item_call label="收取公共地" name="Claim Public Land"/>
 		</menu>
 		<menu label="地區" name="Region">
-			<menu_item_call label="Dump Temp Asset Data" name="Dump Temp Asset Data"/>
-			<menu_item_call label="Save Region State" name="Save Region State"/>
+			<menu_item_call label="傾印暫用資產資料" name="Dump Temp Asset Data"/>
+			<menu_item_call label="儲存區域狀態" name="Save Region State"/>
 		</menu>
-		<menu_item_call label="God Tools" name="God Tools"/>
+		<menu_item_call label="神之工具" name="God Tools"/>
 	</menu>
-	<menu label="Admin" name="Deprecated">
-		<menu label="Attach Object" name="Attach Object"/>
-		<menu label="Detach Object" name="Detach Object"/>
+	<menu label="管理員" name="Deprecated">
+		<menu label="附著物件" name="Attach Object"/>
+		<menu label="卸去物件" name="Detach Object"/>
 		<menu label="脫下服裝" name="Take Off Clothing">
 			<menu_item_call label="襯衫" name="Shirt"/>
 			<menu_item_call label="褲子" name="Pants"/>
@@ -403,13 +474,13 @@
 		</menu>
 		<menu label="幫助" name="DeprecatedHelp">
 			<menu_item_call label="林登官方部落格" name="Official Linden Blog"/>
-			<menu_item_call label="Scripting Portal" name="Scripting Portal"/>
+			<menu_item_call label="腳本門戶" name="Scripting Portal"/>
 			<menu label="臭蟲回報" name="Bug Reporting">
-				<menu_item_call label="Public Issue Tracker" name="Public Issue Tracker"/>
-				<menu_item_call label="Public Issue Tracker Help" name="Publc Issue Tracker Help"/>
+				<menu_item_call label="大眾問題反應追蹤處" name="Public Issue Tracker"/>
+				<menu_item_call label="大眾問題反應追蹤處幫助" name="Publc Issue Tracker Help"/>
 				<menu_item_call label="臭蟲回報 101" name="Bug Reporing 101"/>
-				<menu_item_call label="Security Issues" name="Security Issues"/>
-				<menu_item_call label="QA Wiki" name="QA Wiki"/>
+				<menu_item_call label="安全問題" name="Security Issues"/>
+				<menu_item_call label="品管維基" name="QA Wiki"/>
 			</menu>
 		</menu>
 	</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
index 2eea314dd8..576f7f3b73 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearable_list_item.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Outfit Wearable Context Menu">
 	<menu_item_call label="取代" name="wear_replace"/>
-	<menu_item_call label="Wear" name="wear_wear"/>
+	<menu_item_call label="穿上" name="wear_wear"/>
 	<menu_item_call label="添加" name="wear_add"/>
-	<menu_item_call label="Take Off / Detach" name="take_off_or_detach"/>
+	<menu_item_call label="脫下裝扮 / 卸除附件" name="take_off_or_detach"/>
 	<menu_item_call label="卸下" name="detach"/>
-	<context_menu label="Attach to" name="wearable_attach_to"/>
-	<context_menu label="Attach to HUD" name="wearable_attach_to_hud"/>
+	<context_menu label="附著到..." name="wearable_attach_to"/>
+	<context_menu label="附著到擡頭顯示" name="wearable_attach_to_hud"/>
 	<menu_item_call label="脫下" name="take_off"/>
 	<menu_item_call label="編輯" name="edit"/>
 	<menu_item_call label="物品檔案" name="object_profile"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
index d9f4acb27b..6184f956d1 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_gear.xml
@@ -2,4 +2,5 @@
 <toggleable_menu name="Gear Wearing">
 	<menu_item_call label="編輯裝扮" name="edit"/>
 	<menu_item_call label="脫下" name="takeoff"/>
+	<menu_item_call label="複製裝扮清單到剪貼簿" name="copy"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
index c7d2853995..c7d2853995 100644..100755
--- a/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
+++ b/indra/newview/skins/default/xui/zh/menu_wearing_tab.xml
diff --git a/indra/newview/skins/default/xui/zh/mime_types.xml b/indra/newview/skins/default/xui/zh/mime_types.xml
index 8ac1bf6920..70af2d2f19 100644..100755
--- a/indra/newview/skins/default/xui/zh/mime_types.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -5,7 +5,7 @@
 			網頁內容
 		</label>
 		<tooltip name="web_tooltip">
-			這位置有網頁內容
+			這個位置有網頁內容
 		</tooltip>
 		<playtip name="web_playtip">
 			顯示網頁內容
@@ -41,7 +41,7 @@
 			有一個音頻在此位置
 		</tooltip>
 		<playtip name="audio_playtip">
-			播放這個硾的音頻
+			播放這個位置的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
@@ -66,7 +66,7 @@
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			視頻
+			影片
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
@@ -111,7 +111,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			選項（XHTML）
+			網頁（XHTML）
 		</label>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -171,7 +171,7 @@
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">
-			選項
+			網頁
 		</label>
 	</mimetype>
 	<mimetype name="text/plain">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_linux.xml b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
index 90f17b841c..70af2d2f19 100644..100755
--- a/indra/newview/skins/default/xui/zh/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_linux.xml
@@ -5,7 +5,7 @@
 			網頁內容
 		</label>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			這個位置有網頁內容
 		</tooltip>
 		<playtip name="web_playtip">
 			顯示網頁內容
@@ -27,7 +27,7 @@
 			圖像
 		</label>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			有一個圖像在此位置
 		</tooltip>
 		<playtip name="image_playtip">
 			察看這個位置的圖像
@@ -106,12 +106,12 @@
 	</mimetype>
 	<mimetype name="application/smil">
 		<label name="application/smil_label">
-			Synchronized Multimedia Integration Language (SMIL)
+			同步多媒體整合語言（SMIL）
 		</label>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			選項（XHTML）
+			網頁（XHTML）
 		</label>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -171,7 +171,7 @@
 	</mimetype>
 	<mimetype name="text/html">
 		<label name="text/html_label">
-			選項
+			網頁
 		</label>
 	</mimetype>
 	<mimetype name="text/plain">
diff --git a/indra/newview/skins/default/xui/zh/mime_types_mac.xml b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
index b8105c145c..70af2d2f19 100644..100755
--- a/indra/newview/skins/default/xui/zh/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/zh/mime_types_mac.xml
@@ -30,7 +30,7 @@
 			有一個圖像在此位置
 		</tooltip>
 		<playtip name="image_playtip">
-			察看在此位置的圖像
+			察看這個位置的圖像
 		</playtip>
 	</widgetset>
 	<widgetset name="audio">
@@ -41,7 +41,7 @@
 			有一個音頻在此位置
 		</tooltip>
 		<playtip name="audio_playtip">
-			播放在此位置的音頻
+			播放這個位置的音頻
 		</playtip>
 	</widgetset>
 	<scheme name="rtsp">
@@ -66,7 +66,7 @@
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">
-			視頻
+			影片
 		</label>
 	</mimetype>
 	<mimetype name="image/*">
@@ -76,7 +76,7 @@
 	</mimetype>
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			視頻 （QuickTime）
+			視頻（QuickTime）
 		</label>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -86,7 +86,7 @@
 	</mimetype>
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">
-			OGG 音頻/視頻
+			Ogg 音頻/視頻
 		</label>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -121,7 +121,7 @@
 	</mimetype>
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">
-			音頻 （MIDI）
+			音頻（MIDI）
 		</label>
 	</mimetype>
 	<mimetype name="audio/mpeg">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 3fa8ff3f78..864f20fc15 100644..100755
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -45,19 +51,19 @@
 		</form>
 	</template>
 	<notification label="未知的通知訊息" name="MissingAlert">
-		Your version of [APP_NAME] does not know how to display the notification it just received.  Please verify that you have the latest Viewer installed.
+		你的 [APP_NAME] 版本無法顯示它剛剛收到的通知。  請確定你安裝了最新版本的 Viewer。
 
-Error details: The notification called &apos;[_NAME]&apos; was not found in notifications.xml.
+錯誤詳情：在 notifications.xml 裡找不到名為「[_NAME]」的通知。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="FloaterNotFound">
-		Floater error: Could not find the following controls:
+		浮動視窗錯誤：找不到以下的控制：
 
 [CONTROLS]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="TutorialNotFound">
-		No tutorial is currently available.
+		目前尚無教學內容。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="GenericAlert">
@@ -68,67 +74,101 @@ Error details: The notification called &apos;[_NAME]&apos; was not found in noti
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
 	</notification>
 	<notification name="BadInstallation">
-		An error occurred while updating [APP_NAME].  Please [http://get.secondlife.com download the latest version] of the Viewer.
+		[APP_NAME] 更新時出錯。  請 [http://get.secondlife.com 下載] 最新版本的 Viewer。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="LoginFailedNoNetwork">
-		無法連接到[SECOND_LIFE_GRID].
-    &apos;[DIAGNOSTIC]&apos;
-請確定你的網際網路是正常運作的。
+		無法連接到 [SECOND_LIFE_GRID]。
+    （[DIAGNOSTIC]）
+請確定你的網路連線沒有問題。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="MessageTemplateNotFound">
-		Message Template [PATH] not found.
+		找不到訊息模板 [PATH]。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="WearableSave">
 		除存變更到目前的衣服/身體部位？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
+	<notification name="ConfirmNoCopyToOutbox">
+		你無權將至少一件物項複製到第二人生購物市集的發件匣。  你可以移動這些物項，或保留不動。
+		<usetemplate name="okcancelbuttons" notext="保留不移動物項" yestext="移動物項"/>
+	</notification>
+	<notification name="OutboxFolderCreated">
+		已經為你所轉移到商家發件匣頂層的每一個物項，各自建立了一個新資料夾。
+		<usetemplate ignoretext="商家發件匣裡成功建立了一個新資料夾" name="okignore" yestext="確定"/>
+	</notification>
+	<notification name="OutboxImportComplete">
+		成功
+
+所有資料夾已成功送往第二人生購物市集。
+		<usetemplate ignoretext="所有資料夾已送往第二人生購物市集" name="okignore" yestext="確定"/>
+	</notification>
+	<notification name="OutboxImportHadErrors">
+		一部分的資料夾無法轉移
+
+將一部分資料夾送往第二人生購物市集時出錯。  這些資料夾仍在你的商家發件匣。
+
+詳情請參閱[[MARKETPLACE_IMPORTS_URL]錯誤記錄]。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="OutboxImportFailed">
+		轉移失敗
+
+未將任何資料夾送往第二人生購物市集，系統或網路出錯。  請稍候再試一次。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="OutboxInitFailed">
+		第二人生購物市集初始化失敗
+
+第二人生購物市集初始化失敗，系統或網路出錯。  請稍候再試一次。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
-		There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later.
+		上傳腳本文字時出問題，原因：[REASON]。 請稍候再試一次。
 	</notification>
 	<notification name="CompileQueueSaveBytecode">
-		There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later.
+		上傳已編譯腳本時出問題，原因：[REASON]。 請稍候再試一次。
 	</notification>
 	<notification name="WriteAnimationFail">
-		There was a problem writing animation data.  Please try again later.
+		寫入動作資料時出錯。  請稍候再試一次。
 	</notification>
 	<notification name="UploadAuctionSnapshotFail">
-		There was a problem uploading the auction snapshot due to the following reason: [REASON]
+		上傳拍賣快照時出問題，原因：[REASON]
 	</notification>
 	<notification name="UnableToViewContentsMoreThanOne">
-		Unable to view the contents of more than one item at a time.
-Please select only one object and try again.
+		無法一次瀏覽多個項目的內容。
+請只選擇一個物件，再試一次。
 	</notification>
 	<notification name="SaveClothingBodyChanges">
 		儲存全部服裝或身體部位的變更？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="全部儲存"/>
 	</notification>
 	<notification name="FriendsAndGroupsOnly">
-		Non-friends won&apos;t know that you&apos;ve choosen to ignore their calls and instant messages.
+		不是朋友的人不會知道你選擇忽略他們的通話要求和即時訊息。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="FavoritesOnLogin">
-		Note: When you turn on this option, anyone who uses this computer can see your list of favorite locations.
+		注意：你一旦同意這選項，任何使用這部電腦的人都可看到你有哪些「最愛」地點。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="GrantModifyRights">
-		Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
-Do you want to grant modify rights for [NAME]?
-		<usetemplate name="okcancelbuttons" notext="No" yestext="是"/>
+		賦予另一居民「修改」權，將允許他更改、刪除或拿取你在虛擬世界裡擁有的任何物件。 賦予這項權限時，敬請慎重考慮。
+你仍要賦予 [NAME] 修改權嗎?
+		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="GrantModifyRightsMultiple">
-		Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
-Do you want to grant modify rights for the selected Residents?
+		賦予另一居民「修改」權，將允許他更改你在虛擬世界裡擁有的任何物件。 賦予這項權限時，敬請慎重考慮。
+你仍要將修改權賦予所選居民嗎?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="RevokeModifyRights">
-		Do you want to revoke modify rights for [NAME]?
+		你要撤銷 [NAME] 的修改權嗎?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="RevokeModifyRightsMultiple">
-		Do you want to revoke modify rights for the selected Residents?
+		你要撤銷所選居民的修改權嗎?
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="UnableToCreateGroup">
@@ -146,33 +186,41 @@ Do you want to grant modify rights for the selected Residents?
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AddGroupOwnerWarning">
-		You are about to add group members to the role of [ROLE_NAME].
-Members cannot be removed from that role.
-The members must resign from the role themselves.
-Are you sure you want to continue?
-		<usetemplate ignoretext="在我添加一個新的群組擁有者前確認" name="okcancelignore" notext="否" yestext="是"/>
+		你即將賦予群組成員 [ROLE_NAME] 的角色。
+成員一旦獲得此角色，你就不能自行撤銷。
+成員必須自行離職才能撤銷這角色。
+你確定你要繼續？
+		<usetemplate ignoretext="在我添加一個新的群組所有人前再次確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="AssignDangerousActionWarning">
-		You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+		你即將把「[ACTION_NAME]」能力增加給「[ROLE_NAME]」角色。
 
- *WARNING*
- Any Member in a Role with this Ability can assign themselves -- and any other member -- to Roles that have more powers than they  currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability.
+ *警告*
+ 任何屬於帶有這能力的角色的成員，都可以賦予自己或任何人新的角色，因此得到比現在更多的權力，最終可能擁有近似「所有人」的權力。 賦予這項能力之前，敬請慎重考慮。
 
-Add this Ability to &apos;[ROLE_NAME]&apos;?
+你仍要新增這項能力給「[ROLE_NAME]」？
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="AssignDangerousAbilityWarning">
-		You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+		你即將把「[ACTION_NAME]」能力增加給「[ROLE_NAME]」角色。
 
- *WARNING*
- Any Member in a Role with this Ability can assign themselves -- and any other member -- all Abilities, elevating themselves to near-Owner power.
+ *警告*
+ 任何屬於帶有這能力的角色的成員，都可以將所有能力賦予自己或任何人，提升為近似「所有人」權力的層級。
 
-Add this Ability to &apos;[ROLE_NAME]&apos;?
+你仍要新增這項能力給「[ROLE_NAME]」？
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
+	<notification name="EjectGroupMemberWarning">
+		你即將把 [AVATAR_NAME] 踢出群組。
+		<usetemplate ignoretext="確定將某人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/>
+	</notification>
+	<notification name="EjectGroupMembersWarning">
+		你即將把 [COUNT] 個人踢出群組。
+		<usetemplate ignoretext="確定將多人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/>
+	</notification>
 	<notification name="AttachmentDrop">
-		You are about to drop your attachment.
-    Are you sure you want to continue?
+		你即將卸除你的附件。
+    你確定你要繼續？
 		<usetemplate ignoretext="在丟下附件前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="JoinGroupCanAfford">
@@ -181,178 +229,184 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
 	</notification>
 	<notification name="JoinGroupNoCost">
-		You are joining group [NAME].
-Do you wish to proceed?
+		你即將加入 [NAME] 群組。
+你確定要繼續嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="加入"/>
 	</notification>
 	<notification name="JoinGroupCannotAfford">
-		Joining this group costs L$[COST].
-You do not have enough L$ to join this group.
+		加入此群組須花費 L$[COST]。
+你的 L$ 不夠加入這群組。
 	</notification>
 	<notification name="CreateGroupCost">
-		Creating this group will cost L$100.
-Groups need more than one member, or they are deleted forever.
-Please invite members within 48 hours.
+		創立這個群組費用為 L$100。
+群組需有至少兩位成員，否則將永久被刪除。
+請在 48 小時內邀請成員加入。
 		<usetemplate canceltext="取消" name="okcancelbuttons" notext="取消" yestext="花費 L$100 建立群組"/>
 	</notification>
 	<notification name="LandBuyPass">
-		For L$[COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
+		花費 L$[COST]，可進入「[PARCEL_NAME]」土地，停留 [TIME] 小時。  購買通行權？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SalePriceRestriction">
-		Sale price must be set to more than L$0 if selling to anyone.
-Please select an individual to sell to if selling for L$0.
+		若是出售給任何人，售價必須超過 L$0。
+如果售價定為 L$0，請選定一位出售對象。
 	</notification>
 	<notification name="ConfirmLandSaleChange">
-		The selected [LAND_SIZE] m² land is being set for sale.
-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
+		所選的 [LAND_SIZE] 平方公尺土地即將準備出售。
+售價將為 L$[SALE_PRICE]，並將經你授權出售給 [NAME]。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmLandSaleToAnyoneChange">
-		ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
+		請注意：若點按「出售給任何人」，你的土地將允許整個 [SECOND_LIFE] 社群前來購買，包括此地區外的人。
 
-The selected [LAND_SIZE] m² land is being set for sale.
-Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
+所選的 [LAND_SIZE] 平方公尺土地即將準備出售。
+售價將為 L$[SALE_PRICE]，並將經你授權出售給 [NAME]。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsDeededToGroup">
-		Are you sure you want to return all objects shared with the group &apos;[NAME]&apos; on this parcel of land back to their previous owner&apos;s inventory?
+		你確定要將和本土地地段的「[NAME]」群組分享的所有物件送返到原所有人的收納區？
 
-*WARNING* This will delete the non-transferable objects deeded to the group!
+警告：這動作將會刪除原先讓渡給這群組的所有不可轉讓物件！
 
-Objects: [N]
+物件：[N]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsOwnedByUser">
-		Are you sure you want to return all objects owned by the Resident &apos;[NAME]&apos; on this parcel of land back to their inventory?
+		你確定要將本地段裡「[NAME]」居民所擁有的所有物件送返其收納區？
 
-Objects: [N]
+物件：[N]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsOwnedBySelf">
-		Are you sure you want to return all objects owned by you on this parcel of land back to your inventory?
+		你確定要將本地段裡你所擁有的所有物件送返你的收納區？
 
-Objects: [N]
+物件：[N]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsNotOwnedBySelf">
-		Are you sure you want to return all objects NOT owned by you on this parcel of land back to their owner&apos;s inventory?
-Transferable objects deeded to a group will be returned to their previous owners.
+		你確定要將本地段裡不屬於你的所有物件送返其所有人的收納區？
+先前讓渡給群組的可轉讓物件將送返給原物主。
 
-*WARNING* This will delete the non-transferable objects deeded to the group!
+警告：這動作將會刪除原先讓渡給這群組的所有不可轉讓物件！
 
-Objects: [N]
+物件：[N]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByUser">
-		Are you sure you want to return all objects NOT owned by [NAME] on this parcel of land back to their owner&apos;s inventory?
-Transferable objects deeded to a group will be returned to their previous owners.
+		你確定要將本地段裡不屬於 [NAME] 的所有物件送返其所有人的收納區？
+先前讓渡給群組的可轉讓物件將送返給原物主。
 
-*WARNING* This will delete the non-transferable objects deeded to the group!
+警告：這動作將會刪除原先讓渡給這群組的所有不可轉讓物件！
 
-Objects: [N]
+物件：[N]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Are you sure you want to return all listed objects back to their owner&apos;s inventory?
+		你確定要將所列的所有物件送返其所有人的收納區？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
-		Are you sure you want to disable all objects in this region?
+		你確定要停用本地區裡所有物件？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnObjectsNotOwnedByGroup">
-		Return the objects on this parcel of land that are NOT shared with the group [NAME] back to their owners?
+		將本地段裡未和 [NAME] 群組分享的物件送返給物主？
 
-Objects: [N]
+物件：[N]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="UnableToDisableOutsideScripts">
-		Can not disable scripts.
-This entire region is damage enabled.
-Scripts must be allowed to run for weapons to work.
+		無法停用腳本。
+這整個地區允許傷害。
+腳本必須獲准執行，武器才有效。
 	</notification>
 	<notification name="MultipleFacesSelected">
-		Multiple faces are currently selected.
-If you continue this action, separate instances of media will be set on multiple faces of the object.
-To place the media on only one face, choose Select Face and click on the desired face of that object then click Add.
-		<usetemplate ignoretext="Media will be set on multiple selected faces" name="okcancelignore" notext="取消" yestext="確定"/>
+		目前選擇了多個臉部。
+如果你繼續，物件的多個臉部將有各自的媒體啟動。
+若想只在一個臉部放置媒體，請「選擇臉部」，點按物件上你所要的臉部，再按「新增」。
+		<usetemplate ignoretext="所選的多個臉部都將啟用各自的媒體。" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="MustBeInParcel">
-		You must be standing inside the land parcel to set its Landing Point.
+		你必須站在地段上才能設定其登陸點。
 	</notification>
 	<notification name="PromptRecipientEmail">
-		Please enter a valid email address for the recipient(s).
+		請輸入居民的有效的電郵地址。
 	</notification>
 	<notification name="PromptSelfEmail">
-		Please enter your email address.
+		請輸入你的電郵地址。
 	</notification>
 	<notification name="PromptMissingSubjMsg">
-		Email snapshot with the default subject or message?
+		用預設的電郵主旨或內文送出快照？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ErrorProcessingSnapshot">
-		Error processing snapshot data
+		處理快照資料時出錯
 	</notification>
 	<notification name="ErrorEncodingSnapshot">
-		Error encoding snapshot.
+		為快照編碼時出錯。
 	</notification>
 	<notification name="ErrorUploadingPostcard">
-		There was a problem sending a snapshot due to the following reason: [REASON]
+		發送快照時出問題，原因：[REASON]
 	</notification>
 	<notification name="ErrorUploadingReportScreenshot">
-		There was a problem uploading a report screenshot due to the following reason: [REASON]
+		上傳舉報用快照時出問題，原因：[REASON]
 	</notification>
 	<notification name="MustAgreeToLogIn">
-		You must agree to the Terms of Service to continue logging into [SECOND_LIFE].
+		你必須同意服務條款才可繼續登入 [SECOND_LIFE]。
 	</notification>
 	<notification name="CouldNotPutOnOutfit">
-		Could not put on outfit.
-The outfit folder contains no clothing, body parts, or attachments.
+		無法穿上裝扮。
+裝扮資料夾裡沒有任何衣物、身體部位或附件。
 	</notification>
 	<notification name="CannotWearTrash">
-		You can not wear clothes or body parts that are in the trash
+		你不能穿戴垃圾桶裡的衣物或身體部位。
 	</notification>
 	<notification name="MaxAttachmentsOnOutfit">
-		Could not attach object.
-Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first.
+		無法附加物件。
+超過 [MAX_ATTACHMENTS] 項物件的附加上限。 請先卸除一個物件。
 	</notification>
 	<notification name="CannotWearInfoNotComplete">
-		You can not wear that item because it has not yet loaded. Please try again in a minute.
+		無法穿戴該物件，它尚未完成載入。 請稍候再試。
 	</notification>
 	<notification name="MustHaveAccountToLogIn">
-		Oops! Something was left blank.
-You need to enter the Username name of your avatar.
+		糟糕！ 發現有內容留白。
+你必須為化身輸入一個使用者名稱。
 
-You need an account to enter [SECOND_LIFE]. Would you like to create one now?
+進入 [SECOND_LIFE] 需要一個帳號。 你現在要不要新建一個？
 		<url name="url">
-			http://join.secondlife.com/
+			[create_account_url]
 		</url>
 		<usetemplate name="okcancelbuttons" notext="再試一次" yestext="創造新帳戶"/>
 	</notification>
 	<notification name="InvalidCredentialFormat">
-		You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again.
+		你必須在「使用者名稱」欄位裡輸入使用者名稱，或輸入化身的名和姓，然後再登入。
+	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; 不是有效的網格辨識元。
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		你的開始位置所指定的網格無效。
 	</notification>
 	<notification name="DeleteClassified">
-		Delete classified &apos;[NAME]&apos;?
-There is no reimbursement for fees paid.
+		刪除個人廣告「[NAME]」？
+已付費用恕不退回。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DeleteMedia">
-		You have selected to delete the media associated with this face.
-Are you sure you want to continue?
+		你選擇刪除置於這臉部的媒體。
+你確定你要繼續？
 		<usetemplate ignoretext="在我由一個部件中刪除媒體前確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ClassifiedSave">
-		Save changes to classified [NAME]?
+		儲存個人廣告「[NAME]」的變更？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="ClassifiedInsufficientFunds">
-		Insufficient funds to create classified.
+		金額不足，無法刊登個人廣告。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="DeleteAvatarPick">
-		Delete pick &lt;nolink&gt;[PICK]&lt;/nolink&gt;?
+		刪除精選位置&lt;nolink&gt;[PICK]&lt;/nolink&gt;？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DeleteOutfits">
@@ -367,7 +421,7 @@ Are you sure you want to continue?
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SelectProposalToView">
-		Please select a proposal to view.
+		請選擇一個要察看的提議。
 	</notification>
 	<notification name="SelectHistoryItemToView">
 		請選擇一個歷史紀錄物品去察看。
@@ -380,13 +434,13 @@ Are you sure you want to continue?
 注意：這將會清除快取資料。
 	</notification>
 	<notification name="ChangeConnectionPort">
-		Port settings take effect after you restart [APP_NAME].
+		重新啟動 [APP_NAME] 後將啟用新的埠設定。
 	</notification>
 	<notification name="ChangeSkin">
-		The new skin will appear after you restart [APP_NAME].
+		重新啟動 [APP_NAME] 後將顯現新的皮膚。
 	</notification>
 	<notification name="ChangeLanguage">
-		Changing language will take effect after you restart [APP_NAME].
+		重新啟動 [APP_NAME] 後將換成新的語言。
 	</notification>
 	<notification name="GoToAuctionPage">
 		前往 [SECOND_LIFE] 網頁去察看拍賣細節或下標？
@@ -396,92 +450,119 @@ Are you sure you want to continue?
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SaveChanges">
-		Save Changes?
+		儲存變更？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="不要儲存" yestext="儲存"/>
 	</notification>
 	<notification name="GestureSaveFailedTooManySteps">
-		Gesture save failed.
-This gesture has too many steps.
-Try removing some steps, then save again.
+		姿勢儲存失敗。
+這個姿勢步驟太多。
+請去除一些步驟再儲存。
 	</notification>
 	<notification name="GestureSaveFailedTryAgain">
-		Gesture save failed.  Please try again in a minute.
+		姿勢儲存失敗。  請稍候再試。
 	</notification>
 	<notification name="GestureSaveFailedObjectNotFound">
-		Could not save gesture because the object or the associated object inventory could not be found.
-The object may be out of range or may have been deleted.
+		無法儲存姿勢，找不到該物件或所屬物件收納區。
+該物件可能超出範圍或已被刪除。
 	</notification>
 	<notification name="GestureSaveFailedReason">
-		There was a problem saving a gesture due to the following reason: [REASON].  Please try resaving the gesture later.
+		儲存姿勢時出問題，原因：[REASON]。  請稍後再嘗試儲存姿勢。
 	</notification>
 	<notification name="SaveNotecardFailObjectNotFound">
-		Could not save notecard because the object or the associated object inventory could not be found.
-The object may be out of range or may have been deleted.
+		無法儲存記事卡，找不到該物件或所屬物件收納區。
+該物件可能超出範圍或已被刪除。
 	</notification>
 	<notification name="SaveNotecardFailReason">
-		There was a problem saving a notecard due to the following reason: [REASON].  Please try re-saving the notecard later.
+		儲存記事卡時出問題，原因：[REASON]。  請稍後再嘗試儲存記事卡。
 	</notification>
 	<notification name="ScriptCannotUndo">
-		Could not undo all changes in your version of the script.
-Would you like to load the server&apos;s last saved version?
-(**Warning** This operation cannot be undone.)
+		無法取消你這個版本腳本的變更。
+是否從伺服器載入上次成功儲存的版本？
+（*警告* 這動作無法還原。）
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SaveScriptFailReason">
-		There was a problem saving a script due to the following reason: [REASON].  Please try re-saving the script later.
+		儲存腳本時出問題，原因：[REASON]。  請稍後再嘗試儲存腳本。
 	</notification>
 	<notification name="SaveScriptFailObjectNotFound">
-		Could not save the script because the object it is in could not be found.
-The object may be out of range or may have been deleted.
+		無法儲存腳本，找不到它所屬的物件。
+該物件可能超出範圍或已被刪除。
 	</notification>
 	<notification name="SaveBytecodeFailReason">
-		There was a problem saving a compiled script due to the following reason: [REASON].  Please try re-saving the script later.
+		儲存編譯腳本時出問題，原因：[REASON]。  請稍後再嘗試儲存腳本。
 	</notification>
 	<notification name="StartRegionEmpty">
-		Oops, Your Start Region is not defined.
-Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location.
+		你的起始地區尚未定義。
+請在「開始位置」框裡輸入區域名，或選擇「我上一次位置」或「我的家」作為開始位置。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
-		Could not start or stop the script because the object it is on could not be found.
-The object may be out of range or may have been deleted.
+		無法啟動或停止腳本，找不到它所屬的物件。
+該物件可能超出範圍或已被刪除。
 	</notification>
 	<notification name="CannotDownloadFile">
-		Unable to download file
+		無法下載檔案
 	</notification>
 	<notification name="CannotWriteFile">
-		Unable to write file [[FILE]]
+		無法寫入檔案 [[FILE]]
 	</notification>
 	<notification name="UnsupportedHardware">
-		Just so you know, your computer does not meet [APP_NAME]&apos;s minimum system requirements. You may experience poor performance. Unfortunately, the [SUPPORT_SITE] can&apos;t provide technical support for unsupported system configurations.
+		要告知你，你的電腦未達 [APP_NAME] 的最低系統需求。 你可能會發現電腦性能不佳。 很遺憾，[SUPPORT_SITE] 無法針對不支援的系統設置提供技術支援。
 
-Visit [_URL] for more information?
+要造訪 [_URL] 獲取進一步資訊？
 		<url name="url">
 			http://www.secondlife.com/corporate/sysreqs.php
 		</url>
 		<usetemplate ignoretext="我的電腦硬體並不支援" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://www.intel.com/p/en_US/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="AMDOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://support.amd.com/us/Pages/AMDSupportHub.aspx
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="NVIDIAOldDriver">
+		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
+
+    前往 [_URL] 察看是否有新版驅動程式？
+		<url name="url">
+			http://www.nvidia.com/Download/index.aspx?lang=tw
+		</url>
+		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
 	<notification name="UnknownGPU">
-		Your system contains a graphics card that [APP_NAME] doesn&apos;t recognize.
-This is often the case with new hardware that hasn&apos;t been tested yet with [APP_NAME].  It will probably be ok, but you may need to adjust your graphics settings.
-(Me &gt; Preferences &gt; Graphics).
+		你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
+原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。  這大概不會出問題，但你可能需要調整顯像設定。
+（我自己 &gt; 偏好設定 &gt; 顯像）
 		<form name="form">
 			<ignore name="ignore" text="我的顯示卡無法辨識"/>
 		</form>
 	</notification>
 	<notification name="DisplaySettingsNoShaders">
-		[APP_NAME] crashed while initializing graphics drivers.
-Graphics Quality will be set to Low to avoid some common driver errors. This will disable some graphics features.
-We recommend updating your graphics card drivers.
-Graphics Quality can be raised in Preferences &gt; Graphics.
+		[APP_NAME] 初始化顯像驅動程式時當掉了。
+顯像度將設為低階，以防發生常見的驅動程式或錯誤。 這將停用一些顯像功能。
+我們建議你更新顯像驅動程式。
+請到「偏好設定 &gt; 顯像」提高顯像度。
 	</notification>
 	<notification name="RegionNoTerraforming">
 		這個 [REGION] 地區並不允許變更地形。
 	</notification>
 	<notification name="CannotCopyWarning">
-		You do not have permission to copy the following items:
+		你沒有權限複製以下項目：
 [ITEMS]
-and will lose it from your inventory if you give it away. Do you really want to offer these items?
+如果你將它送人，它將無法續留在收納區。 你確定要送出這些東西嗎？
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="CannotGiveItem">
@@ -491,18 +572,18 @@ and will lose it from your inventory if you give it away. Do you really want to
 		交易已取消。
 	</notification>
 	<notification name="TooManyItems">
-		Cannot give more than 42 items in a single inventory transfer.
+		每一次的收納區轉移動作不能超過 42 項物件。
 	</notification>
 	<notification name="NoItems">
-		You do not have permission to transfer the selected items.
+		你沒有權限轉移所選項目。
 	</notification>
 	<notification name="CannotCopyCountItems">
-		You do not have permission to copy [COUNT] of the selected items. You will lose these items from your inventory.
-Do you really want to give these items?
+		你沒有權限複製所選物件當中的 [COUNT] 項。 你的收納區將無法續留這些物件。
+你確定要送出這些東西嗎？
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="CannotGiveCategory">
-		You do not have permission to transfer the selected folder.
+		你沒有權限轉移所選資料夾。
 	</notification>
 	<notification name="FreezeAvatar">
 		凍結這位化身？
@@ -533,75 +614,78 @@ Do you really want to give these items?
 		取得錯誤：太多物件被選取。
 	</notification>
 	<notification name="AcquireErrorObjectSpan">
-		ACQUIRE ERROR: Objects span more than one region.
-Please move all objects to be acquired onto the same region.
+		取得錯誤：物件跨越多個地區。
+請將所欲取得的物件移到同一區域。
 	</notification>
 	<notification name="PromptGoToCurrencyPage">
 		[EXTRA]
 
-Go to [_URL] for information on purchasing L$?
+前往 [_URL] 得知如何購買 L$？
 		<url name="url">
 			http://secondlife.com/app/currency/
 		</url>
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="UnableToLinkObjects">
-		Unable to link these [COUNT] objects.
-You can link a maximum of [MAX] objects.
+		無法聯結這 [COUNT] 個物件。
+你最多可以聯結 [MAX] 個物件。
 	</notification>
 	<notification name="CannotLinkIncompleteSet">
-		You can only link complete sets of objects, and must select more than one object.
+		可以聯結的必需是一套物件，請選擇至少兩個物件。
 	</notification>
 	<notification name="CannotLinkModify">
-		Unable to link because you don&apos;t have modify permission on all the objects.
+		無法聯結；你對某些物件沒有修改權。
 
-Please make sure none are locked, and that you own all of them.
+請確定沒有物件被鎖住，並確定你擁有所有物件。
+	</notification>
+	<notification name="CannotLinkPermanent">
+		物件無法跨越地區界限進行聯結。
 	</notification>
 	<notification name="CannotLinkDifferentOwners">
-		Unable to link because not all of the objects have the same owner.
+		無法聯結；有些物件的所有人不同。
 
-Please make sure you own all of the selected objects.
+請確定你是所選所有物件的所有人。
 	</notification>
 	<notification name="NoFileExtension">
-		No file extension for the file: &apos;[FILE]&apos;
+		檔案沒有副檔名：&apos;[FILE]&apos;
 
-Please make sure the file has a correct file extension.
+請確定檔案具備正確的副檔名。
 	</notification>
 	<notification name="InvalidFileExtension">
-		Invalid file extension [EXTENSION]
-Expected [VALIDS]
+		無效的副檔名：[EXTENSION]
+應該是 [VALIDS]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="CannotUploadSoundFile">
-		Couldn&apos;t open uploaded sound file for reading:
+		無法開啟並讀取上傳的聲音檔：
 [FILE]
 	</notification>
 	<notification name="SoundFileNotRIFF">
-		File does not appear to be a RIFF WAVE file:
+		檔案似乎不是 RIFF WAVE 檔：
 [FILE]
 	</notification>
 	<notification name="SoundFileNotPCM">
-		File does not appear to be a PCM WAVE audio file:
+		檔案似乎不是 PCM WAVE 音頻檔：
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidChannelCount">
-		File has invalid number of channels (must be mono or stereo):
+		檔案的頻道數無效（必需為單聲道或立體聲）
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidSampleRate">
-		File does not appear to be a supported sample rate (must be 44.1k):
+		檔案似乎帶有不支援的採樣率（需為 44.1 k）：
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidWordSize">
-		File does not appear to be a supported word size (must be 8 or 16 bit):
+		檔案似乎帶有不支援的字組（需為 8 或 16 位元）：
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidHeader">
-		Could not find &apos;data&apos; chunk in WAV header:
+		找不到 WAV 檔頭的「data」區塊：
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidChunkSize">
-		Wrong chunk size in WAV file:
+		WAV 檔區塊大小錯誤：
 [FILE]
 	</notification>
 	<notification name="SoundFileInvalidTooLong">
@@ -609,41 +693,41 @@ Expected [VALIDS]
 [FILE]
 	</notification>
 	<notification name="ProblemWithFile">
-		Problem with file [FILE]:
+		檔案 [FILE] 有問題：
 
 [ERROR]
 	</notification>
 	<notification name="CannotOpenTemporarySoundFile">
-		Couldn&apos;t open temporary compressed sound file for writing: [FILE]
+		無法開啟並寫入暫時壓縮音頻檔：[FILE]
 	</notification>
 	<notification name="UnknownVorbisEncodeFailure">
-		Unknown Vorbis encode failure on: [FILE]
+		發生不明的 Vorbis 編碼錯誤：[FILE]
 	</notification>
 	<notification name="CannotEncodeFile">
-		Unable to encode file: [FILE]
+		無法將檔案編碼：[FILE]
 	</notification>
 	<notification name="CorruptedProtectedDataStore">
-		We can&apos;t fill in your username and password.  This may happen when you change network setup
+		我們無法填入你的使用者名稱和密碼。  這可能因為你變更了網路設定。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="CorruptResourceFile">
-		Corrupt resource file: [FILE]
+		毀損的資源檔：[FILE]
 	</notification>
 	<notification name="UnknownResourceFileVersion">
-		Unknown Linden resource file version in file: [FILE]
+		檔案中發現不明的 Linden 資源檔版本：[FILE]
 	</notification>
 	<notification name="UnableToCreateOutputFile">
-		Unable to create output file: [FILE]
+		無法建立輸出檔：[FILE]
 	</notification>
 	<notification name="DoNotSupportBulkAnimationUpload">
-		[APP_NAME] does not currently support bulk upload of animation files.
+		[APP_NAME] 目前尚不支援 BVH 格式的動作檔批量上傳。
 	</notification>
 	<notification name="CannotUploadReason">
-		Unable to upload [FILE] due to the following reason: [REASON]
-Please try again later.
+		無法上傳 [FILE]，原因：[REASON]
+請稍候再試一次。
 	</notification>
 	<notification name="LandmarkCreated">
-		你已經添加 &quot;[LANDMARK_NAME]&quot; 到你的 [FOLDER_NAME] 資料夾。
+		你已新增「[LANDMARK_NAME]」到你的 [FOLDER_NAME] 資料夾。
 	</notification>
 	<notification name="LandmarkAlreadyExists">
 		你已經有這個位置的地標。
@@ -653,132 +737,132 @@ Please try again later.
 		你不能創造地標，因為地主並不允許你這樣做。
 	</notification>
 	<notification name="CannotRecompileSelectObjectsNoScripts">
-		Not able to perform &apos;recompilation&apos;.
-Select an object with a script.
+		無法進行重新編譯。
+請選擇帶有腳本的物件。
 	</notification>
 	<notification name="CannotRecompileSelectObjectsNoPermission">
-		Not able to perform &apos;recompilation&apos;.
+		無法進行重新編譯。
 
-Select objects with scripts that you have permission to modify.
+選擇帶有你可修改的腳本的物件。
 	</notification>
 	<notification name="CannotResetSelectObjectsNoScripts">
-		Not able to perform &apos;reset&apos;.
+		無法重新啟動。
 
-Select objects with scripts.
+選擇帶有腳本的物件。
 	</notification>
 	<notification name="CannotResetSelectObjectsNoPermission">
-		Not able to perform &apos;reset&apos;.
+		無法重新啟動。
 
-Select objects with scripts that you have permission to modify.
+選擇帶有你可修改的腳本的物件。
 	</notification>
 	<notification name="CannotOpenScriptObjectNoMod">
-		Unable to open script in object without modify permissions.
+		無法開啟物件裡的腳本，因為你沒有修改權。
 	</notification>
 	<notification name="CannotSetRunningSelectObjectsNoScripts">
-		Not able to set any scripts to &apos;running&apos;.
+		無法將任何腳本設定為「執行中」。
 
-Select objects with scripts.
+選擇帶有腳本的物件。
 	</notification>
 	<notification name="CannotSetRunningNotSelectObjectsNoScripts">
-		Unable to set any scripts to &apos;not running&apos;.
+		無法將任何腳本設定為「不執行」。
 
-Select objects with scripts.
+選擇帶有腳本的物件。
 	</notification>
 	<notification name="NoFrontmostFloater">
-		No frontmost floater to save.
+		沒有最前置的浮動視窗可儲存。
 	</notification>
 	<notification name="SeachFilteredOnShortWords">
-		Your search query was modified and the words that were too short were removed.
+		你的搜尋字串已被修改，太短的字已被移除。
 
-Searched for: [FINALQUERY]
+搜尋：[FINALQUERY]
 	</notification>
 	<notification name="SeachFilteredOnShortWordsEmpty">
-		Your search terms were too short so no search was performed.
+		你的搜尋字串太短，所以沒有啟動搜索。
 	</notification>
 	<notification name="CouldNotTeleportReason">
 		瞬間傳送失敗。
 [REASON]
 	</notification>
 	<notification name="invalid_tport">
-		Problem encountered processing your teleport request. You may need to log back in before you can teleport.
-If you continue to get this message, please check the [SUPPORT_SITE].
+		處理你瞬間傳送要求時發生問題。 如果想要瞬間傳送，你可能需要重新登入。
+如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 	</notification>
 	<notification name="invalid_region_handoff">
-		Problem encountered processing your region crossing. You may need to log back in before you can cross regions.
-If you continue to get this message, please check the [SUPPORT_SITE].
+		處理你跨越地區動作時發生問題。 如果想要跨越地區，你可能需要重新登入。
+如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 	</notification>
 	<notification name="blocked_tport">
-		Sorry, teleport is currently blocked. Try again in a moment.  If you still cannot teleport, please log out and log back in to resolve the problem.
+		抱歉，目前禁止瞬間傳送。 請稍後再試。  如果你仍無法進行瞬間傳送，請登出後重新入來解決此一問題。
 	</notification>
 	<notification name="nolandmark_tport">
-		Sorry, but system was unable to locate landmark destination.
+		抱歉，不過系統無法找到地標所在目的地。
 	</notification>
 	<notification name="timeout_tport">
-		Sorry, but system was unable to complete the teleport connection.  Try again in a moment.
+		抱歉，不過系統無法完成瞬間傳送的聯接。  請稍後再試。
 	</notification>
 	<notification name="noaccess_tport">
-		Sorry, you do not have access to that teleport destination.
+		抱歉，你並沒有權限進入要瞬間傳送的目的地。
 	</notification>
 	<notification name="missing_attach_tport">
-		Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
+		你的附件尚未抵達。 請稍候一會兒，或請登出後重新登入，再嘗試瞬間傳送。
 	</notification>
 	<notification name="too_many_uploads_tport">
-		The asset queue in this region is currently clogged so your teleport request will not be able to succeed in a timely manner. Please try again in a few minutes or go to a less busy area.
+		該地區的資產查詢目前太過擁塞，因此你的瞬間傳送動作可能無法即時發生。 請稍候再試，或請前往較不擁塞的地區。
 	</notification>
 	<notification name="expired_tport">
-		Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
+		抱歉，系統無法即時完成為你瞬間傳送。 請稍待幾分鐘再試。
 	</notification>
 	<notification name="expired_region_handoff">
-		Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes.
+		抱歉，系統無法即時讓你跨越地區。 請稍待幾分鐘再試。
 	</notification>
 	<notification name="no_host">
-		Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
+		找不到瞬間傳送的目的地。 目的地可能暫時不可用，或已不存在。 請稍待幾分鐘再試。
 	</notification>
 	<notification name="no_inventory_host">
 		收納區功能目前無法使用。
 	</notification>
 	<notification name="CannotSetLandOwnerNothingSelected">
-		無法設定土地擁有者：
-無地段被選取。
+		無法設定土地所有人：
+未選擇地段。
 	</notification>
 	<notification name="CannotSetLandOwnerMultipleRegions">
-		Unable to force land ownership because selection spans multiple regions. Please select a smaller area and try again.
+		無法強設土地所有權；所選部分跨越多個區域。 請縮小選擇範圍，再試一次。
 	</notification>
 	<notification name="ForceOwnerAuctionWarning">
-		This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
-Force ownership?
+		這地段正在拍賣中。 強設所有權將取消拍賣，這恐將造成某些已出價的居民不高興。
+要強設所有權嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotContentifyNothingSelected">
-		Unable to contentify:
-No parcel selected.
+		無法進行「內容化」：
+未選擇地段。
 	</notification>
 	<notification name="CannotContentifyNoRegion">
-		Unable to contentify:
-No region selected.
+		無法進行「內容化」：
+未選擇區域。
 	</notification>
 	<notification name="CannotReleaseLandNothingSelected">
 		無法放棄土地：
-無地段被選擇。
+未選擇地段。
 	</notification>
 	<notification name="CannotReleaseLandNoRegion">
 		無法放棄土地：
-無法尋找地區。
+找不到地區。
 	</notification>
 	<notification name="CannotBuyLandNothingSelected">
 		無法購買土地：
-無地段被選擇。
+未選擇地段。
 	</notification>
 	<notification name="CannotBuyLandNoRegion">
-		Unable to buy land:
-Cannot find the region this land is in.
+		無法購買土地：
+找不到這土地所在的地區。
 	</notification>
 	<notification name="CannotCloseFloaterBuyLand">
-		You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction.
+		必須等待 [APP_NAME] 估計此交易的價格後，你才能關閉「購買土地」視窗。
 	</notification>
 	<notification name="CannotDeedLandNothingSelected">
 		無法讓渡土地：
-無地段被選取。
+未選擇地段。
 	</notification>
 	<notification name="CannotDeedLandNoGroup">
 		無法讓渡土地：
@@ -786,7 +870,7 @@ Cannot find the region this land is in.
 	</notification>
 	<notification name="CannotDeedLandNoRegion">
 		無法讓渡土地：
-無法發現這塊土地所在的地區。
+找不到這土地所在的地區。
 	</notification>
 	<notification name="CannotDeedLandMultipleSelected">
 		無法讓渡土地：
@@ -802,7 +886,7 @@ Cannot find the region this land is in.
 	</notification>
 	<notification name="CannotDeedLandNoTransfer">
 		無法讓渡土地：
-此 [REGION] 地區並不允許土地轉移。
+「[REGION]」地區不允許土地轉移。
 	</notification>
 	<notification name="CannotReleaseLandWatingForServer">
 		無法放棄土地：
@@ -823,11 +907,11 @@ Cannot find the region this land is in.
 	</notification>
 	<notification name="CannotReleaseLandRegionNotFound">
 		無法放棄土地：
-無法發現這快土地所在的地區。
+找不到這土地所在的地區。
 	</notification>
 	<notification name="CannotReleaseLandNoTransfer">
 		無法放棄土地：
-此 [REGION] 地區並不許土地轉移。
+「[REGION]」地區不允許土地轉移。
 	</notification>
 	<notification name="CannotReleaseLandPartialSelection">
 		無法放棄土地：
@@ -845,7 +929,7 @@ Cannot find the region this land is in.
 	<notification name="CannotDivideLandNothingSelected">
 		無法分割土地：
 
-無地段被選取。
+未選擇地段。
 	</notification>
 	<notification name="CannotDivideLandPartialSelection">
 		無法分割土地：
@@ -854,22 +938,22 @@ Cannot find the region this land is in.
 請試著選取其中部分地段。
 	</notification>
 	<notification name="LandDivideWarning">
-		分割土地會將佌地段一分為二，每一個地段將都各自有其設定。 在這個操作之後，一些設定值將會回復到預設值。
+		分割土地將把地段分為兩份，每個新地段有各自的設定。 完成後，部分設定將重設為預設值。
 
 進行分割土地？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CannotDivideLandNoRegion">
 		無法分割土地：
-無法發現這塊土地所在的地區。
+找不到這土地所在的地區。
 	</notification>
 	<notification name="CannotJoinLandNoRegion">
 		無法合併土地：
-無法發現這塊土地所在的地區。
+找不到這土地所在的地區。
 	</notification>
 	<notification name="CannotJoinLandNothingSelected">
 		無法合併土地：
-無地段被選取。
+未選擇地段。
 	</notification>
 	<notification name="CannotJoinLandEntireParcelSelected">
 		無法合併土地：
@@ -891,42 +975,42 @@ Cannot find the region this land is in.
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmNotecardSave">
-		在物品能被覆製或察看前，這記事卡必須先進行儲存。儲存記事卡？
+		覆製或察看前，這記事卡必須先進行儲存。 儲存記事卡？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmItemCopy">
 		覆製這個物品到你的收納區？
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="覆製"/>
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="恚庨"/>
 	</notification>
 	<notification name="ResolutionSwitchFail">
-		Failed to switch resolution to [RESX] by [RESY]
+		無法將解析度調為 [RESX] X [RESY]
 	</notification>
 	<notification name="ErrorUndefinedGrasses">
-		Error: Undefined grasses: [SPECIES]
+		錯誤：未定義的草種：[SPECIES]
 	</notification>
 	<notification name="ErrorUndefinedTrees">
-		Error: Undefined trees: [SPECIES]
+		錯誤：未定義的樹種：[SPECIES]
 	</notification>
 	<notification name="CannotSaveWearableOutOfSpace">
-		Unable to save &apos;[NAME]&apos; to wearable file.  You will need to free up some space on your computer and save the wearable again.
+		無法將「[NAME]」儲存為可穿裝扮檔案。  你需要空出一些電腦空間，再試著儲存可穿裝扮。
 	</notification>
 	<notification name="CannotSaveToAssetStore">
-		Unable to save [NAME] to central asset store.
-This is usually a temporary failure. Please customize and save the wearable again in a few minutes.
+		無法將「[NAME]」儲存到中央資產儲庫。
+這異常狀況通常只是暫時的。 請稍待幾分鐘後，再自訂並儲存可穿裝扮。
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Darn. You have been logged out of [SECOND_LIFE]
+		糟糕！ 你已被登出 [SECOND_LIFE]
             [MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="View IM &amp; Chat"/>
+		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="察看 IM 和聊天內容"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
-		Unable to buy land for the group:
-You do not have permission to buy land for your active group.
+		無法為這群組購買土地：
+你沒有權限為你當前的群組購買土地。
 	</notification>
 	<notification label="加為朋友" name="AddFriendWithMessage">
-		Friends can give permissions to track each other on the map and receive online status updates.
+		朋友可以允許彼此在地圖上追蹤對方，並接收彼此的線上狀態更新訊息。
 
-Offer friendship to [NAME]?
+向 [NAME] 發出交友邀請？
 		<form name="form">
 			<input name="message">
 				你願意成為我的朋友嗎？
@@ -935,21 +1019,55 @@ Offer friendship to [NAME]?
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
+	<notification label="新增自動取代清單" name="AddAutoReplaceList">
+		新清單名稱：
+		<form name="form">
+			<button name="SetName" text="確定"/>
+		</form>
+	</notification>
+	<notification label="更改自動取代清單的名稱" name="RenameAutoReplaceList">
+		「[DUPNAME]」名稱已有人使用。
+    輸入另一個獨特的名稱：
+		<form name="form">
+			<button name="ReplaceList" text="取代目前的清單"/>
+			<button name="SetName" text="使用新名稱"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		關鍵字必須是一個字，取代字不得空白。
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		該取代清單無效。
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		你必須指定一個檔案、一個名稱和一種語言。
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		[DIC_NAME] 字典似乎沒有 &quot;aff&quot; 檔案，這表示該字典是「次級」字典。
+它可用做附加字典，但不得作為主要字典。
+
+參見 https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		無法複製 [FROM_NAME]
+
+    到 [TO_NAME]
+	</notification>
 	<notification label="儲存裝扮" name="SaveOutfitAs">
 		儲存我正在穿的為新裝扮：
 		<form name="form">
 			<input name="message">
-				[DESC] （新）
+				[DESC]（新）
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
-	<notification label="Save Wearable" name="SaveWearableAs">
+	<notification label="儲存可穿裝扮" name="SaveWearableAs">
 		儲存物品到我的收納區為：
 		<form name="form">
 			<input name="message">
-				[DESC] （新）
+				[DESC]（新）
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
@@ -966,7 +1084,7 @@ Offer friendship to [NAME]?
 		</form>
 	</notification>
 	<notification name="RemoveFromFriends">
-		Do you want to remove &lt;nolink&gt;[NAME]&lt;/nolink&gt; from your Friends List?
+		確定要從朋友名單中移除 &lt;nolink&gt;[NAME]&lt;/nolink&gt;？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
@@ -974,148 +1092,147 @@ Offer friendship to [NAME]?
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
-		Are you sure you want to delete all scripted objects owned by
-** [AVATAR_NAME] **
-on all others land in this sim?
+		你確定要刪除本模擬世界所有其他土地裡，** [AVATAR_NAME] ** 所擁有的全部帶腳本的物件？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllScriptedObjectsByUser">
-		Are you sure you want to DELETE ALL scripted objects owned by
-** [AVATAR_NAME] **
-on ALL LAND in this sim?
+		你確定要刪除本模擬世界所有土地裡，** [AVATAR_NAME] ** 所擁有的全部帶腳本的物件？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GodDeleteAllObjectsByUser">
-		Are you sure you want to DELETE ALL objects (scripted or not) owned by
-** [AVATAR_NAME] **
-on ALL LAND in this sim?
+		你確定要刪除本模擬世界所有土地裡，** [AVATAR_NAME] ** 所擁有的全部物件（無論是否帶腳本）？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BlankClassifiedName">
-		You must specify a name for your classified.
+		你的個人廣告必須指定一個名稱。
 	</notification>
 	<notification name="MinClassifiedPrice">
-		Price to pay for listing must be at least L$[MIN_PRICE].
+		購買此刊登物的價格必須至少為 L$[MIN_PRICE]。
 
-Please enter a higher price.
+請輸入一個較高的價格。
 	</notification>
 	<notification name="ConfirmItemDeleteHasLinks">
-		At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
+		所選項目中至少有一個帶有來自其他項目的聯結。  如果你刪除這一項目，聯結將永久失效。  我們強烈建議你先刪除聯結。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLock">
-		At least one of the items you have selected is locked.
+		你所選項目中至少有一個被鎖住。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopy">
-		At least one of the items you have selected is not copyable.
+		你所選項目中至少有一個不能複製。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoOwn">
-		You do not own least one of the items you have selected.
+		你所選項目中至少有一個不是你所擁有。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopy">
-		At least one object is locked.
-At least one object is not copyable.
+		至少有一個物件被鎖住。
+至少有一個物件不能複製。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoOwn">
-		At least one object is locked.
-You do not own least one object.
+		至少有一個物件被鎖住。
+至少有一個物件不是你所擁有。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		At least one object is not copyable.
-You do not own least one object.
+		至少有一個物件不能複製。
+至少有一個物件不是你所擁有。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		At least one object is locked.
-At least one object is not copyable.
-You do not own least one object.
+		至少有一個物件被鎖住。
+至少有一個物件不能複製。
+至少有一個物件不是你所擁有。
 
-Are you sure you want to delete these items?
+你確定你要刪除這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLock">
-		At least one object is locked.
+		至少有一個物件被鎖住。
 
-Are you sure you want to take these items?
+你確定你要拿取這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectTakeNoOwn">
-		You do not own all of the objects you are taking.
-If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
+		你要拿取的物件中，有些不是你所擁有。
+如果繼續，將套用「下一個所有人」權限，這可能會限制你修改或複製權。
 
-Are you sure you want to take these items?
+你確定你要拿取這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmObjectTakeLockNoOwn">
-		At least one object is locked.
-You do not own all of the objects you are taking.
-If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
-However, you can take the current selection.
+		至少有一個物件被鎖住。
+你要拿取的物件中，有些不是你所擁有。
+如果繼續，將套用「下一個所有人」權限，這可能會限制你修改或複製權。
+不過，你可以拿取目前所選的。
 
-Are you sure you want to take these items?
+你確定你要拿取這些物項？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CantBuyLandAcrossMultipleRegions">
-		Unable to buy land because selection spans multiple regions.
+		無法購買土地，所選部分跨越多個地區。
 
-Please select a smaller area and try again.
+請縮小選擇範圍，再試一次。
 	</notification>
 	<notification name="DeedLandToGroup">
-		By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
-The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
+		若讓渡此地段，這個群組將必須具備並保持足夠的土地使用信用額度。
+土地收購價將不會退還給所有人。 如果讓渡的地段被售出，售出價將均分給每位群組成員。
 
-Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
+是否讓渡這塊 [AREA] 平方公尺的土地給群組「[GROUP_NAME]」？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DeedLandToGroupWithContribution">
-		By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
-The deed will include a simultaneous land contribution to the group from &apos;[NAME]&apos;.
-The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
+		若讓渡此地段，這個群組將必須具備並保持足夠的土地使用信用額度。
+此一讓渡將同時包括來自 [NAME] 的，給予群組的土地捐獻。
+土地收購價將不會退還給所有人。 如果讓渡的地段被售出，售出價將均分給每位群組成員。
 
-Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
+是否讓渡這塊 [AREA] 平方公尺的土地給群組「[GROUP_NAME]」？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DisplaySetToSafe">
-		Display settings have been set to safe levels because you have specified the -safe option.
+		因為你指定了 -safe 選項，已將顯示設為安全等級。
 	</notification>
-	<notification name="DisplaySetToRecommended">
-		Display settings have been set to recommended levels based on your system configuration.
+	<notification name="DisplaySetToRecommendedGPUChange">
+		由於你的顯像卡有所變更，已將顯示狀態設為推薦採用的等級。
+原顯像卡：[LAST_GPU]
+新顯像卡：[THIS_GPU]
+	</notification>
+	<notification name="DisplaySetToRecommendedFeatureChange">
+		由於呈像子系統有所變更，已將顯示狀態設為推薦的設定。
 	</notification>
 	<notification name="ErrorMessage">
 		[ERROR_MESSAGE]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AvatarMovedDesired">
-		Your desired location is not currently available.
-You have been moved into a nearby region.
+		你所要的地點目前無法前往。
+你已被移往一個鄰近地區。
 	</notification>
 	<notification name="AvatarMovedLast">
-		Your last location is not currently available.
-You have been moved into a nearby region.
+		你所請求的地點目前無法前往。
+你已被移往一個鄰近地區。
 	</notification>
 	<notification name="AvatarMovedHome">
-		Your home location is not currently available.
-You have been moved into a nearby region.
-You may want to set a new home location.
+		你設為家的地點目前無法前往。
+你已被移往一個鄰近地區。
+建議你另選新地點設為家。
 	</notification>
 	<notification name="ClothingLoading">
 		你的服裝仍在下載中。
@@ -1127,14 +1244,13 @@ You may want to set a new home location.
 	<notification name="FirstRun">
 		[APP_NAME] 安裝完成。
 
-If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
-Return to [http://join.secondlife.com secondlife.com] to create a new account?
-		<usetemplate name="okcancelbuttons" notext="繼續" yestext="新帳戶..."/>
+如果你是第一次使用 [SECOND_LIFE]，你將需要建立新帳號才可登入。
+		<usetemplate name="okcancelbuttons" notext="繼續" yestext="建立帳號…"/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
-		We&apos;re having trouble connecting. There may be a problem with your Internet connection or the [SECOND_LIFE_GRID].
+		連線出現問題。 問題可能出在你的網路連線或 [SECOND_LIFE_GRID]。
 
-You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
+請檢查你的網路連線，幾分鐘後再試一次，或者點按幫助瀏覽 [SUPPORT_SITE]，或點按瞬間傳送試著回到你的家。
 		<url name="url">
 			http://secondlife.com/support/
 		</url>
@@ -1145,70 +1261,70 @@ You can either check your Internet connection and try again in a few minutes, cl
 		</form>
 	</notification>
 	<notification name="WelcomeChooseSex">
-		Your character will appear in a moment.
+		你的人物很快將會出現。
 
-Use arrow keys to walk.
-Press the F1 key at any time for help or to learn more about [SECOND_LIFE].
-Please choose the male or female avatar. You can change your mind later.
+用方向鍵行走。
+任何時候你都可按 F1 鍵察看幫助，進一步瞭解 [SECOND_LIFE]。
+請選擇男性或女性化身。 以後你仍可改變這個選擇。
 		<usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/>
 	</notification>
 	<notification name="CantTeleportToGrid">
-		Could not teleport to [SLURL] as it&apos;s on a different grid ([GRID]) than the current grid ([CURRENT_GRID]).  Please close your viewer and try again.
+		無法瞬間傳送到 [SLURL]，它位於不同的網格（[GRID]），目前網格是 [CURRENT_GRID]。  請關閉 Viewer 再試一次。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="GeneralCertificateError">
 		無法連接到伺服器。
 [REASON]
 
-SubjectName: [SUBJECT_NAME_STRING]
-IssuerName: [ISSUER_NAME_STRING]
-Valid From: [VALID_FROM]
-Valid To: [VALID_TO]
-MD5 Fingerprint: [SHA1_DIGEST]
-SHA1 Fingerprint: [MD5_DIGEST]
-Key Usage: [KEYUSAGE]
-Extended Key Usage: [EXTENDEDKEYUSAGE]
-Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
+SubjectName：[SUBJECT_NAME_STRING]
+IssuerName：[ISSUER_NAME_STRING]
+有效來源：[VALID_FROM]
+有效目標：[VALID_TO]
+MD5 指紋：[SHA1_DIGEST]
+SHA1 指紋：[MD5_DIGEST]
+鍵的使用：[KEYUSAGE]
+延伸鍵的使用：[EXTENDEDKEYUSAGE]
+主題鍵辨識元：[SUBJECTKEYIDENTIFIER]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="TrustCertificateError">
-		The certification authority for this server is not known.
-
-Certificate Information:
-SubjectName: [SUBJECT_NAME_STRING]
-IssuerName: [ISSUER_NAME_STRING]
-Valid From: [VALID_FROM]
-Valid To: [VALID_TO]
-MD5 Fingerprint: [SHA1_DIGEST]
-SHA1 Fingerprint: [MD5_DIGEST]
-Key Usage: [KEYUSAGE]
-Extended Key Usage: [EXTENDEDKEYUSAGE]
-Subject Key Identifier: [SUBJECTKEYIDENTIFIER]
-
-Would you like to trust this authority?
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="Trust"/>
+		不明的伺服器認證權限。
+
+認證資訊：
+SubjectName：[SUBJECT_NAME_STRING]
+IssuerName：[ISSUER_NAME_STRING]
+有效來源：[VALID_FROM]
+有效目標：[VALID_TO]
+MD5 指紋：[SHA1_DIGEST]
+SHA1 指紋：[MD5_DIGEST]
+鍵的使用：[KEYUSAGE]
+延伸鍵的使用：[EXTENDEDKEYUSAGE]
+主題鍵辨識元：[SUBJECTKEYIDENTIFIER]
+
+是否信任這個權限？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="信任"/>
 	</notification>
 	<notification name="NotEnoughCurrency">
-		[NAME] L$ [PRICE] You don&apos;t have enough L$ to do that.
+		[NAME] L$ [PRICE] 你沒有足夠 L$ 進行這動作。
 	</notification>
 	<notification name="GrantedModifyRights">
-		[NAME] has given you permission to edit their objects.
+		[NAME] 已授權你編輯他們的物件。
 	</notification>
 	<notification name="RevokedModifyRights">
-		Your privilege to modify [NAME]&apos;s objects has been revoked
+		你修改 [NAME] 的物件的權限已被撤銷。
 	</notification>
 	<notification name="FlushMapVisibilityCaches">
-		This will flush the map caches on this region.
-This is really only useful for debugging.
-(In production, wait 5 minutes, then everyone&apos;s map will update after they relog.)
+		這將清除本地區的地圖快取資料。
+這麼做只在除錯時有用。
+（實地環境中，等待 5 分鐘，每個人的地圖將在他們重新登入後更新。）
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyOneObjectOnly">
-		Unable to buy more than one object at a time.  Please select only one object and try again.
+		無法一次購買多個物件。  請只選擇一個物件，再試一次。
 	</notification>
 	<notification name="OnlyCopyContentsOfSingleItem">
-		Unable to copy the contents of more than one item at a time.
-Please select only one object and try again.
+		無法一次複製多個物項的內容。
+請只選擇一個物件，再試一次。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="KickUsersFromRegion">
@@ -1216,66 +1332,66 @@ Please select only one object and try again.
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="EstateObjectReturn">
-		Are you sure you want to return objects owned by [USER_NAME]?
+		你確定要送返 [USER_NAME] 所擁有的物件？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="InvalidTerrainBitDepth">
-		Couldn&apos;t set region textures:
-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
+		無法設定地區材質：
+地形材質 [TEXTURE_NUM] 的位元深度 [TEXTURE_BIT_DEPTH] 無效。
 
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+請將材質 [TEXTURE_NUM] 替換成 24 位元 512x512 或更小圖像，然後點按「套用」。
 	</notification>
 	<notification name="InvalidTerrainSize">
-		Couldn&apos;t set region textures:
-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
+		無法設定地區材質：
+地形材質 [TEXTURE_NUM] 的尺寸 [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] 太大。
 
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+請將材質 [TEXTURE_NUM] 替換成 24 位元 512x512 或更小圖像，然後點按「套用」。
 	</notification>
 	<notification name="RawUploadStarted">
-		上傳開始。將會花費約兩分鐘，這取決於你的連線速度。
+		上傳開始。 視你的連線速度而定，這最多需時兩分鐘。
 	</notification>
 	<notification name="ConfirmBakeTerrain">
-		Do you really want to bake the current terrain, make it the center for terrain raise/lower limits and the default for the &apos;Revert&apos; tool?
+		你真的要確定產出目前地形，使其成為地形升/降極限的中間值，並設為「復原」工具的預設值？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="MaxAllowedAgentOnRegion">
-		You can only have [MAX_AGENTS] Allowed Residents.
+		你最多只能有 [MAX_AGENTS] 位允許居民。
 	</notification>
 	<notification name="MaxBannedAgentsOnRegion">
 		你只可以有最多 [MAX_BANNED] 位被封鎖的居民。
 	</notification>
 	<notification name="MaxAgentOnRegionBatch">
-		Failure while attempting to add [NUM_ADDED] agents:
-Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
+		試圖增加 [NUM_ADDED] 人時失敗：
+超過人數上限 [MAX_AGENTS] [LIST_TYPE]（超過 [NUM_EXCESS] 人）。
 	</notification>
 	<notification name="MaxAllowedGroupsOnRegion">
-		You can only have [MAX_GROUPS] Allowed Groups.
-		<usetemplate name="okcancelbuttons" notext="取消" yestext="Bake"/>
+		你只能有 [MAX_GROUPS] 個允許的群組。
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定產出"/>
 	</notification>
 	<notification name="MaxManagersOnRegion">
 		你只可以有最多 [MAX_MANAGER] 位領地經理。
 	</notification>
 	<notification name="OwnerCanNotBeDenied">
-		無法添加領地擁有者到領地的 &apos;被封鎖的居民&apos; 名單中。
+		無法添加領地所有人到領地的 &apos;被封鎖的居民&apos; 名單中。
 	</notification>
 	<notification name="CanNotChangeAppearanceUntilLoaded">
 		無法變更外觀，直到服裝與體形下載完畢。
 	</notification>
 	<notification name="ClassifiedMustBeAlphanumeric">
-		The name of your classified must start with a letter from A to Z or a number.  No punctuation is allowed.
+		你的個人廣告名稱必須以 A-Z 字母或數字開頭。  不允許標點符號。
 	</notification>
 	<notification name="CantSetBuyObject">
-		Can&apos;t set Buy Object, because the object is not for sale.
-Please set the object for sale and try again.
+		無法設定購買物件，該物件無法出售。
+請選定出售物件，再試一次。
 	</notification>
 	<notification name="FinishedRawDownload">
-		Finished download of raw terrain file to:
-[DOWNLOAD_PATH].
+		原始地形檔案下載完成：
+[DOWNLOAD_PATH]。
 	</notification>
 	<notification name="DownloadWindowsMandatory">
-		一個新版本的 [APP_NAME] 已經可用。
+		有個新版本的 [APP_NAME] 可供使用。
 [MESSAGE]
-你必須下載這個更新以使用 [APP_NAME]。
+你必須下載這個更新才可使用 [APP_NAME]。
 		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadWindows">
@@ -1285,98 +1401,125 @@ Please set the object for sale and try again.
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="DownloadWindowsReleaseForDownload">
-		An updated version of [APP_NAME] is available.
+		一個 [APP_NAME] 更新過的版本已經可用。
 [MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
+這個更新並非強制更新，但我們建議你安裝以增強效能及穩定性。
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="DownloadLinuxMandatory">
-		A new version of [APP_NAME] is available.
+		有個新版本的 [APP_NAME] 可供使用。
 [MESSAGE]
-You must download this update to use [APP_NAME].
+你必須下載這個更新才可使用 [APP_NAME]。
 		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadLinux">
-		An updated version of [APP_NAME] is available.
+		一個 [APP_NAME] 更新過的版本已經可用。
 [MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
+這個更新並非強制更新，但我們建議你安裝以增強效能及穩定性。
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="DownloadLinuxReleaseForDownload">
-		An updated version of [APP_NAME] is available.
+		一個 [APP_NAME] 更新過的版本已經可用。
 [MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
+這個更新並非強制更新，但我們建議你安裝以增強效能及穩定性。
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="DownloadMacMandatory">
-		A new version of [APP_NAME] is available.
+		有個新版本的 [APP_NAME] 可供使用。
 [MESSAGE]
-You must download this update to use [APP_NAME].
+你必須下載這個更新才可使用 [APP_NAME]。
 
-Download to your Applications folder?
+下載到 Applications 資料夾？
 		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="下載"/>
 	</notification>
 	<notification name="DownloadMac">
-		An updated version of [APP_NAME] is available.
+		一個 [APP_NAME] 更新過的版本已經可用。
 [MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
+這個更新並非強制更新，但我們建議你安裝以增強效能及穩定性。
 
-Download to your Applications folder?
+下載到 Applications 資料夾？
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="DownloadMacReleaseForDownload">
-		An updated version of [APP_NAME] is available.
+		一個 [APP_NAME] 更新過的版本已經可用。
 [MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
+這個更新並非強制更新，但我們建議你安裝以增強效能及穩定性。
 
-Download to your Applications folder?
+下載到 Applications 資料夾？
 		<usetemplate name="okcancelbuttons" notext="繼續" yestext="下載"/>
 	</notification>
 	<notification name="FailedUpdateInstall">
-		An error occurred installing the viewer update.
-Please download and install the latest viewer from
-http://secondlife.com/download.
+		安裝更新版 Viewer 時出錯。
+請到 http://secondlife.com/download 下載並安裝最新版 Viewer。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="FailedRequiredUpdateInstall">
-		We were unable to install a required update. 
-You will be unable to log in until [APP_NAME] has been updated.
+		無法安裝必要的更新。 
+除非 [APP_NAME] 更新，你將無法登入。
 
-Please download and install the latest viewer from
-http://secondlife.com/download.
+請到 http://secondlife.com/download 下載並安裝最新版 Viewer。
 		<usetemplate name="okbutton" yestext="結束退出"/>
 	</notification>
 	<notification name="UpdaterServiceNotRunning">
-		There is a required update for your Second Life Installation.
+		你已安裝的第二人生軟體現有一個必要的更新。
 
-You may download this update from http://www.secondlife.com/downloads
-or you can install it now.
+你可以到 http://www.secondlife.com/downloads 下載此更新，或者現在立即安裝。
 		<usetemplate name="okcancelbuttons" notext="結束退出第二人生" yestext="立即下載及安裝"/>
 	</notification>
 	<notification name="DownloadBackgroundTip">
-		We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
+		我們已為你的 [APP_NAME] 軟體下載了更新。
+[VERSION] 版本 [[RELEASE_NOTES_FULL_URL] 關於此更新的資訊]
 		<usetemplate name="okcancelbuttons" notext="稍候..." yestext="立即安裝及重新啟動 [APP_NAME]"/>
 	</notification>
 	<notification name="DownloadBackgroundDialog">
-		We have downloaded an update to your [APP_NAME] installation.
-Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
-		<usetemplate name="okcancelbuttons" notext="梢候..." yestext="立即安裝及重新啟動 [APP_NAME]"/>
+		我們已為你的 [APP_NAME] 軟體下載了更新。
+[VERSION] 版本 [[RELEASE_NOTES_FULL_URL] 關於此更新的資訊]
+		<usetemplate name="okcancelbuttons" notext="稍候..." yestext="立即安裝及重新啟動 [APP_NAME]"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedVerboseDialog">
-		We have downloaded a required software update.
-Version [VERSION]
+		我們已下載了一個必要的軟體更新。
+[VERSION] 版本 [[INFO_URL] 關於此更新的資訊]
 
-We must restart [APP_NAME] to install the update.
+我門必須重新啟動 [APP_NAME] 以安裝更新。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="RequiredUpdateDownloadedDialog">
 		我門必須重新啟動 [APP_NAME] 以安裝更新。
+[[INFO_URL] 關於此更新的資訊]
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundTip">
+		我們已為你的 [APP_NAME] 軟體下載了更新。
+版本：[VERSION] 
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 此更新版的詳情]
+		<usetemplate name="okcancelbuttons" notext="稍候..." yestext="立即安裝並重新啟動 [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelDownloadBackgroundDialog">
+		我們已為你的 [APP_NAME] 軟體下載了更新。
+版本：[VERSION]
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 介紹此更新版的資訊]
+		<usetemplate name="okcancelbuttons" notext="稍候…" yestext="立即安裝並重新啟動 [APP_NAME]"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedVerboseDialog">
+		我們已下載了一個必要的軟體更新。
+版本：[VERSION]
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 介紹此更新版的資訊]
+
+我們必須重新啟動 [APP_NAME] 以便安裝更新。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="OtherChannelRequiredUpdateDownloadedDialog">
+		我們必須重新啟動 [APP_NAME] 以便安裝更新。
+原本試驗性質的瀏覽器已被 [NEW_CHANNEL] 瀏覽器取代，
+參見[[INFO_URL] 介紹此更新版的資訊]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="DeedObjectToGroup">
-		Deeding this object will cause the group to:
-* Receive L$ paid into the object
+		讓渡此物件將可讓這個群組：
+* 收取付給此物件的 L$
 		<usetemplate ignoretext="在我讓渡一個物件給群組前確認" name="okcancelignore" notext="取消" yestext="讓渡"/>
 	</notification>
 	<notification name="WebLaunchExternalTarget">
@@ -1388,7 +1531,7 @@ We must restart [APP_NAME] to install the update.
 		<usetemplate ignoretext="啟動我的瀏覽器以管理我的帳戶" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchSecurityIssues">
-		Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
+		造訪 [SECOND_LIFE] 維基察看如何提報安全問題。
 		<usetemplate ignoretext="開啟我的網頁瀏覽器以學習如何回報一個安全性的議題" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="WebLaunchQAWiki">
@@ -1412,72 +1555,79 @@ We must restart [APP_NAME] to install the update.
 		<usetemplate ignoretext="開啟我的網頁瀏覽器以察看 LSL 入口" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
 	<notification name="ReturnToOwner">
-		你確定要退回所選擇的物件給它們的擁有者嗎？ 可轉移並讓渡的物件將會退回給它們的前一位擁有者。
+		你確定要送返所選物件給物主？ 可轉讓的已讓渡物件將送返原物主。
 
 *警告* 非可轉移並讓渡的物件將會被刪除!
-		<usetemplate ignoretext="在我退回物件給它們的擁有者前確認" name="okcancelignore" notext="取消" yestext="確定"/>
+		<usetemplate ignoretext="在我退回物件給它們的所有人前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="GroupLeaveConfirmMember">
 		你目前是 &lt;nolink&gt;[GROUP]&lt;/nolink&gt; 群組的成員。
 是否要離開群組？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
+	<notification name="OwnerCannotLeaveGroup">
+		無法離開群組。 你是此群組僅存的所有人，不得離開群組。 請先把所有人職銜指派給另一人。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmKick">
 		你確定要踢出這網格內的全部居民？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="踢出全部居民"/>
 	</notification>
 	<notification name="MuteLinden">
-		Sorry, you cannot block a Linden.
+		抱歉，你無法封鎖任何一位 Linden。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="CannotStartAuctionAlreadyForSale">
-		You cannot start an auction on a parcel which is already set for sale.  Disable the land sale if you are sure you want to start an auction.
+		你無法在已在出售中的地段裡進行拍賣。  你如果確定要拍賣，請先停止土地出售。
 	</notification>
-	<notification label="Block object by name failed" name="MuteByNameFailed">
-		You already have blocked this name.
+	<notification label="依名稱封鎖物件失敗" name="MuteByNameFailed">
+		你已經封鎖了這個名稱。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="RemoveItemWarn">
-		Though permitted, deleting contents may damage the object. Do you want to delete that item?
+		雖然允許這麼做，刪除內容可能會破壞物件。 你要刪除該物項嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="CantOfferCallingCard">
-		Cannot offer a calling card at this time. Please try again in a moment.
+		此時無法提供名片。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="CantOfferFriendship">
-		Cannot offer friendship at this time. Please try again in a moment.
+		此時無法發出交友邀請。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="BusyModeSet">
-		Busy mode is set.
-Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
-		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
+	<notification name="DoNotDisturbModeSet">
+		「請勿打擾」模式目前是開啟狀態。  你將不會收到任何發給你的訊息通知。
+
+- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 &gt; 一般設定」）。
+- 所有瞬間傳送的邀請都將被婉拒。
+- 所有語音來電都將拒絕接聽。
+		<usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
-		You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer.
-[NAME] has invited you to join a group as a member.
+		你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。
+[NAME] 已邀請你加入一個群組成為一員。
 		<usetemplate name="okcancelbuttons" notext="謝絕" yestext="加入"/>
 	</notification>
 	<notification name="JoinedTooManyGroups">
-		You have reached your maximum number of groups. Please leave some group before joining or creating a new one.
+		你已達可同時加入的群組數上限。 請先離開某些群組再加入或新建新群組。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="KickUser">
 		踢出這個居民並留給他什麼訊息？
 		<form name="form">
 			<input name="message">
-				An administrator has logged you off.
+				一位管理員已迫使你登出。
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="KickAllUsers">
-		Kick everyone currently on the grid with what message?
+		踢出網格上的每個人，留給他們什麼訊息？
 		<form name="form">
 			<input name="message">
-				An administrator has logged you off.
+				一位管理員已迫使你登出。
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
@@ -1487,7 +1637,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 		凍結這位居民時同時留下什麼訊息？
 		<form name="form">
 			<input name="message">
-				你已經被凍結了。你將不能移動或聊天。管理員將會以即時訊息聯繫你（IM）。
+				你已被凍結。 你無法移動或聊天。 會有管理員透過即時訊息 IM 和你聯絡。
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
@@ -1497,75 +1647,80 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo
 		將這位居民解凍並同時留下什麼訊息？
 		<form name="form">
 			<input name="message">
-				You are no longer frozen.
+				你已被解除凍結。
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="SetDisplayNameSuccess">
-		Hi [DISPLAY_NAME]!
+		[DISPLAY_NAME]，你好！
 
-Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
+瞭解適應一個新名字是需要時間的，正如現實生活那樣。  請給我們幾天時間針對所有物件、腳本、搜尋等方面 [http://wiki.secondlife.com/wiki/Setting_your_display_name 更新你的名字]。
 	</notification>
 	<notification name="SetDisplayNameBlocked">
-		抱歉，你不可以變更你的顯示名稱。如果你覺得這是錯誤，請連繫支援廠商。
+		抱歉，你無法更改你的顯示名。 如你認為有出錯，請聯絡支援人員。
 	</notification>
 	<notification name="SetDisplayNameFailedLength">
-		抱歉，這名稱太長。顯示名稱最大長度為 [LENGTH] 字元。
+		抱歉，該名稱太長。  顯示名稱最大長度為 [LENGTH] 字元。
 
 請嘗試短一些的名稱。
 	</notification>
 	<notification name="SetDisplayNameFailedGeneric">
-		Sorry, we could not set your display name.  Please try again later.
+		抱歉，我們無法設定你的顯示名。  請稍候再試一次。
 	</notification>
 	<notification name="SetDisplayNameMismatch">
-		The display names you entered do not match. Please re-enter.
+		你所輸入的顯示名不相符。 請再輸入一次。
 	</notification>
 	<notification name="AgentDisplayNameUpdateThresholdExceeded">
-		Sorry, you have to wait longer before you can change your display name.
+		抱歉，你必須再等一段時間才能更改你的顯示名。
 
-See http://wiki.secondlife.com/wiki/Setting_your_display_name
+參見 http://wiki.secondlife.com/wiki/Setting_your_display_name
 
-Please try again later.
+請稍候再試一次。
 	</notification>
 	<notification name="AgentDisplayNameSetBlocked">
-		Sorry, we could not set your requested name because it contains a banned word.
+		抱歉，我們無法設定你想要的名稱，它含有禁用字眼。
  
- Please try a different name.
+ 請用不同的名稱試試。
 	</notification>
 	<notification name="AgentDisplayNameSetInvalidUnicode">
-		The display name you wish to set contains invalid characters.
+		你希望設定的顯示名含有無效字元。
 	</notification>
 	<notification name="AgentDisplayNameSetOnlyPunctuation">
-		Your display name must contain letters other than punctuation.
+		你的顯示名必須包含非標點符號的字元。
 	</notification>
 	<notification name="DisplayNameUpdate">
-		[OLD_NAME] ([SLID]) is now known as [NEW_NAME].
+		[OLD_NAME] ([SLID]) 現在有了新名字 [NEW_NAME]。
 	</notification>
 	<notification name="OfferTeleport">
-		Offer a teleport to your location with the following message?
+		用下列訊息發出瞬間傳送邀請來到你的位置？
 		<form name="form">
 			<input name="message">
-				加入我到 [REGION]
+				在 [REGION] 和我會面
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
+	<notification name="TooManyTeleportOffers">
+		你試圖送出 [OFFERS] 個瞬間傳送邀請。
+超過了 [LIMIT] 個的上限。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="OfferTeleportFromGod">
-		God summon Resident to your location?
+		用神的權力把居民召到你的位置？
 		<form name="form">
 			<input name="message">
-				Join me in [REGION]
+				在 [REGION] 和我會面
 			</input>
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="TeleportFromLandmark">
-		Are you sure you want to teleport to &lt;nolink&gt;[LOCATION]&lt;/nolink&gt;?
-		<usetemplate ignoretext="Confirm that I want to teleport to a landmark" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
+		你確定要瞬間傳送到&lt;nolink&gt;[LOCATION]&lt;/nolink&gt;？
+		<usetemplate ignoretext="確認我要瞬間傳送到某個地標" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
 	<notification name="TeleportToPick">
 		瞬間傳送到 [PICK]?
@@ -1580,57 +1735,57 @@ Please try again later.
 		<usetemplate ignoretext="確認我要瞬間傳送到歷史紀錄中的位置" name="okcancelignore" notext="取消" yestext="瞬間傳送"/>
 	</notification>
 	<notification label="送出訊息給你領地內的每一個人" name="MessageEstate">
-		Type a short announcement which will be sent to everyone currently in your estate.
+		輸入簡短公告，公告將發送給領地裡所有人。
 		<form name="form">
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
-	<notification label="Change Linden Estate" name="ChangeLindenEstate">
-		You are about to change a Linden owned estate (mainland, teen grid, orientation, etc.).
+	<notification label="更改 Linden 領地" name="ChangeLindenEstate">
+		你即將更改一個 Linden 所擁有的領地（大陸、青少年網格、導引區等）。
 
-This is EXTREMELY DANGEROUS because it can fundamentally affect the Resident experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
+這動作非常危險，它會根本影響所有居民的體驗。  在大陸上，它將更動數千個地區，導致空間伺服器發生不順。
 
-Proceed?
+繼續？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
-	<notification label="Change Linden Estate Access" name="ChangeLindenAccess">
-		You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.).
+	<notification label="更改 Linden 領地出入權" name="ChangeLindenAccess">
+		你即將更改一個 Linden 所擁有領地（大陸、青少年網格、導引區等）的出入權。
 
-This is DANGEROUS and should only be done to invoke the hack allowing objects/L$ to be transfered in/out of a grid.
-It will change thousands of regions and make the spaceserver hiccup.
+這動作很危險，只在需要把物件或 L$ 送出或送入網格，又無更好方法時不得已使用。
+它將更動數千個地區，導致空間伺服器發生不順。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedAgentAdd">
-		Add to allowed list for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 將它新增到允許清單？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedAgentRemove">
-		Remove from allowed list for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 將它從允許清單中移除？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedGroupAdd">
-		Add to group allowed list for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 將它新增到群組允許清單？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateAllowedGroupRemove">
-		Remove from group allowed list for this estate only or [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 將它從群組允許清單中移除？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateBannedAgentAdd">
-		Deny access for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 禁止出入？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateBannedAgentRemove">
-		Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 將這個居民從禁止出入清單中除名？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateManagerAdd">
-		Add estate manager for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 新增領地管理人？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateManagerRemove">
-		Remove estate manager for this estate only or for [ALL_ESTATES]?
+		僅針對這個領地或針對 [ALL_ESTATES] 移除領地管理人？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="確認踢出" name="EstateKickUser">
@@ -1638,330 +1793,390 @@ It will change thousands of regions and make the spaceserver hiccup.
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="EstateChangeCovenant">
-		Are you sure you want to change the Estate Covenant?
+		你確定要更改領地契約？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		You are not allowed in that Region due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+		你所欲前往的地區含有超過你目前偏好的分級的內容。  你可以到「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的偏好設定。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		You are not allowed in that region due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		你所欲前往的地區含有 [REGIONMATURITY] 的分級內容，僅限成人。
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="I can&apos;t enter this Region, due to restrictions of the maturity Rating" name="okcancelignore" notext="關閉" yestext="Go to Knowledge Base"/>
+		<usetemplate ignoretext="跨越地區：你所欲前往的地區含有限制給成人的內容。" name="okcancelignore" notext="關閉" yestext="前往知識庫"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		You are not allowed in that region due to your maturity Rating.
+		你所欲前往的地區包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		你所欲前往的地區含有 [REGIONMATURITY] 的分級內容，僅限成人。
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		You are not allowed in that Region due to your maturity Rating preference.
-
-To enter the desired region, please change your maturity Rating preference. This will allow you to search for and access [REGIONMATURITY] content. To undo any changes, go to Me &gt; Preferences &gt; General.
+		你所欲前往的地區包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。 你可以變更你的偏好設定，或取消前往。 你的偏好設定變更後，你可以試圖再進入該地區。
 		<form name="form">
-			<button name="OK" text="Change Preference"/>
-			<button name="Cancel" text="Close"/>
-			<ignore name="ignore" text="My chosen Rating preference prevents me from entering a Region"/>
+			<button name="OK" text="變更偏好設定"/>
+			<button name="Cancel" text="取消"/>
+			<ignore name="ignore" text="跨越地區：你所欲前往的地區含有被你目前的偏好設定排除的分級內容。"/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		發生技術問題，你的偏好設定和伺服器上的不一致。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		你所欲前往的地區含有超過你目前偏好的分級的內容。  你可以到「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的偏好設定。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		你所欲前往的地區含有 [REGIONMATURITY] 的分級內容，僅限成人。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="瞬間傳送：你所欲前往的地區含有限制給成人的內容。" name="okcancelignore" notext="關閉" yestext="前往知識庫"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		你所欲前往的地區包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		你所欲前往的地區含有 [REGIONMATURITY] 的分級內容，僅限成人。
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		你所欲前往的地區包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。 我們可以變更你的偏好設定好讓你繼續瞬間傳送，你也可取消這動作。
+		<form name="form">
+			<button name="OK" text="變更後繼續"/>
+			<button name="Cancel" text="取消"/>
+			<ignore name="ignore" text="瞬間傳送（可重啟）：你所欲前往的地區含有被你目前的偏好設定排除的分級內容。"/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		你所欲前往的地區包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。 我們可以變更你的偏好設定，你也可取消瞬間傳送。 你的偏好設定變更後，你可以再嘗試瞬間傳送。
+		<form name="form">
+			<button name="OK" text="變更偏好設定"/>
+			<button name="Cancel" text="取消"/>
+			<ignore name="ignore" text="瞬間傳送（不可重啟）：你所欲前往的地區含有被你目前的偏好設定排除的分級內容。"/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		發生技術問題，你的偏好設定和伺服器上的不一致。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Your maturity Rating preference is now [RATING].
+		你將不再收到通知，告知你即將進入一個 [RATING] 內容分級的地區。  你可以到選單列底下的「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的內容偏好。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		我們此時無法變更你的偏好設定，讓你觀看 [PREFERRED_MATURITY] 分級的內容。  你的偏好設定已經重設，可觀看 [ACTUAL_MATURITY] 的分級內容。  你可以到選單列的「我自己 &gt; 偏好設定 &gt; 一般設定」再次變更你的偏好。
+		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		You cannot claim this land due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+		你所欲收取的土地含有超過你目前偏好的分級內容。  你可以到「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的偏好設定。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		You cannot claim this land due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		只有成人才能收取這土地。
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="I can&apos;t claim this Land, due to restrictions of the maturity Rating" name="okcancelignore" notext="關閉" yestext="Go to Knowledge Base"/>
+		<usetemplate ignoretext="只有成人才能收取這土地。" name="okcancelignore" notext="關閉" yestext="前往知識庫"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		You cannot claim this land due to your maturity Rating.
+		你所欲收取的土地包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		你所欲收取的土地包含 [REGIONMATURITY] 的分級內容，僅限成人。
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		You cannot claim this land due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me &gt; Preferences &gt; General.
-		<usetemplate ignoretext="My chosen Rating preference prevents me from claiming Land" name="okcancelignore" notext="關閉" yestext="Change Preference"/>
+		你所欲收取的土地包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。 我們可以變更你的偏好，讓你再試圖收取土地。
+		<form name="form">
+			<button name="OK" text="變更偏好設定"/>
+			<button name="Cancel" text="取消"/>
+			<ignore name="ignore" text="你所欲收取的土地含有被你目前的偏好所排除的分級內容。"/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		You cannot buy this land due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+		你所欲購買的土地的內容分級超過你目前所設偏好。  你可以到「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的偏好設定。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		You cannot buy this land due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		只有成人才能購買這土地。
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="I can&apos;t buy this Land, due to restrictions of the maturity Rating" name="okcancelignore" notext="關閉" yestext="Go to Knowledge Base"/>
+		<usetemplate ignoretext="只有成人才能購買這土地。" name="okcancelignore" notext="關閉" yestext="前往知識庫"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		You cannot buy this land due to your maturity Rating.
+		你所欲購買的土地包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		你所欲購買的土地含有 [REGIONMATURITY] 分級的內容，僅限成人。
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		You cannot buy this land due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me &gt; Preferences &gt; General.
-		<usetemplate ignoretext="My chosen Rating preference prevents me from buying Land" name="okcancelignore" notext="關閉" yestext="變更偏好設定"/>
+		你所欲購買的土地包含 [REGIONMATURITY] 分級的內容，可是你目前的偏好設定排除了 [REGIONMATURITY] 分級的內容。 我們可以變更你的偏好，讓你再試圖購買土地。
+		<form name="form">
+			<button name="OK" text="變更偏好設定"/>
+			<button name="Cancel" text="取消"/>
+			<ignore name="ignore" text="你所欲購買的土地含有被你目前的偏好所排除的分級內容。"/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
-		There are too many prims selected.  Please select [MAX_PRIM_COUNT] or fewer prims and try again
+		選擇了太多項的幾何元件。  請至多選擇 [MAX_PRIM_COUNT] 項幾何元件，再試一次。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="ProblemImportingEstateCovenant">
-		Problem importing estate covenant.
+		匯入領地契約時出問題。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="ProblemAddingEstateManager">
-		Problems adding a new estate manager.  One or more estates may have a full manager list.
+		新增領地管理人時出問題。  其中一個領地的管理人清單可能已經額滿。
 	</notification>
 	<notification name="ProblemAddingEstateGeneric">
-		Problems adding to this estate list.  One or more estates may have a full list.
+		新增到這個領地清單時出問題。  其中一個領地的清單可能已滿。
 	</notification>
 	<notification name="UnableToLoadNotecardAsset">
-		Unable to load notecard&apos;s asset at this time.
+		此刻無法載入記事卡資產。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="NotAllowedToViewNotecard">
-		Insufficient permissions to view notecard associated with asset ID requested.
+		權限不足無法察看此資產編號的記事卡。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="MissingNotecardAssetID">
-		Asset ID for notecard is missing from database.
+		記事卡的資產編號在資料庫中找不到。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="PublishClassified">
-		Remember: Classified ad fees are non-refundable.
+		請注意：個人廣告刊登費恕不退還。
 
-Publish this classified now for L$[AMOUNT]?
+支付 L$ [AMOUNT] 刊載這則個人廣告？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="SetClassifiedMature">
-		Does this classified contain Moderate content?
+		這則個人廣告是否含適度成人分級的內容？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="SetGroupMature">
 		這個群組將包含適度成人內容？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="否" yestext="是"/>
 	</notification>
-	<notification label="Confirm restart" name="ConfirmRestart">
-		Do you really want to restart this region in 2 minutes?
+	<notification label="確定重新啟動" name="ConfirmRestart">
+		你確定要在 2 分鐘後重新啟動這個地區？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
-	<notification label="Message everyone in this region" name="MessageRegion">
-		Type a short announcement which will be sent to everyone in this region.
+	<notification label="對地區裡每個人發出訊息" name="MessageRegion">
+		輸入簡短公告，公告將發送給地區裡所有人。
 		<form name="form">
 			<button name="OK" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
-	<notification label="Changed Region Maturity" name="RegionMaturityChange">
-		The maturity rating for this region has been updated.
-It may take some time for the change to be reflected on the map.
-
-To enter Adult regions, Residents must be Account Verified, either by age-verification or payment-verification.
+	<notification label="已變更地區的內容分級" name="RegionMaturityChange">
+		此地區的內容分級已經變更。
+可能需要稍候一段時間，地圖才會反映這個變更。
+		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification label="Voice Version Mismatch" name="VoiceVersionMismatch">
-		This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
+	<notification label="聲音版本不相符" name="VoiceVersionMismatch">
+		這版本的 [APP_NAME] 和本地區的語音聊天功能不相容。 想要語音聊天正常運作，你必須更新 [APP_NAME]。
 	</notification>
 	<notification label="無法購買物件" name="BuyObjectOneOwner">
-		Cannot buy objects from different owners at the same time.
-Please select only one object and try again.
+		無法同時向不同物主購買物件。
+請只選擇一個物件，再試一次。
 	</notification>
 	<notification label="無法購買內容物" name="BuyContentsOneOnly">
-		Unable to buy the contents of more than one object at a time.
-Please select only one object and try again.
+		無法一次購買多個物件的內容。
+請只選擇一個物件，再試一次。
 	</notification>
 	<notification label="無法購買內容物" name="BuyContentsOneOwner">
-		Cannot buy objects from different owners at the same time.
-Please select only one object and try again.
+		無法同時向不同物主購買物件。
+請只選擇一個物件，再試一次。
 	</notification>
 	<notification name="BuyOriginal">
-		Buy original object from [OWNER] for L$[PRICE]?
-You will become the owner of this object.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
+		向 [OWNER] 支付 L$[PRICE]，購買原版物件？
+你將成為這物件的所有人。
+你將可以：
+ 修改：[MODIFYPERM]
+ 複製：[COPYPERM]
+ 轉售或送人：[RESELLPERM]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyOriginalNoOwner">
-		Buy original object for L$[PRICE]?
-You will become the owner of this object.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
+		支付 L$[PRICE] 購買原版物件？
+你將成為這物件的所有人。
+你將可以：
+ 修改：[MODIFYPERM]
+ 複製：[COPYPERM]
+ 轉售或送人：[RESELLPERM]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyCopy">
-		Buy a copy from [OWNER] for L$[PRICE]?
-The object will be copied to your inventory.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
+		向 [OWNER] 支付 L$[PRICE]，購買複製物件？
+這物件將複製到你的收納區。
+你將可以：
+ 修改：[MODIFYPERM]
+ 複製：[COPYPERM]
+ 轉售或送人：[RESELLPERM]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyCopyNoOwner">
-		Buy a copy for L$[PRICE]?
-The object will be copied to your inventory.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
+		支付 L$[PRICE] 購買複製物件？
+這物件將複製到你的收納區。
+你將可以：
+ 修改：[MODIFYPERM]
+ 複製：[COPYPERM]
+ 轉售或送人：[RESELLPERM]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyContents">
-		Buy contents from [OWNER] for L$[PRICE]?
-They will be copied to your inventory.
+		向 [OWNER] 支付 L$[PRICE] 購買內容？
+內容將複製到你的收納區。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BuyContentsNoOwner">
-		Buy contents for L$[PRICE]?
-They will be copied to your inventory.
+		支付 L$[PRICE] 購買內容？
+內容將複製到你的收納區。
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmPurchase">
-		This transaction will:
+		這項交易將會：
 [ACTION]
 
-Are you sure you want to proceed with this purchase?
+你確定要購買？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmPurchasePassword">
-		This transaction will:
+		這項交易將會：
 [ACTION]
 
-Are you sure you want to proceed with this purchase?
-Please re-enter your password and click OK.
+你確定要購買？
+請重新輸入密碼再點按確定。
 		<form name="form">
 			<button name="ConfirmPurchase" text="確定"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="SetPickLocation">
-		Note:
-You have updated the location of this pick but the other details will retain their original values.
+		附註：
+你已經更新這個精選地點的地點細節，其他細節將保留原內容。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="MoveInventoryFromObject">
-		You have selected &apos;no copy&apos; inventory items.
-These items will be moved to your inventory, not copied.
+		你選擇了「禁止複製」的收納區物項。
+這些物項將被移到你的收納區，不會被複製。
 
-Move the inventory item(s)?
-		<usetemplate ignoretext="Warn me before I move &apos;no-copy&apos; items from an object" name="okcancelignore" notext="取消" yestext="確定"/>
+要移動收納區物項嗎？
+		<usetemplate ignoretext="在我從物件中移動「禁止複製」物項之前警告我" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="MoveInventoryFromScriptedObject">
-		You have selected &apos;no copy&apos; inventory items.  These items will be moved to your inventory, not copied.
-Because this object is scripted, moving these items to your inventory may cause the script to malfunction.
+		你選擇了「禁止複製」的收納區物項。  這些物項將被移到你的收納區，不會被複製。
+由於這物件帶有腳本，移動這些物項到收納區可能會導致腳本運作不正常。
 
-Move the inventory item(s)?
-		<usetemplate ignoretext="Warn me before I move &apos;no-copy&apos; items which might break a scripted object" name="okcancelignore" notext="取消" yestext="確定"/>
+要移動收納區物項嗎？
+		<usetemplate ignoretext="在我移動可能破壞帶腳本物件的「禁止複製」物項之前警告我" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ClickActionNotPayable">
-		Warning: The &apos;Pay object&apos; click action has been set, but it will only work if a script is added with a money() event.
+		警告：「支付物件」點按動作已設定，但新增的腳本必須含有 money() 事件，該動作才有作用。
 		<form name="form">
-			<ignore name="ignore" text="I set the action &apos;Pay object&apos; when building an object without a money() script"/>
+			<ignore name="ignore" text="我在創建不含 money() 腳本的物件時設定了「支付物件」動作"/>
 		</form>
 	</notification>
 	<notification name="OpenObjectCannotCopy">
-		There are no items in this object that you are allowed to copy.
+		這物件中沒有任何准許你複製的物項。
 	</notification>
 	<notification name="WebLaunchAccountHistory">
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
 		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
+	<notification name="ConfirmAddingChatParticipants">
+		新增一個人到現有的交談，等於建立新的交談。  所有交談者將會收到新交談通知。
+		<usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
 		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
+	<notification name="ConfirmRestoreToybox">
+		這動作將會恢復你預設的按鈕和工具列。
+
+你不能取消這動作。
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="ConfirmClearAllToybox">
+		這動作將把所有按鈕收入工具箱，你的工具列將會清空。
+    
+你不能取消這動作。
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="DeleteItems">
 		[QUESTION]
 		<usetemplate ignoretext="刪除物品前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="HelpReportAbuseEmailLL">
-		Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
+		使用這個工具舉報任何違反[http://secondlife.com/corporate/tos.php 服務條款]和[http://secondlife.com/corporate/cs.php 社群準則]的情事。
 
-All reported abuses are investigated and resolved.
+所有舉報的違規事件都有人調查，加以解決。
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
-		Please select a category for this abuse report.
-Selecting a category helps us file and process abuse reports.
+		請選擇適合這次違規舉報的類別。
+選對類別可以幫助我們歸類並處理違規舉報。
 	</notification>
 	<notification name="HelpReportAbuseAbuserNameEmpty">
-		Please enter the name of the abuser.
-Entering an accurate value helps us file and process abuse reports.
+		請輸入違規人的名字。
+輸入準確的內容可以幫助我們歸類並處理違規舉報。
 	</notification>
 	<notification name="HelpReportAbuseAbuserLocationEmpty">
-		Please enter the location where the abuse took place.
-Entering an accurate value helps us file and process abuse reports.
+		請輸入違規情事發生地點。
+輸入準確的內容可以幫助我們歸類並處理違規舉報。
 	</notification>
 	<notification name="HelpReportAbuseSummaryEmpty">
-		Please enter a summary of the abuse that took place.
-Entering an accurate summary helps us file and process abuse reports.
+		請概述違規情事。
+準確的概述可以幫助我們歸類並處理違規舉報。
 	</notification>
 	<notification name="HelpReportAbuseDetailsEmpty">
-		Please enter a detailed description of the abuse that took place.
-Be as specific as you can, including names and the details of the incident you are reporting.
-Entering an accurate description helps us file and process abuse reports.
+		請詳述違規情事。
+請儘可能提供具體詳情，包括你要舉報的案情細節和涉案的名稱。
+準確的詳述可以幫助我們歸類並處理違規舉報。
 	</notification>
 	<notification name="HelpReportAbuseContainsCopyright">
-		Dear Resident,
+		這位居民，你好：
 
-You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
+你似乎正在舉報有人侵犯智慧財產權。 請確定你舉報內容確鑿無誤：
 
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] [http://secondlife.com/corporate/tos.php Terms of Service] or [http://secondlife.com/corporate/cs.php Community Standards]. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world.
+(1) 違規舉報處理程序。 你若相信有居民利用 [SECOND_LIFE] 權限遂行侵犯智慧財產權，如使用複製機器程式碼(CopyBot)或其他類似複製工具，得以舉報此情事。 違規處理小組會就任何違反[SECOND_LIFE][http://secondlife.com/corporate/tos.php 服務條款]或[http://secondlife.com/corporate/cs.php 社群準則]的行為展開調查，並採取適當處置。 然而，違規處理小組並不受理要求將某內容自[SECOND_LIFE]虛擬世界刪除，這類要求將不予回應。
 
-(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our [http://secondlife.com/corporate/dmca.php DMCA Policy].
+(2) DMCA（刪除內容作業程序）。 若欲要求刪除[SECOND_LIFE]內容，你必須按照[http://secondlife.com/corporate/dmca.php DMCA 政策]提出有效的侵權通知。
 
-If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category &apos;CopyBot or Permissions Exploit&apos;.
+如果你仍希望繼續，請關閉此視窗，完成舉報。  你可能需要選擇「CopyBot 或濫用權限」這一具體類別。
 
-Thank you,
+謝謝你，
 
-Linden Lab
+林登實驗室謹上
 	</notification>
 	<notification name="FailedRequirementsCheck">
-		The following required components are missing from [FLOATER]:
+		[FLOATER] 裡找不到下列必要元件：
 [COMPONENTS]
 	</notification>
 	<notification label="取代現有的附件" name="ReplaceAttachment">
-		There is already an object attached to this point on your body.
-Do you want to replace it with the selected object?
+		你身上的這個部位已經附著了物件。
+你要用所選物件將它取代嗎？
 		<form name="form">
 			<ignore name="ignore" text="以所選擇的物品取代現有的附加物"/>
 			<button ignore="自動取代" name="Yes" text="確定"/>
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="忙碌模式警告" name="BusyModePay">
-		You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
+	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
+		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
 
-Would you like to leave Busy Mode before completing this transaction?
+是否要在完成交易之前，先關閉「請勿打擾」模式？
 		<form name="form">
-			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
-			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
-			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
+			<ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/>
+			<button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
+			<button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
-		資料夾 &apos;[FOLDERNAME]&apos; 是系統資料夾。刪除系統資料夾將導致不穩定。你確定你要刪除它？
+		「[FOLDERNAME]」屬於系統資料夾。 刪除系統資料夾可能導致系統不穩定。  你確定要加以刪除？
 		<usetemplate ignoretext="在我刪除系統資料夾前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmEmptyTrash">
@@ -1972,6 +2187,10 @@ Would you like to leave Busy Mode before completing this transaction?
 		你確定要刪除你的旅行、網頁及搜尋歷史紀錄嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
+	<notification name="ConfirmClearCache">
+		確定要清除你 Viewer 的快取？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmClearCookies">
 		你確定要清除你的 cookies 嗎？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="是"/>
@@ -1988,7 +2207,7 @@ Would you like to leave Busy Mode before completing this transaction?
 		下列的 SLurl 位置已經覆製到你的剪貼簿上：
  [SLURL]
 
-Link to this from a web page to give others easy access to this location, or try it out yourself by pasting it into the address bar of any web browser.
+從某個網頁連結到這裡，讓其他人更容易知道這個地點，或請自行嘗試將它貼到任何網頁瀏覽器的地址欄裡。
 		<form name="form">
 			<ignore name="ignore" text="SLurl 已經覆製到我的剪貼簿。"/>
 		</form>
@@ -1997,48 +2216,30 @@ Link to this from a web page to give others easy access to this location, or try
 		你要覆寫已儲存的預設配置嗎？
 		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
-	<notification name="WLDeletePresetAlert">
-		你要刪除 [SKY]?
-		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
-	</notification>
 	<notification name="WLNoEditDefault">
-		You cannot edit or delete a default preset.
+		你不能編輯或刪除預設的設定。
 	</notification>
 	<notification name="WLMissingSky">
-		This day cycle file references a missing sky file: [SKY].
+		這個「一日循環」檔案參考了一個不存在的天空檔案：[SKY]。
 	</notification>
-	<notification name="PPSaveEffectAlert">
-		PostProcess Effect exists. Do you still wish overwrite it?
-		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
-	</notification>
-	<notification name="NewSkyPreset">
-		Give me a name for the new sky.
-		<form name="form">
-			<input name="message">
-				新預設配配置
-			</input>
-			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取消"/>
-		</form>
+	<notification name="WLRegionApplyFail">
+		抱歉，設定無法套用到地區。  離開地區再返回也許可以解決這個問題。  所得的原因為：[FAIL_REASON]
 	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		Preset already exists!
+	<notification name="EnvCannotDeleteLastDayCycleKey">
+		無法刪除此日循環的最後一組設定，日循環不得為空白。  你應該修改最後一組資料，不要試圖刪除，然後再建立新的。
+		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="NewWaterPreset">
-		Give me a name for the new water preset.
-		<form name="form">
-			<input name="message">
-				New Preset
-			</input>
-			<button name="OK" text="確定"/>
-			<button name="Cancel" text="取消"/>
-		</form>
+	<notification name="DayCycleTooManyKeyframes">
+		你無法新增更多的 keyframe 到這個日循環。  [SCOPE] 範圍的日循環最多允許 [MAX] 個 keyframe。
+		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		Preset already exists!
+	<notification name="EnvUpdateRate">
+		你至多只能每 [WAIT] 秒更新一次地區的環境設定。  請等到這段時間過去了再試一次。
+		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="WaterNoEditDefault">
-		You cannot edit or delete a default preset.
+	<notification name="PPSaveEffectAlert">
+		PostProcess 效果已經存在。 你是否仍要把它覆寫掉？
+		<usetemplate name="okcancelbuttons" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ChatterBoxSessionStartError">
 		無法開始一個與　[RECIPIENT]　他的新聊天會話。
@@ -2056,10 +2257,10 @@ Link to this from a web page to give others easy access to this location, or try
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="Cannot_Purchase_an_Attachment">
-		You can&apos;t buy an object while it is attached.
+		你不能購買已附著的物件。
 	</notification>
-	<notification label="About Requests for the Debit Permission" name="DebitPermissionDetails">
-		Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
+	<notification label="關於借記權限要求" name="DebitPermissionDetails">
+		若你同意這要求，將允許腳本從你的帳戶中重覆取走林登幣(L$)。 物件所有人必須刪除該物件，或重設物件裡的腳本，才能撤銷這一權限。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AutoWearNewClothing">
@@ -2067,25 +2268,23 @@ Link to this from a web page to give others easy access to this location, or try
 		<usetemplate ignoretext="編輯外觀時能穿上我所創造的服裝" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		You must be age-verified to visit this area.  Do you want to go to the [SECOND_LIFE] website and verify your age?
-
-[_URL]
-		<url name="url">
-			https://secondlife.com/account/verification.php
-		</url>
-		<usetemplate ignoretext="I have not verified my age" name="okcancelignore" notext="否" yestext="是"/>
+		你所欲前往的地點設限給年滿 18 歲的居民進入。
+		<usetemplate ignoretext="我年齡不滿規定，無法進入有年齡限制的區域。" name="okignore" yestext="確定"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		此地點限制為年滿 18 歲。
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
-		You must have payment information on file to visit this area.  Do you want to go to the [SECOND_LIFE] website and set this up?
+		你必須提供付款資料才能進入這區域。  你是否要前往 [SECOND_LIFE] 網站設定付款資料？
 
 [_URL]
 		<url name="url">
 			https://secondlife.com/account/
 		</url>
-		<usetemplate ignoretext="I lack payment information on file" name="okcancelignore" notext="否" yestext="是"/>
+		<usetemplate ignoretext="我沒有預留付款資料。" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="MissingString">
-		The string [STRING_NAME] is missing from strings.xml
+		strings.xml 中找不到字串 [STRING_NAME]
 	</notification>
 	<notification name="SystemMessageTip">
 		[MESSAGE]
@@ -2103,38 +2302,35 @@ Link to this from a web page to give others easy access to this location, or try
 		取消貼上
 	</notification>
 	<notification name="ReplacedMissingWearable">
-		Replaced missing clothing/body part with default.
+		已用預設值補足空缺的衣服/身體部位。
 	</notification>
 	<notification name="GroupNotice">
-		Topic: [SUBJECT], Message: [MESSAGE]
+		主旨：[SUBJECT]，訊息：[MESSAGE]
 	</notification>
-	<notification name="FriendOnline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 上線
-	</notification>
-	<notification name="FriendOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 離線
+	<notification name="FriendOnlineOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
 	</notification>
 	<notification name="AddSelfFriend">
-		Although you&apos;re very nice, you can&apos;t add yourself as a friend.
+		雖然你人很好，你還是不能把自己加為朋友。
 	</notification>
 	<notification name="UploadingAuctionSnapshot">
-		Uploading in-world and web site snapshots...
-(Takes about 5 minutes.)
+		正在上傳虛擬世界和網站快照…
+（需時約 5 分鐘。）
 	</notification>
 	<notification name="UploadPayment">
 		你支付 L$[AMOUNT] 上傳。
 	</notification>
 	<notification name="UploadWebSnapshotDone">
-		Web site snapshot upload done.
+		網站快照上傳完成。
 	</notification>
 	<notification name="UploadSnapshotDone">
-		In-world snapshot upload done
+		虛擬世界快照上傳完成。
 	</notification>
 	<notification name="TerrainDownloaded">
 		地形 .raw 檔已下載
 	</notification>
 	<notification name="GestureMissing">
-		嗯，姿勢 [NAME] 在資料庫中遺失。
+		姿勢 [NAME] 在資料庫中遺失。
 	</notification>
 	<notification name="UnableToLoadGesture">
 		無法載入姿勢 [NAME]。
@@ -2143,7 +2339,7 @@ Link to this from a web page to give others easy access to this location, or try
 		資料庫中的地標遺失。
 	</notification>
 	<notification name="UnableToLoadLandmark">
-		無法載入地標，請再試一次。
+		無法載入地標。  請再試一次。
 	</notification>
 	<notification name="CapsKeyOn">
 		你的大寫鍵已啟用。
@@ -2158,6 +2354,12 @@ Link to this from a web page to give others easy access to this location, or try
 	<notification name="RezItemNoPermissions">
 		產生物件時發生權限衝突。
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		無法對不同的母領地發出即時訊息。
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		收納區無法轉移到不同的母領地。
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		無法載入記事卡。
 請再試一次。
@@ -2169,28 +2371,28 @@ Link to this from a web page to give others easy access to this location, or try
 		察看腳本時發生權限衝突。
 	</notification>
 	<notification name="UnableToLoadScript">
-		無法載入腳本。請再試一次。
+		無法載入腳本。  請再試一次。
 	</notification>
 	<notification name="IncompleteInventory">
-		The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
+		你所提供的完整內容在本地還無法取得。 請幾分鐘後再試著提供這些物項。
 	</notification>
 	<notification name="CannotModifyProtectedCategories">
-		You cannot modify protected categories.
+		你不能修改受保護的類別。
 	</notification>
 	<notification name="CannotRemoveProtectedCategories">
-		You cannot remove protected categories.
+		你不能移除受保護的類別。
 	</notification>
 	<notification name="UnableToBuyWhileDownloading">
-		Unable to buy while downloading object data.
-Please try again.
+		正在下載物件資料，無法購買。
+請再試一次。
 	</notification>
 	<notification name="UnableToLinkWhileDownloading">
-		Unable to link while downloading object data.
-Please try again.
+		正在下載物件資料，無法聯結。
+請再試一次。
 	</notification>
 	<notification name="CannotBuyObjectsFromDifferentOwners">
-		You can only buy objects from one owner at a time.
-Please select a single object.
+		你一次只能向一位物主購買物件。
+請選擇一個單一物件。
 	</notification>
 	<notification name="ObjectNotForSale">
 		這物件不出售。
@@ -2211,7 +2413,7 @@ Please select a single object.
 		[NAME] 謝絕你提供的收納區物品。
 	</notification>
 	<notification name="ObjectMessage">
-		[NAME]: [MESSAGE]
+		[NAME]：[MESSAGE]
 	</notification>
 	<notification name="CallingCardAccepted">
 		你的名片已被接受。
@@ -2220,24 +2422,23 @@ Please select a single object.
 		你的名片已被拒絕。
 	</notification>
 	<notification name="TeleportToLandmark">
-		You can teleport to locations like &apos;[NAME]&apos; by opening the Places panel on the right side of your screen, and then select the Landmarks tab.
-Click on any landmark to select it, then click &apos;Teleport&apos; at the bottom of the panel.
-(You can also double-click on the landmark, or right-click it and choose &apos;Teleport&apos;.)
+		要瞬間傳送到「[NAME]」等地點，請點按「地點」按鈕，
+    然後在開啟的視窗裡，選擇「地標」頁籤。 點按任何
+    地標加以選擇，再點按視窗底下的「瞬間傳送」按鈕。
+    （你還可以直接按兩下那個地標，或按滑鼠右鍵，選擇「瞬間傳送」。）
 	</notification>
 	<notification name="TeleportToPerson">
-		You can contact Residents like &apos;[NAME]&apos; by opening the People panel on the right side of your screen.
-Select the Resident from the list, then click &apos;IM&apos; at the bottom of the panel.
-(You can also double-click on their name in the list, or right-click and choose &apos;IM&apos;).
+		要和某人私下交談，請右鍵點按化身，再點按選單的「IM」。
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">
-		Can&apos;t select land across server boundaries.
-Try selecting a smaller piece of land.
+		無法選擇超出伺服器邊界的土地。
+請試著縮小所選的土地。
 	</notification>
 	<notification name="SearchWordBanned">
-		Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.
+		根據「社群準則」所明訂的內容限制，已排除你所搜尋的某些字眼。
 	</notification>
 	<notification name="NoContentToSearch">
-		Please select at least one type of content to search (General, Moderate, or Adult).
+		請至少選擇一種要搜索的內容分級（一般普級、適度成人、完全成人）。
 	</notification>
 	<notification name="SystemMessage">
 		[MESSAGE]
@@ -2248,6 +2449,9 @@ Try selecting a smaller piece of land.
 	<notification name="PaymentSent">
 		[MESSAGE]
 	</notification>
+	<notification name="PaymentFailure">
+		[MESSAGE]
+	</notification>
 	<notification name="EventNotification">
 		活動通知：
 
@@ -2259,179 +2463,198 @@ Try selecting a smaller piece of land.
 		</form>
 	</notification>
 	<notification name="TransferObjectsHighlighted">
-		All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted.
+		這地段上，所有將轉移給地段購買人的物件，現已呈高亮顯示。
 
-* Trees and grasses that will transfer are not highlighted.
+* 即將轉移的樹和草不會以高亮顯示。
 		<form name="form">
-			<button name="Done" text="Done"/>
+			<button name="Done" text="完成"/>
 		</form>
 	</notification>
 	<notification name="DeactivatedGesturesTrigger">
-		Deactivated gestures with same trigger:
+		以同一觸發停用的姿勢：
 [NAMES]
 	</notification>
 	<notification name="NoQuickTime">
-		Apple&apos;s QuickTime software does not appear to be installed on your system.
-If you want to view streaming media on parcels that support it you should go to the [http://www.apple.com/quicktime QuickTime site] and install the QuickTime Player.
+		你的系統似乎未安裝 Apple 的 QuickTime 軟體。
+如果你要在支援串流媒體的地段上觀看這類媒體，請到[http://www.apple.com/quicktime QuickTime 網站]安裝 QuickTime 播放器。
 	</notification>
 	<notification name="NoPlugin">
-		No Media Plugin was found to handle the &quot;[MIME_TYPE]&quot; mime type.  Media of this type will be unavailable.
+		找不到媒體插件來處理「[MIME_TYPE]」mine 類型。  這類媒體將無法使用。
 	</notification>
 	<notification name="MediaPluginFailed">
-		The following Media Plugin has failed:
+		以下的媒體插件失靈：
     [PLUGIN]
 
-Please re-install the plugin or contact the vendor if you continue to experience problems.
+如果你繼續出現這狀況，請重新安裝插件，或聯絡其提供廠家。
 		<form name="form">
-			<ignore name="ignore" text="A Media Plugin fails to run"/>
+			<ignore name="ignore" text="有一個媒體插件無法執行"/>
 		</form>
 	</notification>
 	<notification name="OwnedObjectsReturned">
-		The objects you own on the selected parcel of land have been returned back to your inventory.
+		你在所選地段上所擁有的物件已被送返你的收納區。
 	</notification>
 	<notification name="OtherObjectsReturned">
-		The objects on the selected parcel of land that is owned by [NAME] have been returned to his or her inventory.
+		在所選地段上由 [NAME] 所擁有的物件已被送返其收納區。
 	</notification>
 	<notification name="OtherObjectsReturned2">
-		The objects on the selected parcel of land owned by the Resident &apos;[NAME]&apos; have been returned to their owner.
+		在所選地段上由居民 &apos;[NAME]&apos; 所擁有的物件已被送返其收納區。
 	</notification>
 	<notification name="GroupObjectsReturned">
-		The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner&apos;s inventory.
-Transferable deeded objects have been returned to their previous owners.
-Non-transferable objects that are deeded to the group have been deleted.
+		在所選地段上和群組 &apos;[GROUPNAME]&apos; 分享的物件已被送返其所有人的收納區。
+可轉讓的已讓渡物件已送返給前物主。
+讓渡給這個群組的不可轉讓物件已被刪除。
 	</notification>
 	<notification name="UnOwnedObjectsReturned">
-		The objects on the selected parcel that are NOT owned by you have been returned to their owners.
+		在所選地段上不是你擁有的物件已送返給其所有人。
 	</notification>
 	<notification name="ServerObjectMessage">
-		Message from [NAME]:
+		來自 [NAME] 的訊息：
 &lt;nolink&gt;[MSG]&lt;/nolink&gt;
 	</notification>
 	<notification name="NotSafe">
-		This land has damage enabled.
-You can be hurt here. If you die, you will be teleported to your home location.
+		這塊土地允許傷害。
+在這裡你可能會受傷害。 你如果死亡，會被瞬間傳送回你的家。
 	</notification>
 	<notification name="NoFly">
-		這區域關閉並禁止飛行。
+		這區域禁止飛行。
 你不能在此處飛行。
 	</notification>
 	<notification name="PushRestricted">
-		This area does not allow pushing. You can&apos;t push others here unless you own the land.
+		這區域不允許推撞。 除非你擁有這塊土地，否則你不能推撞別人。
 	</notification>
 	<notification name="NoVoice">
-		This area has voice chat disabled. You won&apos;t be able to hear anyone talking.
+		這區域禁止語音聊天。 你將不會聽到任何人說話。
 	</notification>
 	<notification name="NoBuild">
-		This area has building disabled. You can&apos;t build or rez objects here.
+		這區域禁止建造物件。 你不能在此建造或產生物件。
+	</notification>
+	<notification name="PathfindingDirty">
+		這地區的尋徑功能有所變更，待儲存。  如果你有建製權，你可以點按「重新產出地區」按鈕重新產出地區。
+	</notification>
+	<notification name="DynamicPathfindingDisabled">
+		這地區並未啟用動態尋徑。  使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。
+	</notification>
+	<notification name="PathfindingCannotRebakeNavmesh">
+		發生錯誤。  問題可能出在網路或伺服器，也可能因為你無權建製物件。  有時，只要登出再登入即能解決這類問題。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SeeAvatars">
+		本地段隱藏其內的化身和聊天文字，其他地段看不到。   你看不見地段外的居民，他們也看不見你。  頻道 0 的聊天文字也被封鎖。
 	</notification>
 	<notification name="ScriptsStopped">
-		An administrator has temporarily stopped scripts in this region.
+		某管理員已暫時停止區域裡的腳本。
 	</notification>
 	<notification name="ScriptsNotRunning">
-		This region is not running any scripts.
+		這區域沒有執行任何腳本。
 	</notification>
 	<notification name="NoOutsideScripts">
-		This land has outside scripts disabled.
+		這塊土地禁用外來腳本。
 
-No scripts will work here except those belonging to the land owner.
+只有屬於土地所有人的腳本在此可以正常執行。
 	</notification>
 	<notification name="ClaimPublicLand">
-		You can only claim public land in the Region you&apos;re in.
+		你只能在你所處的區域收取公共土地。
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		You aren&apos;t allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer.
-
-Please go to the Knowledge Base for details on accessing areas with this maturity Rating.
+		你所欲前往的地區含有超過你目前偏好的分級的內容。  你可以到「我自己 &gt; 偏好設定 &gt; 一般設定」變更你的偏好設定。
 	</notification>
 	<notification name="URBannedFromRegion">
-		You are banned from the region.
+		這個區域禁止你進入。
 	</notification>
 	<notification name="NoTeenGridAccess">
-		Your account cannot connect to this teen grid region.
+		你的帳戶不可連接到這個青少年網格區域。
 	</notification>
 	<notification name="ImproperPaymentStatus">
-		You do not have proper payment status to enter this region.
+		你沒有適當的付款狀態，不能進入這區域。
 	</notification>
-	<notification name="MustGetAgeRgion">
-		你必須通過年齡認證以進入這地區。
+	<notification name="MustGetAgeRegion">
+		你必須年滿 18 歲才可進入這地區。
 	</notification>
 	<notification name="MustGetAgeParcel">
-		你必須通過年齡驗證以進入這地段。
+		你必須年滿 18 歲才可進入這地段。
 	</notification>
 	<notification name="NoDestRegion">
-		無目的地地區發現。
+		找不到目的地地區。
 	</notification>
 	<notification name="NotAllowedInDest">
-		You are not allowed into the destination.
+		你不准前往目的地。
 	</notification>
 	<notification name="RegionParcelBan">
-		Cannot region cross into banned parcel. Try another way.
+		無法跨出地區進入禁止你的地段。 請換一個方式。
 	</notification>
 	<notification name="TelehubRedirect">
-		You have been redirected to a telehub.
+		你已被重新導往一個瞬間傳送中心。
 	</notification>
 	<notification name="CouldntTPCloser">
-		Could not teleport closer to destination.
+		無法瞬間傳送到更接近目的地的地點。
 	</notification>
 	<notification name="TPCancelled">
 		瞬間傳送已取消。
 	</notification>
 	<notification name="FullRegionTryAgain">
-		The region you are attempting to enter is currently full.
-Please try again in a few moments.
+		你試圖進入的地區目前人滿。
+請稍待一會兒再試。
 	</notification>
 	<notification name="GeneralFailure">
 		一般故障。
 	</notification>
 	<notification name="RoutedWrongRegion">
-		路由導向到錯誤地區。請再試一次。
+		被繞往錯誤的地區。 請再試一次。
 	</notification>
 	<notification name="NoValidAgentID">
-		No valid agent id.
+		沒有有效的化身編號。
 	</notification>
 	<notification name="NoValidSession">
-		No valid session id.
+		沒有有效的時域編號。
 	</notification>
 	<notification name="NoValidCircuit">
-		No valid circuit code.
+		沒有有效的線路碼。
 	</notification>
 	<notification name="NoValidTimestamp">
-		No valid timestamp.
+		沒有有效的時間戳記。
 	</notification>
 	<notification name="NoPendingConnection">
-		Unable to create pending connection.
+		無法建立待通的連線。
 	</notification>
 	<notification name="InternalUsherError">
-		Internal error attempting to connect agent usher.
+		試圖連接用戶引導時發生內部錯誤。
 	</notification>
 	<notification name="NoGoodTPDestination">
-		Unable to find a good teleport destination in this region.
+		在這地區找不到合適的瞬間傳送目的地。
 	</notification>
 	<notification name="InternalErrorRegionResolver">
-		Internal error attempting to activate region resolver.
+		試圖啟動區域解析器時發生內部錯誤。
 	</notification>
 	<notification name="NoValidLanding">
-		A valid landing point could not be found.
+		找不到有效的登陸地點。
 	</notification>
 	<notification name="NoValidParcel">
-		No valid parcel could be found.
+		找不到有效的地段。
 	</notification>
 	<notification name="ObjectGiveItem">
-		An object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; owned by [NAME_SLURL] has given you this [OBJECTTYPE]:
-[ITEM_SLURL]
+		名為 &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt;、由 [NAME_SLURL] 擁有的物件給了你這個 [OBJECTTYPE]：
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
+		<form name="form">
+			<button name="Keep" text="保留"/>
+			<button name="Discard" text="丟棄"/>
+			<button name="Mute" text="封鎖所有人"/>
+		</form>
+	</notification>
+	<notification name="OwnObjectGiveItem">
+		你名為 &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; 的物件給了你這個 [OBJECTTYPE]：
+&lt;nolink&gt;[ITEM_SLURL]&lt;/nolink&gt;
 		<form name="form">
-			<button name="Keep" text="Keep"/>
-			<button name="Discard" text="Discard"/>
-			<button name="Mute" text="Block"/>
+			<button name="Keep" text="保留"/>
+			<button name="Discard" text="丟棄"/>
 		</form>
 	</notification>
 	<notification name="UserGiveItem">
-		[NAME_SLURL] has given you this [OBJECTTYPE]:
+		[NAME_SLURL] 給了你這個 [OBJECTTYPE]：
 [ITEM_SLURL]
 		<form name="form">
-			<button name="Show" text="Show"/>
-			<button name="Discard" text="Discard"/>
-			<button name="Mute" text="Block"/>
+			<button name="Show" text="顯示"/>
+			<button name="Discard" text="丟棄"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="GodMessage">
@@ -2448,16 +2671,37 @@ Please try again in a few moments.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] has offered to teleport you to their location:
+		[NAME_SLURL] 想要瞬間傳送你到他的地點：
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="瞬間傳送"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] 想要瞬間傳送你到他的地點：
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+此地區包含 [REGION_CONTENT_MATURITY] 的分級內容，可是你目前的偏好設定排除了 [REGION_CONTENT_MATURITY] 的分級內容。  我們可以變更你的偏好設定好讓你繼續瞬間傳送，你也可取消這動作。
+		<form name="form">
+			<button name="Teleport" text="變更後繼續"/>
+			<button name="Cancel" text="取消"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] 想要瞬間傳送你到他的地點：
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+可是，此地區含有僅限成人的內容。
+	</notification>
 	<notification name="TeleportOfferSent">
-		Teleport offer sent to [TO_NAME]
+		已向 [TO_NAME] 發出瞬間傳送邀請
 	</notification>
 	<notification name="GotoURL">
 		[MESSAGE]
@@ -2468,33 +2712,33 @@ Please try again in a few moments.
 		</form>
 	</notification>
 	<notification name="OfferFriendship">
-		[NAME_SLURL] is offering friendship.
+		[NAME_SLURL] 想成為你的朋友。
 
 [MESSAGE]
 
-(By default, you will be able to see each other&apos;s online status.)
+（根據預設設定，你們將可看到彼此的線上狀態。）
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
 		</form>
 	</notification>
 	<notification name="FriendshipOffered">
-		You have offered friendship to [TO_NAME]
+		已經邀請 [TO_NAME] 成為朋友
 	</notification>
 	<notification name="OfferFriendshipNoMessage">
-		[NAME_SLURL] is offering friendship.
+		[NAME_SLURL] 想成為你的朋友。
 
-(By default, you will be able to see each other&apos;s online status.)
+（根據預設設定，你們將可看到彼此的線上狀態。）
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
 		</form>
 	</notification>
 	<notification name="FriendshipAccepted">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; accepted your friendship offer.
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 接受了你的交友邀請。
 	</notification>
 	<notification name="FriendshipDeclined">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 謝絕你的交友邀請。
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 婉拒了你的交友邀請。
 	</notification>
 	<notification name="FriendshipAcceptedByMe">
 		交友邀請被接受。
@@ -2503,208 +2747,215 @@ Please try again in a few moments.
 		交友邀請被謝絕。
 	</notification>
 	<notification name="OfferCallingCard">
-		[NAME] is offering their calling card.
-This will add a bookmark in your inventory so you can quickly IM this Resident.
+		[NAME] 送給你他的名片。
+這將在你的收納區新增一個書籤，方便你和這位居民互傳即時訊息。
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
 		</form>
 	</notification>
 	<notification name="RegionRestartMinutes">
-		This region will restart in [MINUTES] minutes.
-If you stay in this region you will be logged out.
+		本地區將在 [MINUTES] 分鐘後重新啟動。
+如果你繼續留在這地區，你將會被登出。
 	</notification>
 	<notification name="RegionRestartSeconds">
-		This region will restart in [SECONDS] seconds.
-If you stay in this region you will be logged out.
+		本地區將在 [SECONDS] 秒後重新啟動。
+如果你繼續留在這地區，你將會被登出。
 	</notification>
 	<notification name="LoadWebPage">
 		載入網頁 [URL]?
 
 [MESSAGE]
 
-From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME]?
+來源物件：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;（所有人是 [NAME]）？
 		<form name="form">
 			<button name="Gotopage" text="前往頁面"/>
 			<button name="Cancel" text="取消"/>
 		</form>
 	</notification>
 	<notification name="FailedToFindWearableUnnamed">
-		Failed to find [TYPE] in database.
+		資料庫找不到 [TYPE]。
 	</notification>
 	<notification name="FailedToFindWearable">
-		Failed to find [TYPE] named [DESC] in database.
+		資料庫找不到名為 [DESC] 的 [TYPE]。
 	</notification>
 	<notification name="InvalidWearable">
-		The item you are trying to wear uses a feature that your Viewer can&apos;t read. Please upgrade your version of [APP_NAME] to wear this item.
+		你想要穿著的物項帶有一個不是你目前 Viewer 版本能夠讀取的特性。 請更新你的 [APP_NAME] 版本再穿著該物項。
 	</notification>
 	<notification name="ScriptQuestion">
-		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+		&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;，一個由 &apos;[NAME]&apos; 擁有的物件，想要：
 
 [QUESTIONS]
-Is this OK?
+是否同意？
 		<form name="form">
 			<button name="Yes" text="是"/>
 			<button name="No" text="否"/>
-			<button name="Mute" text="Block"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		An object named &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, owned by &apos;[NAME]&apos; would like to:
-
-[QUESTIONS]
-If you do not trust this object and its creator, you should deny the request.
+		警告：物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。
+  
+如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
+		<form name="form">
+			<button name="Grant" text="允許全權存取"/>
+			<button name="Deny" text="拒絕"/>
+		</form>
+	</notification>
+	<notification name="UnknownScriptQuestion">
+		由 &apos;[NAME]&apos; 所擁有的物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 正請求某項執行時期腳本權限，但本瀏覽器無法辨識該權限，故不允准。
 
-Grant this request?
+欲准許此權限，請從 [DOWNLOADURL] 下載並更新為最新版瀏覽器。
 		<form name="form">
-			<button name="Grant" text="Grant"/>
-			<button name="Deny" text="Deny"/>
-			<button name="Details" text="細節..."/>
+			<button name="Deny" text="確定"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
-		[NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
+		[NAME] 的 &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
 		<form name="form">
-			<button name="Ignore" text="忽視"/>
+			<button name="Client_Side_Mute" text="封鎖"/>
+			<button name="Client_Side_Ignore" text="忽視"/>
 		</form>
 	</notification>
 	<notification name="ScriptDialogGroup">
-		[GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
+		[GROUPNAME] 的 &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
 [MESSAGE]
 		<form name="form">
-			<button name="Ignore" text="忽視"/>
+			<button name="Client_Side_Mute" text="封鎖"/>
+			<button name="Client_Side_Ignore" text="忽視"/>
 		</form>
 	</notification>
 	<notification name="BuyLindenDollarSuccess">
-		Thank you for your payment!
+		感謝你付款！
 
-Your L$ balance will be updated when processing completes. If processing takes more than 20 mins, your transaction may be cancelled. In that case, the purchase amount will be credited to your US$ balance.
+處理完成後，你的 L$ 餘額將會更新。 如果處理過程超過 20 分鐘，你的交易可能被取消。 在這狀況下，購買金額將退回給你的 US$ 餘額。
 
-The status of your payment can be checked on your Transaction History page on your [http://secondlife.com/account/ Dashboard]
+你可以到你的[http://secondlife.com/account/ 塗鴉牆]上的交易歷史記錄頁面，察看付款狀態。
 	</notification>
 	<notification name="FirstOverrideKeys">
-		Your movement keys are now being handled by an object.
-Try the arrow keys or AWSD to see what they do.
-Some objects (like guns) require you to go into mouselook  to use them.
-Press &apos;M&apos; to do this.
+		你的方向鍵現在由一個物件主控。
+請試試方向鍵或 AWSD 鍵看有什麼反應。
+有些物件（例如槍枝）需要你切換成第一人稱視角才有作用。
+請按 M 鍵做切換。
 	</notification>
 	<notification name="FirstSandbox">
-		This is a sandbox area, and is meant to help Residents learn how to build.
+		這個一個沙盤區，旨在幫助居民學習如何建製物件。
 
-Things you build here will be deleted after you leave, so don&apos;t forget to right-click and choose &apos;Take&apos; to move your creation to your Inventory.
+你在這裡建製的物件，在你離開後將被刪除。別忘了按滑鼠右鍵，選擇「拿取」，將你的建製物送到你的收納區。
 	</notification>
 	<notification name="MaxListSelectMessage">
-		You may only select up to [MAX_SELECT] items from this list.
+		你最多只能從這清單中選取 [MAX_SELECT] 個物項。
 	</notification>
 	<notification name="VoiceInviteP2P">
-		[NAME] is inviting you to a Voice Chat call.
-Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
+		[NAME] 正邀請你加入語音聊天。
+點按「接受」加入通話，或「謝絕」邀請。 點按「封鎖」便可封鎖這個發話人。
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
-			<button name="Mute" text="Block"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="AutoUnmuteByIM">
-		[NAME] was sent an instant message and has been automatically unblocked.
+		[NAME] 已收到一則即時訊息，並已被自動解除封鎖。
 	</notification>
 	<notification name="AutoUnmuteByMoney">
-		[NAME] was given money and has been automatically unblocked.
+		[NAME] 已收到錢，並已被自動解除封鎖。
 	</notification>
 	<notification name="AutoUnmuteByInventory">
-		[NAME] was offered inventory and has been automatically unblocked.
+		[NAME] 已得知你要贈送收納物件，並已被自動解除封鎖。
 	</notification>
 	<notification name="VoiceInviteGroup">
-		[NAME] has joined a Voice Chat call with the group [GROUP].
-Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
+		[NAME] 已加入和群組 [GROUP] 的語音聊天通話。
+點按「接受」加入通話，或「謝絕」邀請。 點按「封鎖」便可封鎖這個發話人。
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
-			<button name="Mute" text="Block"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="VoiceInviteAdHoc">
-		[NAME] has joined a voice chat call with a conference chat.
-Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller.
+		[NAME] 已加入多方語音通話。
+點按「接受」加入通話，或「謝絕」邀請。 點按「封鎖」便可封鎖這個發話人。
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
-			<button name="Mute" text="Block"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="InviteAdHoc">
-		[NAME] is inviting you to a conference chat.
-Click Accept to join the chat or Decline to decline the invitation. Click Block to block this caller.
+		[NAME] 正邀請你加入多方通話。
+點按「接受」加入通話，或「謝絕」邀請。 點按「封鎖」便可封鎖這個發話人。
 		<form name="form">
 			<button name="Accept" text="接受"/>
 			<button name="Decline" text="謝絕"/>
-			<button name="Mute" text="Block"/>
+			<button name="Mute" text="封鎖"/>
 		</form>
 	</notification>
 	<notification name="VoiceChannelFull">
-		The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
+		你試圖加入 [VOICE_CHANNEL_NAME] 語音通話，不過它已達負載上限。 請稍候再試一次。
 	</notification>
 	<notification name="ProximalVoiceChannelFull">
-		We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+		很抱歉。  這區域已達語音通話的負載上限。  請到另一個區域使用語音。
 	</notification>
 	<notification name="VoiceChannelDisconnected">
-		You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to Nearby Voice Chat.
+		你的 [VOICE_CHANNEL_NAME] 通話已經中斷。  現在你將重新連通到附近的語音聊天。
 	</notification>
 	<notification name="VoiceChannelDisconnectedP2P">
-		[VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to Nearby Voice Chat.
+		[VOICE_CHANNEL_NAME] 語音通話已結束。  現在你將重新連通到附近的語音聊天。
 	</notification>
 	<notification name="P2PCallDeclined">
-		[VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to Nearby Voice Chat.
+		[VOICE_CHANNEL_NAME] 拒絕你加入語音通話。  現在你將重新連通到附近的語音聊天。
 	</notification>
 	<notification name="P2PCallNoAnswer">
-		[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to Nearby Voice Chat.
+		[VOICE_CHANNEL_NAME] 無法接通你的通話。  現在你將重新連通到附近的語音聊天。
 	</notification>
 	<notification name="VoiceChannelJoinFailed">
-		Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to Nearby Voice Chat.
+		無法連通 [VOICE_CHANNEL_NAME],，請稍候再試。  現在你將重新連通到附近的語音聊天。
 	</notification>
 	<notification name="VoiceLoginRetry">
-		We are creating a voice channel for you. This may take up to one minute.
+		我們正為你建立語音頻道。 這至多可能需時一分鐘。
 	</notification>
 	<notification name="VoiceEffectsExpired">
-		One or more of your subscribed Voice Morphs has expired.
-[[URL] Click here] to renew your subscription.
+		至少一個你訂用的變聲效果已經過期。
+[[URL] 點按這裡] 繼續訂用。
 	</notification>
 	<notification name="VoiceEffectsExpiredInUse">
-		The active Voice Morph has expired, your normal voice settings have been applied.
-[[URL] Click here] to renew your subscription.
+		使用中的變聲效果已經過期，已用你平時的聲音設定取代。
+[[URL] 點按這裡] 繼續訂用。
 	</notification>
 	<notification name="VoiceEffectsWillExpire">
-		One or more of your Voice Morphs will expire in less than [INTERVAL] days.
-[[URL] Click here] to renew your subscription.
+		至少一個你訂用的變聲效果將在 [INTERVAL] 天後到期。
+[[URL] 點按這裡] 繼續訂用。
 	</notification>
 	<notification name="VoiceEffectsNew">
-		New Voice Morphs are available!
+		新的變聲效果上市了！
 	</notification>
 	<notification name="Cannot enter parcel: not a group member">
-		Only members of a certain group can visit this area.
+		只有某特定群組的成員才能進入這區域。
 	</notification>
 	<notification name="Cannot enter parcel: banned">
-		Cannot enter parcel, you have been banned.
+		你已被禁入，因此無法進入這地段。
 	</notification>
 	<notification name="Cannot enter parcel: not on access list">
-		Cannot enter parcel, you are not on the access list.
+		無法進入這地段，你不在出入許可名單中。
 	</notification>
 	<notification name="VoiceNotAllowed">
-		You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+		你無權連通 [VOICE_CHANNEL_NAME] 語音聊天。
 	</notification>
 	<notification name="VoiceCallGenericError">
-		An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+		試圖連通 [VOICE_CHANNEL_NAME] 語音聊天時發生錯誤。  請稍候再試一次。
 	</notification>
 	<notification name="UnsupportedCommandSLURL">
-		你所點擊的 SLurl 位置並不被支援。
+		你所點按的 SLurl 位置並不被支援。
 	</notification>
 	<notification name="BlockedSLURL">
-		A SLurl was received from an untrusted browser and has been blocked for your security.
+		從未被信任的瀏覽器接收到一個 SLurl，為了你的安全起見，已將它封鎖。
 	</notification>
 	<notification name="ThrottledSLURL">
-		Multiple SLurls were received from an untrusted browser within a short period.
-They will be blocked for a few seconds for your security.
+		短時間內從一個不被信任的瀏覽器接收到多個 SLurl。
+為了你的安全起見，它們將被封鎖幾秒鐘。
 	</notification>
 	<notification name="IMToast">
 		[MESSAGE]
@@ -2713,45 +2964,72 @@ They will be blocked for a few seconds for your security.
 		</form>
 	</notification>
 	<notification name="ConfirmCloseAll">
-		你確定要關閉全部 IMs 對話視窗？
+		你確定要關閉所有的 IM？
 		<usetemplate ignoretext="在我關閉全部的 IMs 對話視窗前確認。" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="AttachmentSaved">
 		附件已儲存。
 	</notification>
 	<notification name="UnableToFindHelpTopic">
-		Unable to find the help topic for this element.
+		找不到這個元件的幫助主題。
 	</notification>
 	<notification name="ObjectMediaFailure">
-		Server Error: Media update or get failed.
+		伺服器錯誤：媒體更新或取得失敗。
 &apos;[ERROR]&apos;
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="TextChatIsMutedByModerator">
-		Your text chat has been muted by moderator.
+		主持人已設定忽略你的文字聊天內容。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="VoiceIsMutedByModerator">
-		Your voice has been muted by moderator.
+		主持人已將你的語音消音。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		上傳將花費 L$[PRICE]，是否繼續？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="上傳"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
-		Are you sure you want to delete your teleport history?
+		確定清除你的瞬間傳送歷史記錄？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="BottomTrayButtonCanNotBeShown">
-		Selected button can not be shown right now.
-The button will be shown when there is enough space for it.
+		所選按鈕目前無法顯示。
+等到空間足夠，按鈕將會顯示出來。
 	</notification>
 	<notification name="ShareNotification">
-		Select residents to share with.
+		選取要分享的居民。
+	</notification>
+	<notification name="MeshUploadError">
+		[LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER] 
+
+詳見記錄檔。
+	</notification>
+	<notification name="MeshUploadPermError">
+		請求網面上傳權限時出錯。
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		無法取得地區能力 &apos;[CAPABILITY]&apos;。
 	</notification>
 	<notification name="ShareItemsConfirmation">
-		Are you sure you want to share the following items:
+		請確定你要和居民分享這些物項：
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+居民：
+
+[RESIDENTS]
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="ShareFolderConfirmation">
+		一次只能分享一個資料夾。
+
+請確定你要和居民分享這些物項：
 
 &lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
 
-With the following Residents:
+居民：
 
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
@@ -2762,117 +3040,140 @@ With the following Residents:
 	<notification name="DeedToGroupFail">
 		讓渡給群組失敗。
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		目前無法遺棄 [PARCEL_NAME] 地段。
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		[AREA] 平方公尺的地段「[PARCEL_NAME]」已釋出。
+
+你須在 [RECLAIM_PERIOD] 小時內領回（花費 L$0），否則將開放出售給任何人。
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		[AREA] 平方公尺的地段「[PARCEL_NAME]」已釋出。
+
+現已開放出售給任何人。
+	</notification>
 	<notification name="AvatarRezNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; declouded after [TIME] seconds.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 在 [TIME] 秒內完全呈現。
 	</notification>
 	<notification name="AvatarRezSelfBakedDoneNotification">
-		( [EXISTENCE] seconds alive )
-You finished baking your outfit after [TIME] seconds.
+		（存續 [EXISTENCE] 秒鐘）
+你的裝扮在 [TIME] 秒內定貌。
 	</notification>
 	<notification name="AvatarRezSelfBakedUpdateNotification">
-		( [EXISTENCE] seconds alive )
-You sent out an update of your appearance after [TIME] seconds.
+		（存續 [EXISTENCE] 秒鐘）
+你在 [TIME] 秒後送出更新外觀請求。
 [STATUS]
 	</notification>
 	<notification name="AvatarRezCloudNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; became cloud.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 已雲化。
 	</notification>
 	<notification name="AvatarRezArrivedNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; appeared.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 已出現。
 	</notification>
 	<notification name="AvatarRezLeftCloudNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; left after [TIME] seconds as cloud.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 在雲化 [TIME] 秒後離開。
 	</notification>
 	<notification name="AvatarRezEnteredAppearanceNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; entered appearance mode.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 進入外觀模式。
 	</notification>
 	<notification name="AvatarRezLeftAppearanceNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; left appearance mode.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 離開外觀模式。
 	</notification>
 	<notification name="NoConnect">
-		We&apos;re having trouble connecting using [PROTOCOL] [HOSTID].
-Please check your network and firewall setup.
+		使用 [PROTOCOL] [HOSTID] 連線時出了問題。
+請檢查你的網路和防火牆設定。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="NoVoiceConnect">
-		We&apos;re having trouble connecting to your voice server:
+		試圖連接語音伺服器時出了問題：
 
 [HOSTID]
 
-Voice communications will not be available.
-Please check your network and firewall setup.
+將無法用語音溝通。
+請檢查你的網路和防火牆設定。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
 	<notification name="AvatarRezLeftNotification">
-		( [EXISTENCE] seconds alive )
-Avatar &apos;[NAME]&apos; left as fully loaded.
+		（存續 [EXISTENCE] 秒鐘）
+化身 &apos;[NAME]&apos; 在完全載入狀況下離開。
 	</notification>
 	<notification name="AvatarRezSelfBakedTextureUploadNotification">
-		( [EXISTENCE] seconds alive )
-You uploaded a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; after [TIME] seconds.
+		（存續 [EXISTENCE] 秒鐘）
+你在 [TIME] 秒鐘後為 &apos;[BODYREGION]&apos; 上傳了一個 [RESOLUTION] 的定貌材質。
 	</notification>
 	<notification name="AvatarRezSelfBakedTextureUpdateNotification">
-		( [EXISTENCE] seconds alive )
-You locally updated a [RESOLUTION] baked texture for &apos;[BODYREGION]&apos; after [TIME] seconds.
+		（存續 [EXISTENCE] 秒鐘）
+你在 [TIME] 秒鐘後在本地為 &apos;[BODYREGION]&apos; 更新了一個 [RESOLUTION] 的定貌材質。
+	</notification>
+	<notification name="LivePreviewUnavailable">
+		我們無法顯示這個材質的預覽，因為它設為「禁止複製」且 / 或「禁止轉移」。
+		<usetemplate ignoretext="「禁止複製」和「禁止轉移」的材質若不能使用實時預覽模式，請給我警示。" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="ConfirmLeaveCall">
 		你確定要離開這段通話？
 		<usetemplate ignoretext="我結束通話前進行確認" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
 	<notification name="ConfirmMuteAll">
-		You have selected to mute all participants in a group call.
-This will also cause all residents that later join the call to be
-muted, even after you have left the call.
+		你已選擇要將所有參與群組通話的人消音。
+這將導致後來加入通話的所有居民同樣被
+消音，即使在你離開通話後也一樣。
 
-Mute everyone?
+把所有人消音？
 		<usetemplate ignoretext="在我對所有群組通話的參與者予以靜音前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
 	<notification label="聊天" name="HintChat">
-		To join the conversation, type into the chat field below.
+		若要加入對話，請在下方的聊天欄裡打字。
 	</notification>
-	<notification label="Stand" name="HintSit">
-		To stand up and exit the sitting position, click the Stand button.
+	<notification label="站立" name="HintSit">
+		若要中止坐姿站起身來，請按「站立」按鈕。
 	</notification>
-	<notification label="Speak" name="HintSpeak">
-		Click the Speak button to turn your microphone on and off.
+	<notification label="說話" name="HintSpeak">
+		點按「說話」按鈕來打開或關閉麥克風。
 
-Click on the up arrow to see the voice control panel.
+點按向上箭頭鍵，可顯示聲音控制面板。
 
-Hiding the Speak button will disable the voice feature.
+隱藏「說話」按鈕將停用語音功能。
 	</notification>
 	<notification label="探索世界" name="HintDestinationGuide">
-		The Destination Guide contains thousands of new places to discover. Select a location and choose Teleport to start exploring.
+		目的地指南包含上千個值得探索的新地點。 選擇一個地點，然後「瞬間傳送」前往，開始你的探索！
 	</notification>
 	<notification label="側邊欄" name="HintSidePanel">
-		Get quick access to your inventory, outfits, profiles and more in the side panel.
+		你可以從側邊欄進入收納區、裝扮、個人檔案等，方便又迅速。
 	</notification>
 	<notification label="移動" name="HintMove">
-		To walk or run, open the Move Panel and use the directional arrows to navigate. You can also use the directional keys on your keyboard.
+		若想行走或跑步，請打開「移動」面板，使用方向箭頭來移動。 也可以使用鍵盤上的方向鍵。
 	</notification>
 	<notification label="" name="HintMoveClick">
-		1. Click to Walk
-Click anywhere on the ground to walk to that spot.
+		1. 點按一下就可行走
+點按地面上任何一點，就可以走到那裡。
 
-2. Click and Drag to Rotate View
-Click and drag anywhere on the world to rotate your view
+2. 按住並拖曳，可以旋轉視野
+在虛擬世界裡按住並拖曳任何一點，就可旋轉你的視野
 	</notification>
 	<notification label="顯示名稱" name="HintDisplayName">
-		Set your customizable display name here. This is in addition to your unique username, which can&apos;t be changed. You can change how you see other people&apos;s names in your preferences.
+		在這裡自訂你的顯示名稱。 顯示名稱和使用者名稱有別，後者獨一無二而且不能變更。 你可以在偏好設定裡，變更要如何察看別人的名稱。
 	</notification>
-	<notification label="View" name="HintView">
-		To change your camera view, use the Orbit and Pan controls. Reset your view by pressing Escape or walking.
+	<notification label="視角" name="HintView">
+		要改變攝影機視角，請用「環繞」和「平移」控制。 按 Escape 鍵，或走動一下，便可重設你的視野。
 	</notification>
 	<notification label="收納區" name="HintInventory">
-		Check your inventory to find items. Newest items can be easily found in the Recent tab.
+		到收納區找尋物項。 在「新近」頁籤裡可立刻看到新近的物項。
 	</notification>
 	<notification label="你得到林登幣!" name="HintLindenDollar">
-		Here&apos;s your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
+		這裡顯示你目前的 L$ 餘額。 點按「購買 L$」可添購林登幣。
+	</notification>
+	<notification name="LowMemory">
+		你的可用記憶體很小。 第二人生部分功能將停用，以免當機。 請關閉其他應用程式。 這狀況若持續，請重啟第二人生。
+	</notification>
+	<notification name="ForceQuitDueToLowMemory">
+		記憶體不足，第二人生將於 30 秒後關閉離開。
 	</notification>
 	<notification name="PopupAttempt">
 		一個突顯式視窗開啟時被阻擋。
@@ -2881,54 +3182,171 @@ Click and drag anywhere on the world to rotate your view
 			<button name="open" text="開啟突顯式視窗"/>
 		</form>
 	</notification>
+	<notification name="SOCKS_NOT_PERMITTED">
+		SOCKS 5 代理伺服器 &quot;[HOST]:[PORT]&quot; 拒絕連通，規則集不允許。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR">
+		SOCKS 5 代理伺服器 &quot;[HOST]:[PORT]&quot; 拒絕連通，無法打開 TCP 頻道。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE">
+		SOCKS 5 代理伺服器 &quot;[HOST]:[PORT]&quot; 拒絕所選的鑒認方法。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL">
+		SOCKS 5 代理伺服器 &quot;[HOST]:[PORT]&quot; 回報：你的鑒認資料無效。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED">
+		SOCKS 5 代理伺服器 &quot;[HOST]:[PORT]&quot; 拒絕 UDP 聯結請求。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED">
+		無法連通 SOCKS 5 代理伺服器 &quot;[HOST]:[PORT]&quot;。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_UNKNOWN_STATUS">
+		伺服器 &quot;[HOST]:[PORT]&quot; 發生不明的代理伺服器錯誤。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_INVALID_HOST">
+		無效的 SOCKS 代理伺服器位址或埠號 &quot;[HOST]:[PORT]&quot;。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="SOCKS_BAD_CREDS">
+		無效的 SOCKS 5 使用者名稱或密碼。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="PROXY_INVALID_HTTP_HOST">
+		無效的 HTTP 代理伺服器位址或埠號 &quot;[HOST]:[PORT]&quot;。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="PROXY_INVALID_SOCKS_HOST">
+		無效的 SOCKS 代理伺服器位址或埠號 &quot;[HOST]:[PORT]&quot;。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="ChangeProxySettings">
+		重新啟動 [APP_NAME] 後將採用新的代理伺服器設定。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="AuthRequest">
-		The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;[REALM]&apos; requires a user name and password.
+		&apos;[REALM]&apos; 領域的 &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; 站點需要使用者名稱和密碼。
 		<form name="form">
-			<input name="username" text="User Name"/>
-			<input name="password" text="Password"/>
-			<button name="ok" text="Submit"/>
+			<input name="username" text="使用者名稱"/>
+			<input name="password" text="密碼"/>
+			<button name="ok" text="提交"/>
 			<button name="cancel" text="取消"/>
 		</form>
 	</notification>
-	<notification label="" name="ModeChange">
-		改變劉覽器模式要求你必須結束退出並重新啟動。
-		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
-	</notification>
 	<notification label="" name="NoClassifieds">
-		Creation and editing of Classifieds is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
+		只有進階模式才能新建或編輯個人廣告。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoGroupInfo">
-		Creation and editing of Groups is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
+		只有進階模式才能新建或編輯群組。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
+	<notification label="" name="NoPlaceInfo">
+		只有進階模式才能察看地點檔案。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoPicks">
-		Creation and editing of Picks is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
+		只有進階模式才能新建或編輯精選地點。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoWorldMap">
-		Viewing of the world map is only available in Advanced mode. Would you like to quit and change modes? The mode selector can be found on the login screen.
+		只有進階模式才能察看世界地圖。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoVoiceCall">
-		Voice calls are only available in Advanced mode. Would you like to logout and change modes?
+		只有進階模式才能使用語音通話。 你是否要登出並且變更模式？
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoAvatarShare">
-		Sharing is only available in Advanced mode. Would you like to logout and change modes?
+		只有進階模式才能使用分享功能。 你是否要登出並且變更模式？
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
 	<notification label="" name="NoAvatarPay">
-		Paying other residents is only available in Advanced mode. Would you like to logout and change modes?
+		只有進階模式才能付費給其他居民。 你是否要登出並且變更模式？
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- 你的 CPU 運算速度未達到系統最低配備要求。
-	</global>
+	<notification label="" name="NoInventory">
+		只有進階模式才能察看收納區。 你是否要登出並且變更模式？
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		只有進階模式才能使用外觀編輯器。 你是否要登出並且變更模式？
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		只有進階模式才能搜尋。 你是否要登出並且變更模式？
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
+	<notification label="" name="ConfirmHideUI">
+		這將會隱藏所有選單內容和按鈕。 要恢復原狀，再點按 [SHORTCUT] 一次。
+		<usetemplate ignoretext="隱藏使用者介面前先確認" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom">
+		所選的一些聯結集的幻影旗標將被切換。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選的一些聯結集的幻影旗標將被切換。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted">
+		所選某些聯結集因權限問題，無法設定為 &apos;[REQUESTED_TYPE]&apos;。  這些聯結集將被設為 &apos;[RESTRICTED_TYPE]&apos;。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選某些聯結集因權限問題，無法設定。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnVolume">
+		所選某些聯結集無法設為 &apos;[REQUESTED_TYPE]&apos;，因為形狀屬於非凸面。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選某些聯結集因為形狀屬於非凸面，無法設定" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted">
+		所選的一些聯結集的幻影旗標將被切換。
+
+所選某些聯結集因權限問題，無法設定為 &apos;[REQUESTED_TYPE]&apos;。  這些聯結集將被設為 &apos;[RESTRICTED_TYPE]&apos;。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選的一些聯結集的幻影旗標可成功切換，其他的則因權限問題而無法設定。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnVolume">
+		所選的一些聯結集的幻影旗標將被切換。
+
+所選某些聯結集無法設為 &apos;[REQUESTED_TYPE]&apos;，因為形狀屬於非凸面。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選的一些聯結集的幻影旗標可成功切換，其他的則因形狀屬於非凸面而無法設定" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_MismatchOnRestricted_MismatchOnVolume">
+		所選某些聯結集因權限問題，無法設定為 &apos;[REQUESTED_TYPE]&apos;。  這些聯結集將被設為 &apos;[RESTRICTED_TYPE]&apos;。
+
+所選某些聯結集無法設為 &apos;[REQUESTED_TYPE]&apos;，因為形狀屬於非凸面。 這些聯結集的使用類型將維持不變。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選某些聯結集因權限不足，且形狀屬於非凸面，因此無法設定。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_WarnOnPhantom_MismatchOnRestricted_MismatchOnVolume">
+		所選的一些聯結集的幻影旗標將被切換。
+
+所選某些聯結集因權限問題，無法設定為 &apos;[REQUESTED_TYPE]&apos;。  這些聯結集將被設為 &apos;[RESTRICTED_TYPE]&apos;。
+
+所選某些聯結集無法設為 &apos;[REQUESTED_TYPE]&apos;，因為形狀屬於非凸面。 這些聯結集的使用類型將維持不變。
+
+你確定要繼續嗎？
+		<usetemplate ignoretext="所選的一些聯結集的幻影旗標將被切換，其他則因權限不足且形狀屬於非凸面，因此無法設定。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		所選的物件會影響導航網面。  將它改為彈性路徑，將使它從導航網面中被移除。
+		<usetemplate ignoretext="所選的物件會影響導航網面。  將它改為彈性路徑，將使它從導航網面中被移除。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
-		You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
+		你的硬體設備似乎不符 [APP_NAME] 的要求。 [APP_NAME] 需要可以支援多材質的 OpenGL 顯像卡。 在這狀況下，請確定你的顯像卡安裝了最新的驅動程式，作業系統也安裝了最新的服務包和嵌補程式。
 
-If you continue to have problems, please visit the [SUPPORT_SITE].
+如果你繼續遇到問題，請前往 [SUPPORT_SITE] 求助。
 	</global>
 	<global name="UnsupportedCPUAmount">
 		796
@@ -2944,9 +3362,658 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
 	</global>
 	<global name="You can only set your &apos;Home Location&apos; on your land or at a mainland Infohub.">
 		若你擁有一塊土地，你可以標記它成為你的家的位置。
-或者，你可以察看地圖尋找標記為 &quot;資訊中心&quot; 的地方。
+或者，你可以察看地圖，尋找標記為「資訊中心」的地方。
 	</global>
 	<global name="You died and have been teleported to your home location">
 		你已經死亡並且被瞬間傳送回你的家的位置。
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] 無法更新，找不到該檔案。
+未來將不再更新該檔案。
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] 無法開啟或解碼，已嘗試 [NRETRIES] 次，該檔案已被認定為毀壞。
+未來將不再更新該檔案。
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		試圖新增一個無效或無法讀取的圖像檔 [FNAME]，該檔無法開啟或解碼。
+已取消這一嘗試。
+	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		你正退回 [NUM_ITEMS] 個物項。  你確定你要繼續？
+		<usetemplate ignoretext="確定退回多個物項？" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		你正在刪除 [NUM_ITEMS] 個物項。  你確定你要繼續？
+		<usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/>
+	</notification>
+	<notification name="AvatarFrozen">
+		[AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="AvatarFrozenDuration">
+		[AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
+	</notification>
+	<notification name="YouFrozeAvatar">
+		化身已凍結。
+	</notification>
+	<notification name="AvatarHasUnFrozenYou">
+		[AV_FREEZER] 解除了對你的凍結。
+	</notification>
+	<notification name="AvatarUnFrozen">
+		化身已解除凍結。
+	</notification>
+	<notification name="AvatarFreezeFailure">
+		凍結失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="AvatarFreezeThaw">
+		你遭凍結的時間已過，請恢復正常活動。
+	</notification>
+	<notification name="AvatarCantFreeze">
+		抱歉，無法凍結該用戶。
+	</notification>
+	<notification name="NowOwnObject">
+		你現在是物件 [OBJECT_NAME] 的所有人
+	</notification>
+	<notification name="CantRezOnLand">
+		無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。  請用土地工具察看所有人。
+	</notification>
+	<notification name="RezFailTooManyRequests">
+		無法產生物件，此刻要求數目過多。
+	</notification>
+	<notification name="SitFailCantMove">
+		你無法坐下，因為此刻你不能移動。
+	</notification>
+	<notification name="SitFailNotAllowedOnLand">
+		你不能坐下，因為該土地不允許。
+	</notification>
+	<notification name="SitFailNotSameRegion">
+		請挨近一點。  無法坐在物件上，因為
+它和你不在同一個地區。
+	</notification>
+	<notification name="NoNewObjectRegionFull">
+		無法建立新物件。 地區已滿載。
+	</notification>
+	<notification name="FailedToPlaceObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="NoOwnNoGardening">
+		你無法在別人的土地上建立樹和草。
+	</notification>
+	<notification name="NoCopyPermsNoObject">
+		複製失敗，你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransPermsNoObject">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
+	</notification>
+	<notification name="AddToNavMeshNoCopy">
+		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
+	</notification>
+	<notification name="DupeWithNoRootsSelected">
+		選取了沒有根的重覆物件。
+	</notification>
+	<notification name="CantDupeCuzRegionIsFull">
+		無法複製物件，因為地區滿載。
+	</notification>
+	<notification name="CantDupeCuzParcelNotFound">
+		無法複製物件，找不到它們所在的地段。
+	</notification>
+	<notification name="CantCreateCuzParcelFull">
+		無法建立物件，因為 
+地段滿載。
+	</notification>
+	<notification name="RezAttemptFailed">
+		試圖產生物件失敗。
+	</notification>
+	<notification name="ToxicInvRezAttemptFailed">
+		無法建立已在此地區造成問題的物件。
+	</notification>
+	<notification name="InvItemIsBlacklisted">
+		該收納區物項已被列入黑名單。
+	</notification>
+	<notification name="NoCanRezObjects">
+		你此時無權建立物件。
+	</notification>
+	<notification name="LandSearchBlocked">
+		土地搜尋遭禁。
+你在短時間內進行了太多次土地搜尋。
+請稍候再試。
+	</notification>
+	<notification name="NotEnoughResourcesToAttach">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="YouDiedAndGotTPHome">
+		你已經死亡並且被瞬間傳送回你的家的位置
+	</notification>
+	<notification name="EjectComingSoon">
+		你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。
+	</notification>
+	<notification name="NoEnterServerFull">
+		你無法進入這地區，因為 
+伺服器滿載。
+	</notification>
+	<notification name="SaveBackToInvDisabled">
+		「儲存回收納區」功能已被停用。
+	</notification>
+	<notification name="NoExistNoSaveToContents">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容，因為產生它的來源物件已不存在。
+	</notification>
+	<notification name="NoModNoSaveToContents">
+		無法儲存 [OBJ_NAME] 到物件內容，你無權修改 &apos;[DEST_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoSaveBackToInvDisabled">
+		無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區，此動作已被停用。
+	</notification>
+	<notification name="NoCopyNoSelCopy">
+		無法複製你所選的，因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoTransNoSelCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoTransNoCopy">
+		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
+	</notification>
+	<notification name="NoPermsNoRemoval">
+		權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
+	</notification>
+	<notification name="NoModNoSaveSelection">
+		無法儲存你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="NoCopyNoSaveSelection">
+		無法儲存你所選的，因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
+	</notification>
+	<notification name="NoModNoTaking">
+		無法拿取你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
+	</notification>
+	<notification name="RezDestInternalError">
+		內部錯誤：未知的目的地類型。
+	</notification>
+	<notification name="DeleteFailObjNotFound">
+		刪除失敗，因為找不到物件
+	</notification>
+	<notification name="SorryCantEjectUser">
+		抱歉，無法踢出該用戶。
+	</notification>
+	<notification name="RegionSezNotAHome">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="HomeLocationLimits">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="HomePositionSet">
+		我的家位置已定。
+	</notification>
+	<notification name="AvatarEjected">
+		化身已被踢出。
+	</notification>
+	<notification name="AvatarEjectFailed">
+		踢出失敗，因為你在該地段沒有管理員權限。
+	</notification>
+	<notification name="CantMoveObjectParcelFull">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。
+	</notification>
+	<notification name="CantMoveObjectParcelPerms">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。
+	</notification>
+	<notification name="CantMoveObjectParcelResources">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。
+	</notification>
+	<notification name="CantMoveObjectRegionVersion">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+ [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。
+	</notification>
+	<notification name="CantMoveObjectNavMesh">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="CantMoveObjectWTF">
+		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
+地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]）
+	</notification>
+	<notification name="NoPermModifyObject">
+		你無權變更該物件
+	</notification>
+	<notification name="CantEnablePhysObjContributesToNav">
+		對導航網面有貢獻的物件，無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysKeyframedObj">
+		鍵格動畫物件無法啟用物理。
+	</notification>
+	<notification name="CantEnablePhysNotEnoughLandResources">
+		無法啟用物件的物理——土地資源不足。
+	</notification>
+	<notification name="CantEnablePhysCostTooGreat">
+		物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理
+	</notification>
+	<notification name="PhantomWithConcavePiece">
+		此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。
+	</notification>
+	<notification name="UnableAddItem">
+		無法新增項目！
+	</notification>
+	<notification name="UnableEditItem">
+		無法編輯這項目！
+	</notification>
+	<notification name="NoPermToEdit">
+		無權編輯這項目。
+	</notification>
+	<notification name="NoPermToCopyInventory">
+		無權複製該收納區。
+	</notification>
+	<notification name="CantSaveItemDoesntExist">
+		無法儲存到物件內容：該項目已不存在。
+	</notification>
+	<notification name="CantSaveItemAlreadyExists">
+		無法儲存到物件內容：收納區已存在同名稱的項目
+	</notification>
+	<notification name="CantSaveModifyAttachment">
+		無法儲存到物件內容：這麼做將修改附件的權限。
+	</notification>
+	<notification name="TooManyScripts">
+		腳本太多。
+	</notification>
+	<notification name="UnableAddScript">
+		無法新增腳本！
+	</notification>
+	<notification name="AssetServerTimeoutObjReturn">
+		資產伺服器未在正常時間內反應。  物件已返交模擬器。
+	</notification>
+	<notification name="RegionDisablePhysicsShapes">
+		本地區未啟用物理形狀。
+	</notification>
+	<notification name="NoModNavmeshAcrossRegions">
+		你無法變更跨越地區界限的導航網面。
+	</notification>
+	<notification name="NoSetPhysicsPropertiesOnObjectType">
+		該物件類型不得設定物理性質。
+	</notification>
+	<notification name="NoSetRootPrimWithNoShape">
+		根幾何元件無法設成無形狀。
+	</notification>
+	<notification name="NoRegionSupportPhysMats">
+		本地區未啟用物理材料。
+	</notification>
+	<notification name="OnlyRootPrimPhysMats">
+		只能調整根幾何元件的物理材料。
+	</notification>
+	<notification name="NoSupportCharacterPhysMats">
+		尚不支援角色設定物理材料。
+	</notification>
+	<notification name="InvalidPhysMatProperty">
+		指定的物理材料屬性中，至少有一個無效。
+	</notification>
+	<notification name="NoPermsAlterStitchingMeshObj">
+		網面物件的縫合類型不得變更。
+	</notification>
+	<notification name="NoPermsAlterShapeMeshObj">
+		網面物件的形狀不得變更。
+	</notification>
+	<notification name="FullRegionCantEnter">
+		你無法進入這地區，\n因為地區滿載。
+	</notification>
+	<notification name="LinkFailedOwnersDiffer">
+		聯結失敗——所有人不同
+	</notification>
+	<notification name="LinkFailedNoModNavmeshAcrossRegions">
+		聯結失敗——無法修改跨越地區界限的導航網面。
+	</notification>
+	<notification name="LinkFailedNoPermToEdit">
+		聯結失敗，你無權編輯。
+	</notification>
+	<notification name="LinkFailedTooManyPrims">
+		聯結失敗——幾何元件太多
+	</notification>
+	<notification name="LinkFailedCantLinkNoCopyNoTrans">
+		聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
+	</notification>
+	<notification name="LinkFailedNothingLinkable">
+		聯結失敗——沒有可聯結的東西。
+	</notification>
+	<notification name="LinkFailedTooManyPathfindingChars">
+		聯結失敗——尋徑角色太多
+	</notification>
+	<notification name="LinkFailedInsufficientLand">
+		聯結失敗——土地資源不足
+	</notification>
+	<notification name="LinkFailedTooMuchPhysics">
+		物件使用了過多物理資源，其動態特性已被停用。
+	</notification>
+	<notification name="TeleportedHomeByObjectOnParcel">
+		你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
+	</notification>
+	<notification name="TeleportedHomeByObject">
+		你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
+	</notification>
+	<notification name="TeleportedByAttachment">
+		你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOnParcel">
+		你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectOwnedBy">
+		你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
+	</notification>
+	<notification name="TeleportedByObjectUnknownUser">
+		你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
+	</notification>
+	<notification name="CantCreateObjectRegionFull">
+		無法建立要求的物件。 地區已滿載。
+	</notification>
+	<notification name="CantAttackMultipleObjOneSpot">
+		你不能將多個物件附著到同一個點。
+	</notification>
+	<notification name="CantCreateMultipleObjAtLoc">
+		你不能在此建立多個物件。
+	</notification>
+	<notification name="UnableToCreateObjTimeOut">
+		無法建立要求的物件。 物件在資料庫中找不到。
+	</notification>
+	<notification name="UnableToCreateObjUnknown">
+		無法建立要求的物件。 要求逾時，無法完成。 請再試一次。
+	</notification>
+	<notification name="UnableToCreateObjMissingFromDB">
+		無法建立要求的物件。 請再試一次。
+	</notification>
+	<notification name="RezFailureTookTooLong">
+		物件產生失敗，要求的物件載入時間太久。
+	</notification>
+	<notification name="FailedToPlaceObjAtLoc">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreatePlantsOnLand">
+		你不得在這土地上建立植物。
+	</notification>
+	<notification name="CantRestoreObjectNoWorldPos">
+		無法恢復物件。 找不到虛擬世界的位置。
+	</notification>
+	<notification name="CantRezObjectInvalidMeshData">
+		無法產生物件，它的網面資料無效。
+	</notification>
+	<notification name="CantRezObjectTooManyScripts">
+		無法產生物件，因為這地區已有太多的腳本。
+	</notification>
+	<notification name="CantCreateObjectNoAccess">
+		你無權在此建立物件。
+	</notification>
+	<notification name="CantCreateObject">
+		你此時無權建立物件。
+	</notification>
+	<notification name="InvalidObjectParams">
+		無效的物件參數
+	</notification>
+	<notification name="CantDuplicateObjectNoAcess">
+		你權限不夠，無法在此複製物件。
+	</notification>
+	<notification name="CantChangeShape">
+		你無權變更這個形狀。
+	</notification>
+	<notification name="NoAccessToClaimObjects">
+		你權限不夠，無法在此收取物件。
+	</notification>
+	<notification name="DeedFailedNoPermToDeedForGroup">
+		讓渡失敗，你無權為你的群組讓渡物件。
+	</notification>
+	<notification name="NoPrivsToBuyObject">
+		你權限不夠，無法在此購買物件。
+	</notification>
+	<notification name="CantAttachObjectAvatarSittingOnIt">
+		無法附著物件，有個化身正坐在物件上。
+	</notification>
+	<notification name="WhyAreYouTryingToWearShrubbery">
+		樹和草不能當附件穿戴。
+	</notification>
+	<notification name="CantAttachGroupOwnedObjs">
+		無法附著群組所擁有的物件。
+	</notification>
+	<notification name="CantAttachObjectsNotOwned">
+		無法附著不是你擁有的物件。
+	</notification>
+	<notification name="CantAttachNavmeshObjects">
+		無法附著對導航網面有貢獻的物件。
+	</notification>
+	<notification name="CantAttachObjectNoMovePermissions">
+		無法附著物件，你無權移動該物件。
+	</notification>
+	<notification name="CantAttachNotEnoughScriptResources">
+		腳本資源不足，無法附著物件！
+	</notification>
+	<notification name="CantDropItemTrialUser">
+		你無法在此卸除物件，請到「自由嘗試」區域再試。
+	</notification>
+	<notification name="CantDropMeshAttachment">
+		你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。
+	</notification>
+	<notification name="CantDropAttachmentNoPermission">
+		卸除附件失敗：你無權在此處卸除。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientLandResources">
+		卸除附件失敗：可用土地資源不足。
+	</notification>
+	<notification name="CantDropAttachmentInsufficientResources">
+		卸除附件失敗：可用資源不足。
+	</notification>
+	<notification name="CantDropObjectFullParcel">
+		無法在此卸除物件。  地段滿載。
+	</notification>
+	<notification name="CantTouchObjectBannedFromParcel">
+		無法觸摸/抓取此物件，因為你在該土地地段遭禁。
+	</notification>
+	<notification name="PlzNarrowDeleteParams">
+		請將刪除參數範圍調小一點。
+	</notification>
+	<notification name="UnableToUploadAsset">
+		無法上傳資產。
+	</notification>
+	<notification name="CantTeleportCouldNotFindUser">
+		找不到要瞬間傳送到家的用戶
+	</notification>
+	<notification name="GodlikeRequestFailed">
+		要求神的權力失敗
+	</notification>
+	<notification name="GenericRequestFailed">
+		普通請求失敗
+	</notification>
+	<notification name="CantUploadPostcard">
+		無法上傳明信片。  請稍候再試一次。
+	</notification>
+	<notification name="CantFetchInventoryForGroupNotice">
+		無法取得群組通知的收納區細節。
+	</notification>
+	<notification name="CantSendGroupNoticeNotPermitted">
+		無法送出群組通知——未准許。
+	</notification>
+	<notification name="CantSendGroupNoticeCantConstructInventory">
+		無法送出群組通知——收納區建立失敗。
+	</notification>
+	<notification name="CantParceInventoryInNotice">
+		無法剖析通知裡的收納品項。
+	</notification>
+	<notification name="TerrainUploadFailed">
+		地形上傳失敗。
+	</notification>
+	<notification name="TerrainFileWritten">
+		地形檔案已寫入。
+	</notification>
+	<notification name="TerrainFileWrittenStartingDownload">
+		地形檔案已寫入，開始下載……
+	</notification>
+	<notification name="TerrainBaked">
+		地形已定貌。
+	</notification>
+	<notification name="TenObjectsDisabledPlzRefresh">
+		只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。
+	</notification>
+	<notification name="UpdateViewerBuyParcel">
+		你必須先更新瀏覽器後，才可購買這個地段。
+	</notification>
+	<notification name="CantBuyParcelNotForSale">
+		無法購買，此地段不供出售。
+	</notification>
+	<notification name="CantBuySalePriceOrLandAreaChanged">
+		無法購買，售價或土地面積已變。
+	</notification>
+	<notification name="CantBuyParcelNotAuthorized">
+		你不是此地段的獲授權的買主。
+	</notification>
+	<notification name="CantBuyParcelAwaitingPurchaseAuth">
+		你無法購買此地段，該地段已在等候批准購買
+	</notification>
+	<notification name="CantBuildOverflowParcel">
+		你不得在此建立物件，這麼做將導致地段超載。
+	</notification>
+	<notification name="SelectedMultipleOwnedLand">
+		你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。
+	</notification>
+	<notification name="CantJoinTooFewLeasedParcels">
+		未選取足夠租用地段，無法合併。
+	</notification>
+	<notification name="CantDivideLandMultipleParcelsSelected">
+		無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。
+	</notification>
+	<notification name="CantDivideLandCantFindParcel">
+		無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
+	</notification>
+	<notification name="CantDivideLandWholeParcelSelected">
+		無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
+	</notification>
+	<notification name="LandHasBeenDivided">
+		土地分割成功。
+	</notification>
+	<notification name="PassPurchased">
+		你購買了通行權。
+	</notification>
+	<notification name="RegionDisallowsClassifieds">
+		地區不允許分類廣告。
+	</notification>
+	<notification name="LandPassExpireSoon">
+		你在此土地的通行權即將到期失效。
+	</notification>
+	<notification name="CantSitNoSuitableSurface">
+		沒有合適的表面讓你坐下，請試一試別處。
+	</notification>
+	<notification name="CantSitNoRoom">
+		這裡沒有空間讓你坐下，請試試另一處。
+	</notification>
+	<notification name="ClaimObjectFailedNoPermission">
+		收取物件失敗，因為你權限不足。
+	</notification>
+	<notification name="ClaimObjectFailedNoMoney">
+		收取物件失敗，因為你 L$ 金額不足。
+	</notification>
+	<notification name="CantDeedGroupLand">
+		無法讓渡群組所擁有的土地。
+	</notification>
+	<notification name="BuyObjectFailedNoMoney">
+		購買物件失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyInventoryFailedNoMoney">
+		購買收納區失敗，你 L$ 金額不足。
+	</notification>
+	<notification name="BuyPassFailedNoMoney">
+		你的 L$ 不足，無法購買此土地的通行權。
+	</notification>
+	<notification name="CantBuyPassTryAgain">
+		此時無法購買通行權。  請稍候再試一次。
+	</notification>
+	<notification name="CantCreateObjectParcelFull">
+		無法建立物件，\n地段滿載。
+	</notification>
+	<notification name="FailedPlacingObject">
+		無法將物件置於指定地點。  請再試一次。
+	</notification>
+	<notification name="CantCreateLandmarkForEvent">
+		無法為活動建立地標。
+	</notification>
+	<notification name="GodBeatsFreeze">
+		你擁有的神力解除了凍結！
+	</notification>
+	<notification name="SpecialPowersRequestFailedLogged">
+		要求特殊能力失敗。 該要求已載入記錄。
+	</notification>
+	<notification name="ExpireExplanation">
+		系統此時無法處理你的要求。 要求逾時，無法完成。
+	</notification>
+	<notification name="DieExplanation">
+		系統無法處理你的要求。
+	</notification>
+	<notification name="AddPrimitiveFailure">
+		金額不足，無法建立幾何元件。
+	</notification>
+	<notification name="RezObjectFailure">
+		金額不足，無法建立物件。
+	</notification>
+	<notification name="ResetHomePositionNotLegal">
+		已重設「我的家」位置，因為前一個位置不合法。
+	</notification>
+	<notification name="CantInviteRegionFull">
+		此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。
+	</notification>
+	<notification name="CantSetHomeAtRegion">
+		此地區不許你在此設定「我的家」。
+	</notification>
+	<notification name="ListValidHomeLocations">
+		你只能在自己的土地或大陸資訊中心上設定「我的家」。
+	</notification>
+	<notification name="SetHomePosition">
+		我的家位置已定。
+	</notification>
+	<notification name="CantDerezInventoryError">
+		收納區出錯，無法收納物件。
+	</notification>
+	<notification name="CantCreateRequestedInv">
+		無法建立要求的收納區。
+	</notification>
+	<notification name="CantCreateRequestedInvFolder">
+		無法建立要求的收納區資料夾。
+	</notification>
+	<notification name="CantCreateInventory">
+		無法建立該收納區。
+	</notification>
+	<notification name="CantCreateLandmark">
+		無法建立地標。
+	</notification>
+	<notification name="CantCreateOutfit">
+		此時無法建立裝扮。 請過一分鐘後再試。
+	</notification>
+	<notification name="InventoryNotForSale">
+		收納區沒有待售。
+	</notification>
+	<notification name="CantFindInvItem">
+		找不到收納區物項。
+	</notification>
+	<notification name="CantFindObject">
+		找不到物件。
+	</notification>
+	<notification name="CantTransfterMoneyRegionDisabled">
+		此地區目前未啟用轉移金錢給物件的功能。
+	</notification>
+	<notification name="CantPayNoAgent">
+		無法決定付款給誰。
+	</notification>
+	<notification name="CantDonateToPublicObjects">
+		你無法將 L$ 送給公共物件。
+	</notification>
+	<notification name="InventoryCreationInWorldObjectFailed">
+		針對虛擬世界物件建立收納區失敗。
+	</notification>
+	<notification name="UserBalanceOrLandUsageError">
+		發生內部錯誤，我們無法如常更新你的瀏覽器。  你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。
+	</notification>
+	<notification name="LargePrimAgentIntersect">
+		無法建立和其他參與者發生交截的大型幾何元件。  請等其他參與者移開後再試。
+	</notification>
+	<notification name="PreferenceChatClearLog">
+		這動作將刪除先前交談的記錄，和所有記錄備份。
+		<usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatDeleteTranscripts">
+		這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
+		<usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
+	</notification>
+	<notification name="PreferenceChatPathChanged">
+		無法移動檔案。 已恢復前一個路徑。
+		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
index 42a4aa9e85..42a4aa9e85 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/zh/panel_active_object_row.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
index 7d16ac4129..7d16ac4129 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_adhoc_control_panel.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index eccb938f15..e0a49a0add 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="avatar_list_item">
 	<string name="FormatSeconds">
-		[COUNT]s
+		[COUNT] 秒
 	</string>
 	<string name="FormatMinutes">
-		[COUNT]m
+		[COUNT] 分
 	</string>
 	<string name="FormatHours">
-		[COUNT]h
+		[COUNT] 時
 	</string>
 	<string name="FormatDays">
-		[COUNT]d
+		[COUNT] 日
 	</string>
 	<string name="FormatWeeks">
-		[COUNT]w
+		[COUNT] 週
 	</string>
 	<string name="FormatMonths">
-		[COUNT]mon
+		[COUNT] 月
 	</string>
 	<string name="FormatYears">
-		[COUNT]y
+		[COUNT] 年
 	</string>
-	<text name="avatar_name" value="（載入）"/>
-	<text name="last_interaction" value="0s"/>
+	<text name="avatar_name" value="（載入中）"/>
+	<text name="last_interaction" value="0 秒"/>
 	<icon name="permission_edit_theirs_icon" tool_tip="你不能編輯這位朋友的物件"/>
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
 	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
 	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
index fd91ea97d1..fd91ea97d1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_tag.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 1dfa024138..9f59bb32f8 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<text name="title_text">
-		封鎖清單
-	</text>
-	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
-	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
-	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
-	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
+	<panel label="bottom_panel" name="blocked_buttons_panel">
+		<filter_editor label="過濾器" name="blocked_filter_input"/>
+		<menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
+		<menu_button name="view_btn" tool_tip="排序選項"/>
+		<menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/>
+		<button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
+	</panel>
+	<block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
index 550868e5e5..fef692c1c5 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_body_parts_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="wearable_item">
 	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="你並沒有權限進行編輯"/>
+	<panel name="btn_lock" tool_tip="你沒有編輯權"/>
 	<panel name="btn_edit_panel">
 		<button name="btn_edit" tool_tip="編輯這個體形"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
index 5e269fcd09..e4e7a661a7 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bodyparts_list_button_bar.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-	<button label="Switch" name="switch_btn"/>
+	<button label="切換" name="switch_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
deleted file mode 100644
index 734b83e6cc..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Turns microphone on/off"/>
-	<string name="VoiceControlBtnToolTip" value="顯示 / 隱藏 語音控制板"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Speak" label_selected="Speak" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="姿勢" name="Gesture" tool_tip="顯示 / 隱藏 姿勢"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="移動" name="movement_btn" tool_tip="顯示 / 隱藏 移動控制"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="視角" name="camera_btn" tool_tip="顯示 / 隱藏 攝影機控制"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button name="snapshots" tool_tip="拍攝快照"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="建造" name="build_btn" tool_tip="顯示 / 隱藏 建造工具"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="搜尋" name="search_btn" tool_tip="顯示 / 隱藏 搜尋"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="地圖" name="world_map_btn" tool_tip="顯示 / 隱藏 世界地圖"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="迷你地圖" name="mini_map_btn" tool_tip="顯示 / 隱藏 迷你地圖"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversations"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="通知"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
index 9833e9ef8b..9833e9ef8b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_bottomtray_lite.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_chat_header.xml b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
index 7916bf5155..7916bf5155 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/zh/panel_chat_header.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
new file mode 100755
index 0000000000..69340349bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_chiclet_bar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="chiclet_bar">
+	<layout_stack name="toolbar_stack">
+		<layout_panel name="im_well_panel">
+			<chiclet_im_well name="im_well">
+				<button name="Unread IM messages" tool_tip="交談"/>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel name="notification_well_panel">
+			<chiclet_notification name="notification_well">
+				<button name="Unread" tool_tip="通知"/>
+			</chiclet_notification>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_classified_info.xml b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
index cf3113ef1c..6f2dd89318 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_classified_info.xml
@@ -16,33 +16,33 @@
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
 	</panel.string>
 	<panel.string name="auto_renew_on">
-		Enabled
+		已啟用
 	</panel.string>
 	<panel.string name="auto_renew_off">
-		Disabled
+		已停用
 	</panel.string>
-	<text name="title" value="Classified Info"/>
+	<text name="title" value="個人廣告資訊"/>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text_editor name="classified_name" value="[name]"/>
 			<text name="classified_location_label" value="位置："/>
 			<text_editor name="classified_location" value="[loading...]"/>
-			<text name="content_type_label" value="Content Type:"/>
+			<text name="content_type_label" value="內容類型："/>
 			<text_editor name="content_type" value="[content type]"/>
-			<text name="category_label" value="Category:"/>
+			<text name="category_label" value="分類："/>
 			<text_editor name="category" value="[category]"/>
-			<text name="creation_date_label" value="Creation date:"/>
-			<text_editor name="creation_date" tool_tip="Creation date" value="[date]"/>
-			<text name="price_for_listing_label" value="Price for listing:"/>
-			<text_editor name="price_for_listing" tool_tip="Price for listing." value="[price]"/>
+			<text name="creation_date_label" value="建立日期："/>
+			<text_editor name="creation_date" tool_tip="建立日期" value="[date]"/>
+			<text name="price_for_listing_label" value="刊登費："/>
+			<text_editor name="price_for_listing" tool_tip="刊登費。" value="[price]"/>
 			<layout_stack name="descr_stack">
 				<layout_panel name="clickthrough_layout_panel">
-					<text name="click_through_label" value="Clicks:"/>
-					<text_editor name="click_through_text" tool_tip="Click through data" value="[clicks]"/>
+					<text name="click_through_label" value="點按："/>
+					<text_editor name="click_through_text" tool_tip="點進資料" value="[clicks]"/>
 				</layout_panel>
 				<layout_panel name="price_layout_panel">
-					<text name="auto_renew_label" value="Auto renew:"/>
-					<text name="auto_renew" value="Enabled"/>
+					<text name="auto_renew_label" value="自動續訂："/>
+					<text name="auto_renew" value="已啟用"/>
 				</layout_panel>
 				<layout_panel name="descr_layout_panel">
 					<text name="classified_desc_label" value="描述："/>
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
index ba63dada76..ba63dada76 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_button_bar.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
index 1185336a2d..55e72f5347 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_clothing_list_item.xml
@@ -2,8 +2,8 @@
 <panel name="wearable_item">
 	<button name="btn_delete" tool_tip="由裝扮移除"/>
 	<text name="item_name" value="..."/>
-	<panel name="btn_lock" tool_tip="你並沒有權限去編輯"/>
+	<panel name="btn_lock" tool_tip="你沒有編輯權"/>
 	<panel name="btn_edit_panel">
-		<button name="btn_edit" tool_tip="Edit this wearable"/>
+		<button name="btn_edit" tool_tip="編輯這可穿裝扮"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
index 309ab1c0d4..c074abb568 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
+++ b/indra/newview/skins/default/xui/zh/panel_cof_wearables.xml
@@ -2,7 +2,7 @@
 <panel name="cof_wearables">
 	<accordion name="cof_wearables_accordion">
 		<accordion_tab name="tab_clothing" title="服裝"/>
-		<accordion_tab name="tab_attachments" title="Attachments"/>
+		<accordion_tab name="tab_attachments" title="附件"/>
 		<accordion_tab name="tab_body_parts" title="身體部位"/>
 	</accordion>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
new file mode 100644
index 0000000000..6524d41645
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_list_item">
+	<layout_stack name="conversation_item_stack">
+		<layout_panel name="conversation_title_panel">
+			<text name="conversation_title" value="（載入中）"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
new file mode 100644
index 0000000000..8446ce2130
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="conversation_log_list_item">
+	<icon name="voice_session_icon" tool_tip="包含語音交談"/>
+	<icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
+	<button name="delete_btn" tool_tip="移除此項目"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
index a9e65419c2..a9e65419c2 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_deletable_wearable_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
index 6377bf4135..6377bf4135 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_dummy_clothing_list_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
index eda4e99a13..32765a3e16 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_alpha.xml
@@ -2,11 +2,11 @@
 <panel name="edit_alpha_panel">
 	<scroll_container name="avatar_alpha_color_panel_scroll">
 		<panel name="avatar_alpha_color_panel">
-			<texture_picker label="下半身半透明" name="Lower Alpha" tool_tip="點擊以挑選圖像"/>
-			<texture_picker label="上半身半透明" name="Upper Alpha" tool_tip="點擊以挑選圖像"/>
-			<texture_picker label="頭部半透明" name="Head Alpha" tool_tip="點擊以挑選圖像"/>
-			<texture_picker label="眼睛半透明" name="Eye Alpha" tool_tip="點擊以挑選圖像"/>
-			<texture_picker label="頭髮半透明" name="Hair Alpha" tool_tip="點擊以挑選圖像"/>
+			<texture_picker label="下半身半透明" name="Lower Alpha" tool_tip="點按以挑選圖片"/>
+			<texture_picker label="上半身半透明" name="Upper Alpha" tool_tip="點按以挑選圖片"/>
+			<texture_picker label="頭部半透明" name="Head Alpha" tool_tip="點按以挑選圖片"/>
+			<texture_picker label="眼睛半透明" name="Eye Alpha" tool_tip="點按以挑選圖片"/>
+			<texture_picker label="頭髮半透明" name="Hair Alpha" tool_tip="點按以挑選圖片"/>
 		</panel>
 	</scroll_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
index f12701c981..b06ece02ad 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_classified.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Edit Classified" name="panel_edit_classified">
+<panel label="編輯個人廣告" name="panel_edit_classified">
 	<panel.string name="location_notice">
 		（儲存後將會更新）
 	</panel.string>
 	<string name="publish_label">
-		Publish
+		發布
 	</string>
 	<string name="save_label">
 		儲存
 	</string>
 	<text name="title">
-		Edit Classified
+		編輯個人廣告
 	</text>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<panel name="snapshot_panel">
-				<icon label="" name="edit_icon" tool_tip="點擊以選擇圖像"/>
+				<icon label="" name="edit_icon" tool_tip="點按以選擇圖像"/>
 			</panel>
 			<text name="Name:">
-				Title:
+				標題：
 			</text>
 			<text name="description_label">
 				描述：
@@ -29,16 +29,16 @@
 			<text name="classified_location">
 				載入中...
 			</text>
-			<button label="Set to Current Location" name="set_to_curr_location_btn"/>
-			<text name="category_label" value="Category:"/>
-			<text name="content_type_label" value="Content type:"/>
+			<button label="設定為目前位置" name="set_to_curr_location_btn"/>
+			<text name="category_label" value="分類："/>
+			<text name="content_type_label" value="內容類型："/>
 			<icons_combo_box label="一般普級內容" name="content_type">
-				<icons_combo_box.item label="適度成人內容" name="mature_ci" value="Mature"/>
-				<icons_combo_box.item label="一般普級內容" name="pg_ci" value="PG"/>
+				<icons_combo_box.item label="適度成人內容" name="mature_ci" value="適度成人"/>
+				<icons_combo_box.item label="一般普級內容" name="pg_ci" value="一般普級"/>
 			</icons_combo_box>
-			<check_box label="Auto renew each week" name="auto_renew"/>
-			<text name="price_for_listing_label" value="Price for listing:"/>
-			<spinner label="L$" name="price_for_listing" tool_tip="Price for listing." value="50"/>
+			<check_box label="每星期自動續訂" name="auto_renew"/>
+			<text name="price_for_listing_label" value="刊登費："/>
+			<spinner label="L$" name="price_for_listing" tool_tip="刊登費。" value="50"/>
 		</panel>
 	</scroll_container>
 	<panel label="bottom_panel" name="bottom_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
index 40dd61971a..f44d411908 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_eyes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_eyes_panel">
 	<panel name="avatar_eye_color_panel">
-		<texture_picker label="Iris" name="Iris" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="虹膜" name="Iris" tool_tip="點按以挑選圖片"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
index 7b39e33a9b..d107eea553 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_gloves.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_gloves_panel">
 	<panel name="avatar_gloves_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
index a7440093bc..65f78f9273 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_hair.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_hair_panel">
 	<panel name="avatar_hair_color_panel">
-		<texture_picker label="材質" name="Texture" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="材質" name="Texture" tool_tip="點按以挑選圖片"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
 			<accordion_tab name="hair_color_tab" title="顏色"/>
-			<accordion_tab name="hair_style_tab" title="Style"/>
-			<accordion_tab name="hair_eyebrows_tab" title="Eyebrows"/>
-			<accordion_tab name="hair_facial_tab" title="Facial"/>
+			<accordion_tab name="hair_style_tab" title="風格"/>
+			<accordion_tab name="hair_eyebrows_tab" title="眉毛"/>
+			<accordion_tab name="hair_facial_tab" title="顏面"/>
 		</accordion>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
index dcef070e2e..61e45f911e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_jacket.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_jacket_panel">
 	<panel name="avatar_jacket_color_panel">
-		<texture_picker label="上半身材質" name="Upper Fabric" tool_tip="點擊以挑選圖像"/>
-		<texture_picker label="下半身材質" name="Lower Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<texture_picker label="上半身材質" name="Upper Fabric" tool_tip="點按以挑選圖片"/>
+		<texture_picker label="下半身材質" name="Lower Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
index 01b875f1bd..846ed72961 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pants.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_pants_panel">
 	<panel name="avatar_pants_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
index 26fedb59be..26fedb59be 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_physics.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
index 6ac7226185..faee42fd0e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_pick.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="編輯精選地點" name="panel_edit_pick">
 	<panel.string name="location_notice">
-		（將在儲存後更新）
+		（儲存後將會更新）
 	</panel.string>
 	<text name="title">
 		編輯精選地點
 	</text>
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
-			<icon label="" name="edit_icon" tool_tip="點擊以選擇圖像"/>
+			<icon label="" name="edit_icon" tool_tip="點按以選擇圖像"/>
 			<text name="Name:">
 				標題：
 			</text>
@@ -29,7 +29,7 @@
 			<layout_panel name="layout_panel1">
 				<button label="儲存精選地點" name="save_changes_btn"/>
 			</layout_panel>
-			<layout_panel name="layout_panel1">
+			<layout_panel name="layout_panel2">
 				<button label="取消" name="cancel_btn"/>
 			</layout_panel>
 		</layout_stack>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
index 7734c3a417..849b82c71a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_profile.xml
@@ -7,15 +7,15 @@
 	<string name="RegisterDateFormat">
 		[REG_DATE] ([AGE])
 	</string>
-	<string name="AcctTypeResident" value="Resident"/>
-	<string name="AcctTypeTrial" value="Trial"/>
-	<string name="AcctTypeCharterMember" value="Charter Member"/>
-	<string name="AcctTypeEmployee" value="Linden Lab Employee"/>
-	<string name="PaymentInfoUsed" value="Payment Info Used"/>
-	<string name="PaymentInfoOnFile" value="Payment Info On File"/>
-	<string name="NoPaymentInfoOnFile" value="No Payment Info On File"/>
-	<string name="AgeVerified" value="Age-verified"/>
-	<string name="NotAgeVerified" value="Not Age-verified"/>
+	<string name="AcctTypeResident" value="居民"/>
+	<string name="AcctTypeTrial" value="試用"/>
+	<string name="AcctTypeCharterMember" value="老牌 Charter 成員"/>
+	<string name="AcctTypeEmployee" value="林登實驗室員工"/>
+	<string name="PaymentInfoUsed" value="使用的付款資料"/>
+	<string name="PaymentInfoOnFile" value="預留付款資料"/>
+	<string name="NoPaymentInfoOnFile" value="未預留付款資料"/>
+	<string name="AgeVerified" value="通過年齡驗證"/>
+	<string name="NotAgeVerified" value="未通過年齡驗證"/>
 	<string name="partner_edit_link_url">
 		http://www.secondlife.com/account/partners.php?lang=en
 	</string>
@@ -34,22 +34,22 @@
 					<panel name="second_life_image_panel">
 						<text name="second_life_photo_title_text" value="[SECOND_LIFE]:"/>
 					</panel>
-					<icon label="" name="2nd_life_edit_icon" tool_tip="點擊以選擇圖像"/>
+					<icon label="" name="2nd_life_edit_icon" tool_tip="點按以選擇圖像"/>
 				</panel>
 				<panel name="first_life_image_panel">
 					<text name="real_world_photo_title_text" value="真實世界："/>
 				</panel>
-				<icon label="" name="real_world_edit_icon" tool_tip="點擊以選擇圖像"/>
+				<icon label="" name="real_world_edit_icon" tool_tip="點按以選擇圖像"/>
 				<text name="title_homepage_text">
 					首頁：
 				</text>
 				<line_editor name="homepage_edit" value="http://"/>
 				<text name="title_acc_status_text" value="我的帳戶："/>
-				<text_editor name="acc_status_text" value="Resident. No payment info on file."/>
+				<text_editor name="acc_status_text" value="居民。 未預留付款資料。"/>
 				<text name="my_account_link" value="[[URL] 前往我的塗鴉牆]"/>
 				<text name="title_partner_text" value="我的配偶："/>
 				<panel name="partner_data_panel">
-					<text initial_value="(retrieving)" name="partner_text"/>
+					<text initial_value="（檢索中）" name="partner_text"/>
 				</panel>
 				<text name="partner_edit_link" value="[[URL] 編輯]"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
index f249100786..f249100786 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shape.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
index f8ff76aa9b..bc69f2ffc4 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shirt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shirt_panel">
 	<panel name="avatar_shirt_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
index 97e43f5753..e190bb5bd8 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_shoes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_shoes_panel">
 	<panel name="avatar_shoes_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
index fdd6d05ca5..d8552f52f0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skin.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skin_panel">
 	<panel name="avatar_skin_color_panel">
-		<texture_picker label="Head Tattoos" name="Head Tattoos" tool_tip="點擊以挑選圖像"/>
-		<texture_picker label="Upper Tattoos" name="Upper Tattoos" tool_tip="點擊以挑選圖像"/>
-		<texture_picker label="Lower Tattoos" name="Lower Tattoos" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="頭部" name="Head" tool_tip="點按以挑選圖片"/>
+		<texture_picker label="上半身" name="Upper Body" tool_tip="點按以挑選圖片"/>
+		<texture_picker label="下半身" name="Lower Body" tool_tip="點按以挑選圖片"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
-			<accordion_tab name="skin_color_tab" title="Skin Color"/>
-			<accordion_tab name="skin_face_tab" title="Face Detail"/>
-			<accordion_tab name="skin_makeup_tab" title="Makeup"/>
-			<accordion_tab name="skin_body_tab" title="Body Detail"/>
+			<accordion_tab name="skin_color_tab" title="膚色"/>
+			<accordion_tab name="skin_face_tab" title="臉部細節"/>
+			<accordion_tab name="skin_makeup_tab" title="化妝"/>
+			<accordion_tab name="skin_body_tab" title="身體細節"/>
 		</accordion>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
index 10432c16b1..34319fcc01 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_skirt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_skirt_panel">
 	<panel name="avatar_skirt_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
index 6727781740..8e19fb5692 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_socks.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_socks_panel">
 	<panel name="avatar_socks_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
index 1b34a0e0ee..f5111d629a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_tattoo.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_tattoo_panel">
 	<panel name="avatar_tattoo_color_panel">
-		<texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點擊以挑選圖像"/>
-		<texture_picker label="上半身刺青" name="Upper Tattoo" tool_tip="點擊以挑選照片"/>
-		<texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="點擊以開啟顏色挑選器"/>
+		<texture_picker label="頭部刺青" name="Head Tattoo" tool_tip="點按以挑選圖片"/>
+		<texture_picker label="上半身刺青" name="Upper Tattoo" tool_tip="點按以挑選圖片"/>
+		<texture_picker label="下半身刺青" name="Lower Tattoo" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
index 15cae8d233..5ead7c9004 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_underpants.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_underpants_panel">
 	<panel name="avatar_underpants_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open color picker"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
index 486175eb64..e497e285c9 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_undershirt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="edit_undershirt_panel">
 	<panel name="avatar_undershirt_color_panel">
-		<texture_picker label="材質" name="Fabric" tool_tip="點擊以挑選圖像"/>
-		<color_swatch label="Color/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
+		<texture_picker label="材質" name="Fabric" tool_tip="點按以挑選圖片"/>
+		<color_swatch label="顏色/色調" name="Color/Tint" tool_tip="點按以開啟顏色挑選器"/>
 	</panel>
 	<panel name="accordion_panel">
 		<accordion name="wearable_accordion">
diff --git a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
index 066b1fd389..4dd7ea6d93 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
+++ b/indra/newview/skins/default/xui/zh/panel_edit_wearable.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Wearable" name="panel_edit_wearable">
+<panel label="可穿裝扮" name="panel_edit_wearable">
 	<string name="edit_shape_title">
-		Editing Shape
+		體形編輯中
 	</string>
 	<string name="edit_skin_title">
-		Editing Skin
+		編輯皮膚
 	</string>
 	<string name="edit_hair_title">
-		Editing Hair
+		編輯頭髮
 	</string>
 	<string name="edit_eyes_title">
-		Editing Eyes
+		編輯眼睛
 	</string>
 	<string name="edit_shirt_title">
-		Editing Shirt
+		編輯襯衫
 	</string>
 	<string name="edit_pants_title">
-		Editing Pants
+		編輯褲子
 	</string>
 	<string name="edit_shoes_title">
-		Editing Shoes
+		編輯鞋子
 	</string>
 	<string name="edit_socks_title">
-		Editing Socks
+		編輯襪子
 	</string>
 	<string name="edit_jacket_title">
-		Editing Jacket
+		編輯外套
 	</string>
 	<string name="edit_skirt_title">
-		Editing Skirt
+		編輯裙子
 	</string>
 	<string name="edit_gloves_title">
-		Editing Gloves
+		編輯手套
 	</string>
 	<string name="edit_undershirt_title">
-		Editing Undershirt
+		編輯內衣
 	</string>
 	<string name="edit_underpants_title">
-		Editing Underpants
+		編輯內褲
 	</string>
 	<string name="edit_alpha_title">
 		半透明遮罩編輯中
@@ -110,7 +110,7 @@
 	<panel name="button_panel">
 		<layout_stack name="button_panel_ls">
 			<layout_panel name="save_as_btn_lp">
-				<button label="另存" name="save_as_button"/>
+				<button label="另存為" name="save_as_button"/>
 			</layout_panel>
 			<layout_panel name="revert_btn_lp">
 				<button label="復原變更" name="revert_button"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
index 3915e80d43..f468aba514 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_control_panel.xml
@@ -8,7 +8,7 @@
 			<button label="群組通話" name="call_btn"/>
 		</layout_panel>
 		<layout_panel name="end_call_btn_panel">
-			<button label="結束通話" name="end_call_btn"/>
+			<button label="離開通話" name="end_call_btn"/>
 		</layout_panel>
 		<layout_panel name="voice_ctrls_btn_panel">
 			<button label="開啟語音控制" name="voice_ctrls_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_general.xml b/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 55cbf5a617..2b16b61dd1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="一般" name="general_tab">
+<panel label="基本資料" name="general_tab">
 	<panel.string name="help_text">
-		The General tab contains general information about this group, a list of members, general Group Preferences and member options.
+		基本資料頁籤包含關於群組的基本資訊、成員名單、群組偏好設定和成員選項。
 
-Hover your mouse over the options for more help.
+將滑鼠停懸到選項上，可獲取更多幫助。
 	</panel.string>
 	<panel.string name="group_info_unchanged">
-		一般群組資訊已經被變更
+		基本群組資訊已經被變更
 	</panel.string>
 	<panel.string name="incomplete_member_data_str">
-		Retrieving member data
+		正在擷取成員資料
 	</panel.string>
 	<panel name="group_info_top">
-		<texture_picker label="" name="insignia" tool_tip="點擊以挑選圖像"/>
+		<texture_picker label="" name="insignia" tool_tip="點按以挑選圖片"/>
 		<text name="prepend_founded_by">
 			創辦人：
 		</text>
@@ -30,22 +30,22 @@ Hover your mouse over the options for more help.
 		<name_list.columns label="狀態" name="status"/>
 	</name_list>
 	<text name="my_group_settngs_label">
-		自己
+		我自己
 	</text>
 	<text name="active_title_label">
 		我的頭銜：
 	</text>
-	<combo_box name="active_title" tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active."/>
-	<check_box label="接受群組通知" name="receive_notices" tool_tip="Sets whether you want to receive Notices from this group.  Uncheck this box if this group is spamming you."/>
-	<check_box label="顯示在我的檔案中" name="list_groups_in_profile" tool_tip="Sets whether you want to show this group in your profile"/>
+	<combo_box name="active_title" tool_tip="這將設定當群組有效時，顯示於你化身名稱標籤的頭銜。"/>
+	<check_box label="接受群組通知" name="receive_notices" tool_tip="設定你是否要接收來自這群組的通知。  如果該群組對你送出太多垃圾資訊，你可以不要勾選此項目。"/>
+	<check_box label="顯示在我的檔案中" name="list_groups_in_profile" tool_tip="設定你是否要在你個人檔案上顯示這個群組"/>
 	<panel name="preferences_container">
 		<text name="group_settngs_label">
 			群組
 		</text>
-		<check_box label="任何人都可以加入" name="open_enrollement" tool_tip="Sets whether this group allows new members to join without being invited."/>
-		<check_box label="加入費用" name="check_enrollment_fee" tool_tip="Sets whether to require an enrollment fee to join the group"/>
-		<spinner label="L$" name="spin_enrollment_fee" tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."/>
-		<combo_box name="group_mature_check" tool_tip="Sets whether your group contains information rated as Moderate">
+		<check_box label="任何人都可以加入" name="open_enrollement" tool_tip="設定這個群組是否允許新成員未受邀請自行加入。"/>
+		<check_box label="加入費用" name="check_enrollment_fee" tool_tip="設定是否要徵收群組加入費"/>
+		<spinner label="L$" name="spin_enrollment_fee" tool_tip="若勾選加入費，新成員必須支付這筆費用才能加入群組。"/>
+		<combo_box name="group_mature_check" tool_tip="設定你的群組是否含有被訂為適度成人分級的資訊">
 			<combo_item name="select_mature">
 				- 選擇內容分級 -
 			</combo_item>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
index db01edcdb3..f979a4c53e 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_info_sidetray.xml
@@ -19,7 +19,7 @@
 	<layout_stack name="layout">
 		<layout_panel name="group_accordions">
 			<accordion name="groups_accordion">
-				<accordion_tab name="group_general_tab" title="一般"/>
+				<accordion_tab name="group_general_tab" title="基本資料"/>
 				<accordion_tab name="group_roles_tab" title="角色"/>
 				<accordion_tab name="group_notices_tab" title="通知"/>
 				<accordion_tab name="group_land_tab" title="土地 / 資產"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 07dcb2303e..8921978b20 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="邀請一個成員" name="invite_panel">
 	<panel.string name="confirm_invite_owner_str">
-		Are you sure you want to invite new owner(s)? This action is permanent!
+		確定邀請新的所有人？ 這動作一旦完成，不能取消！
 	</panel.string>
 	<panel.string name="loading">
 		（載入中...）
 	</panel.string>
 	<panel.string name="already_in_group">
-		Some Residents you chose are already in the group, and so were not sent an invitation.
+		你所選的居民有些已經在群組裡，所以不會再對他們發送邀請。
+	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		未送出群組邀請：所選的居民人數太多。 群組邀請每次以 100 人為上限。
 	</panel.string>
 	<text name="help_text">
-		You can select multiple Residents to invite to your group. Click &apos;Open Resident Chooser&apos; to start.
+		你可以選擇邀請多位居民到你的群組來。 點按「開啟居民選擇工具」開始選擇。
 	</text>
-	<button label="開啟居民選擇視窗" name="add_button"/>
-	<name_list name="invitee_list" tool_tip="Hold the Ctrl key and click Resident names to multi-select"/>
-	<button label="Remove Selected from List" name="remove_button" tool_tip="Removes the Residents selected above from the invite list"/>
+	<button label="開啟居民選擇工具" name="add_button"/>
+	<name_list name="invitee_list" tool_tip="按下 Ctrl 鍵同時點選居民的名字，即可選取多個人"/>
+	<button label="將所選的從名單移除" name="remove_button" tool_tip="將上面所選居民從邀請名單中移除"/>
 	<text name="role_text">
-		Choose what Role to assign them to:
+		選擇指派給他們的角色：
 	</text>
-	<combo_box name="role_name" tool_tip="Choose from the list of Roles you are allowed to assign members to"/>
+	<combo_box name="role_name" tool_tip="從角色清單選擇你有權指派給成員的角色："/>
 	<button label="送出邀請" name="ok_button"/>
 	<button label="取消" name="cancel_button"/>
 	<string name="GroupInvitation">
diff --git a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 5ac7410c8b..81d5573e1c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Land &amp; L$" name="land_money_tab">
+<panel label="土地和 L$" name="land_money_tab">
 	<panel.string name="help_text">
-		A warning appears until the Total Land in Use is less than or = to the Total Contribution.
+		將持續出現警示，直到使用中總土地小於或等於總貢獻面積為止。
 	</panel.string>
 	<panel.string name="cant_view_group_land_text">
-		You don&apos;t have permission to view group owned land
+		你無權察看群組所有地。
 	</panel.string>
 	<panel.string name="epmty_view_group_land_text">
 		沒有項目
 	</panel.string>
 	<panel.string name="cant_view_group_accounting_text">
-		You don&apos;t have permission to view the group&apos;s accounting information.
+		你無權察看該群組的帳目資料。
 	</panel.string>
 	<panel.string name="loading_txt">
 		載入中...
@@ -27,42 +27,42 @@
 			<scroll_list.columns label="隱藏" name="hidden"/>
 		</scroll_list>
 		<text name="total_contributed_land_label">
-			Total contribution:
+			總貢獻：
 		</text>
 		<text name="total_contributed_land_value">
-			[AREA] m²
+			[AREA] 平方公尺
 		</text>
 		<button label="地圖" label_selected="地圖" name="map_button"/>
 		<text name="total_land_in_use_label">
-			Total land in use:
+			使用中土地總面積：
 		</text>
 		<text name="total_land_in_use_value">
-			[AREA] m²
+			[AREA] 平方公尺
 		</text>
 		<text name="land_available_label">
-			Land available:
+			可用土地：
 		</text>
 		<text name="land_available_value">
-			[AREA] m²
+			[AREA] 平方公尺
 		</text>
 		<text name="your_contribution_label">
 			你的捐獻：
 		</text>
 		<text name="your_contribution_units">
-			m²
+			平方公尺
 		</text>
 		<text name="your_contribution_max_value">
 			（[AMOUNT] 最大）
 		</text>
 		<text name="group_over_limit_text">
-			More land credits are needed to support land in use
+			使用中土地需要更大的土地額度
 		</text>
 		<text name="group_money_heading">
 			群組 L$
 		</text>
 	</panel>
 	<tab_container name="group_money_tab_container">
-		<panel label="PLANNING" name="group_money_planning_tab">
+		<panel label="策劃" name="group_money_planning_tab">
 			<text_editor name="group_money_planning_text">
 				載入中...
 			</text_editor>
@@ -71,15 +71,15 @@
 			<text_editor name="group_money_details_text">
 				載入中...
 			</text_editor>
-			<button name="earlier_details_button" tool_tip="Back"/>
-			<button name="later_details_button" tool_tip="Next"/>
+			<button name="earlier_details_button" tool_tip="返回"/>
+			<button name="later_details_button" tool_tip="下一個"/>
 		</panel>
 		<panel label="銷售" name="group_money_sales_tab">
 			<text_editor name="group_money_sales_text">
 				載入中...
 			</text_editor>
-			<button name="earlier_sales_button" tool_tip="Back"/>
-			<button name="later_sales_button" tool_tip="Next"/>
+			<button name="earlier_sales_button" tool_tip="返回"/>
+			<button name="later_sales_button" tool_tip="下一個"/>
 		</panel>
 	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index 175293cdf7..fec4bb572a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
+	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index 26273dd9ce..ba5f4f1bba 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知" name="notices_tab">
 	<panel.string name="help_text">
-		Notices let you send a message and an optionally attached item.
-Notices only go to group members in Roles with the ability to receive Notices.
-You can turn off Notices on the General tab.
+		通知可讓你傳送訊息並選擇性地附上一個附件。
+通知僅能傳給可接收通知的角色的群組成員。
+你可到基本資料頁籤停用通知功能。
 	</panel.string>
 	<panel.string name="no_notices_text">
 		沒有過去的通知
@@ -21,7 +21,7 @@ You can turn off Notices on the General tab.
 		沒發現。
 	</text>
 	<button label="新通知" name="create_new_notice" tool_tip="建立一個新通知"/>
-	<button name="refresh_notices" tool_tip="Refresh list of notices"/>
+	<button name="refresh_notices" tool_tip="刷新通知清單。"/>
 	<panel label="建立新通知" name="panel_create_new_notice">
 		<text name="lbl">
 			建立一個通知
@@ -36,19 +36,19 @@ You can turn off Notices on the General tab.
 			附件：
 		</text>
 		<text name="string">
-			將物品拖曳並丟於此處以添加為附件：
+			拖曳並置放物品到這裡，即可添加為附件：
 		</text>
 		<button label="收納區" name="open_inventory" tool_tip="開啟收納區"/>
 		<button name="remove_attachment" tool_tip="由你的通知移除附件"/>
 		<button label="送出" label_selected="送出" name="send_notice"/>
-		<group_drop_target name="drop_target" tool_tip="Drag an inventory item onto this target box to send it with this notice. You must have permission to copy and transfer the item in order to attach it."/>
+		<group_drop_target name="drop_target" tool_tip="將一個收納區物項拖曳到這個目標箱框，便可隨通知送出該物項。 你必須有權複製並轉移此物項，才可以附加它。"/>
 	</panel>
 	<panel label="察看過去的通知" name="panel_view_past_notice">
 		<text name="lbl">
 			存檔的通知
 		</text>
 		<text name="lbl2">
-			要送出一個新通知，點擊 + 按鈕
+			要送出一個新通知，點按 + 按鈕
 		</text>
 		<text name="lbl3">
 			主旨：
diff --git a/indra/newview/skins/default/xui/zh/panel_group_notify.xml b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
index 00462d8b0b..08a8c94876 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml
@@ -3,10 +3,10 @@
 	<string name="message_max_lines_count" value="7"/>
 	<string name="subject_font" value="SANSSERIF_BIG"/>
 	<string name="date_font" value="SANSSERIF"/>
-	<panel label="header" name="header">
-		<text name="title" value="Sender Name / Group Name"/>
+	<panel label="表頭" name="header">
+		<text name="title" value="發件者名/群組名"/>
 	</panel>
 	<text_editor name="message" value="訊息"/>
-	<text name="attachment" value="Attachment"/>
+	<text name="attachment" value="附件"/>
 	<button label="確定" name="btn_ok"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index cf5fc26d14..59086c3de2 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="成員與角色" name="roles_tab">
 	<panel.string name="default_needs_apply_text">
-		未儲存的設定
+		變更未儲存
 	</panel.string>
 	<panel.string name="want_apply_text">
 		你要儲存你的變更嗎？
@@ -11,10 +11,10 @@
 			<panel.string name="help_text">
 				你可以添加或移除一個角色指派給成員。
 選責多個成員時同時按著 Ctrl 鍵且
-使用滑鼠左鍵點擊他們的名字。
+使用滑鼠左鍵點按他們的名字。
 			</panel.string>
 			<panel.string name="donation_area">
-				[AREA] m²
+				[AREA] 平方公尺
 			</panel.string>
 			<filter_editor label="成員過濾器" name="filter_input"/>
 			<name_list name="member_list">
@@ -27,13 +27,12 @@
 		</panel>
 		<panel label="角色" name="roles_sub_tab">
 			<panel.string name="help_text">
-				Roles have a title and an allowed list of Abilities
-that Members can perform. Members can belong to
-one or more Roles. A group can have up to 10 Roles,
-including the Everyone and Owner Roles.
+				一個角色具備職稱和該角色可使用的能力。 
+一位成員可有一到多個角色。 
+一個群組至多可有 10 個角色，包括「任何人」和「所有人」。
 			</panel.string>
 			<panel.string name="cant_delete_role">
-				The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can&apos;t be deleted.
+				「任何人」和「所有人」是特設角色，不得刪除。
 			</panel.string>
 			<filter_editor label="角色過濾器" name="filter_input"/>
 			<scroll_list name="role_list">
@@ -44,13 +43,13 @@ including the Everyone and Owner Roles.
 			<button label="新角色" name="role_create"/>
 			<button label="刪除角色" name="role_delete"/>
 		</panel>
-		<panel label="能力" name="actions_sub_tab" tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.">
+		<panel label="能力" name="actions_sub_tab" tool_tip="你可察看關於某一能力的說明，並得知哪些角色和成員擁有該能力。">
 			<panel.string name="help_text">
-				Abilities allow Members in Roles to do specific
-things in this group. There&apos;s a broad variety of Abilities.
+				「能力」可讓群組的成員透過角色行使一定的職權。 
+能力的種類繁多。
 			</panel.string>
 			<filter_editor label="能力過濾器" name="filter_input"/>
-			<scroll_list name="action_list" tool_tip="Select an Ability to view more details"/>
+			<scroll_list name="action_list" tool_tip="請選取一個能力以察看詳情。"/>
 		</panel>
 	</tab_container>
 	<panel name="members_footer">
@@ -60,7 +59,7 @@ things in this group. There&apos;s a broad variety of Abilities.
 		<text name="static2">
 			允許的能力
 		</text>
-		<scroll_list name="member_allowed_actions" tool_tip="想瞭解有關於允許的能力的細節請查閱能力頁籤"/>
+		<scroll_list name="member_allowed_actions" tool_tip="想瞭解每一項允許的能力的詳情請查閱能力頁籤。"/>
 	</panel>
 	<panel name="roles_footer">
 		<text name="static">
@@ -75,15 +74,15 @@ things in this group. There&apos;s a broad variety of Abilities.
 		<text name="static4">
 			指派角色
 		</text>
-		<check_box label="Reveal members" name="role_visible_in_list" tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."/>
+		<check_box label="顯示成員" name="role_visible_in_list" tool_tip="設定是否讓群組外的人在「一般」頁籤上察看到此角色的成員。"/>
 		<text name="static5">
 			允許的能力
 		</text>
-		<scroll_list name="role_allowed_actions" tool_tip="想瞭解有關於每一項允許的能力的細節請查閱能力頁籤"/>
+		<scroll_list name="role_allowed_actions" tool_tip="想瞭解每一項允許的能力的詳情請查閱能力頁籤。"/>
 	</panel>
 	<panel name="actions_footer">
 		<text_editor name="action_description">
-			This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+			這個能力可「將會員自本群組踢出」。 必須是所有人才可踢出另一位所有人。
 		</text_editor>
 		<text name="static2">
 			有此能力的角色
diff --git a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
index 703182e04d..e937368a2b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/zh/panel_im_control_panel.xml
@@ -8,7 +8,7 @@
 			<button label="加為朋友" name="add_friend_btn"/>
 		</layout_panel>
 		<layout_panel name="teleport_btn_panel">
-			<button label="瞬間傳送" name="teleport_btn" tool_tip="Offer to teleport this person"/>
+			<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請給此人"/>
 		</layout_panel>
 		<layout_panel name="share_btn_panel">
 			<button label="分享" name="share_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_instant_message.xml b/indra/newview/skins/default/xui/zh/panel_instant_message.xml
index cf9bc7fccb..cf9bc7fccb 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/zh/panel_instant_message.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
index d18047fbcf..d18047fbcf 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_inventory_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
index d86ba7bc7c..b50aa24d3f 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmark_info.xml
@@ -3,22 +3,22 @@
 	<string name="title_create_landmark" value="創造地標"/>
 	<string name="title_edit_landmark" value="編輯地標"/>
 	<string name="title_landmark" value="地標"/>
-	<string name="not_available" value="(N\A)"/>
+	<string name="not_available" value="（不適用）"/>
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
 	<string name="server_update_text">
-		Place information not available without server update.
+		地點資訊因無伺服器更新故無法提供。
 	</string>
 	<string name="server_error_text">
-		Information about this location is unavailable at this time, please try again later.
+		目前無法取得此位置的訊息，請稍候再試。
 	</string>
 	<string name="server_forbidden_text">
-		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+		權限不足，無法取得此位置的資訊。  請向地段所有人查詢你的權限。
 	</string>
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</string>
-	<button name="back_btn" tool_tip="Back"/>
+	<button name="back_btn" tool_tip="返回"/>
 	<text name="title" value="地點檔案"/>
 	<scroll_container name="place_scroll">
 		<panel name="scrolling_panel">
@@ -27,13 +27,13 @@
 			<expandable_text name="description" value="Du waltz die spritz"/>
 			<text name="maturity_value" value="未知"/>
 			<panel name="landmark_info_panel">
-				<text name="owner_label" value="擁有者："/>
+				<text name="owner_label" value="所有人："/>
 				<text name="creator_label" value="創造者："/>
 				<text name="created_label" value="創造於："/>
 			</panel>
 			<panel name="landmark_edit_panel">
-				<text name="title_label" value="Title:"/>
-				<text name="notes_label" value="My notes:"/>
+				<text name="title_label" value="標題："/>
+				<text name="notes_label" value="我的記事："/>
 				<text name="folder_label" value="地標位置："/>
 			</panel>
 		</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_landmarks.xml b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
index eea406170a..eea406170a 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_landmarks.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_login.xml b/indra/newview/skins/default/xui/zh/panel_login.xml
index b227fbcfc8..672d9bb1a2 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
-	<panel.string name="create_account_url">
-		http://join.secondlife.com/
-	</panel.string>
 	<panel.string name="forgot_password_url">
 		http://secondlife.com/account/request.php
 	</panel.string>
 	<layout_stack name="login_widgets">
 		<layout_panel name="login">
+			<text name="log_in_text">
+				登入
+			</text>
 			<text name="username_text">
 				使用者名稱：
 			</text>
@@ -15,34 +15,32 @@
 			<text name="password_text">
 				密碼：
 			</text>
-			<check_box label="記住密碼：" name="remember_check"/>
-			<button label="登入" name="connect_btn"/>
-			<text name="mode_selection_text">
-				模式：
-			</text>
-			<combo_box name="mode_combo" tool_tip="請選擇你的模式。選用基本模式可以快速、簡單地探索與聊天；選用進階模式則可以使用更多功能。">
-				<combo_box.item label="基本" name="Basic"/>
-				<combo_box.item label="進階" name="Advanced"/>
-			</combo_box>
+		</layout_panel>
+		<layout_panel name="start_location_panel">
 			<text name="start_location_text">
 				開始地點：
 			</text>
 			<combo_box name="start_location_combo">
 				<combo_box.item label="我上一次位置" name="MyLastLocation"/>
 				<combo_box.item label="我的家" name="MyHome"/>
-				<combo_box.item label="&lt; 請輸入地區名稱 &gt;" name="Typeregionname"/>
+				<combo_box.item label="&lt;請輸入地區名稱&gt;" name="Typeregionname"/>
 			</combo_box>
 		</layout_panel>
-		<layout_panel name="links">
-			<text name="create_new_account_text">
-				註冊
+		<layout_panel name="links_login_panel">
+			<text name="login_help">
+				登入時需要幫助？
 			</text>
 			<text name="forgot_password_text">
 				忘記你的使用者名稱或密碼？
 			</text>
-			<text name="login_help">
-				登入時需要幫助？
+			<button label="登入" name="connect_btn"/>
+			<check_box label="記住密碼：" name="remember_check"/>
+		</layout_panel>
+		<layout_panel name="links">
+			<text name="create_account_text">
+				建立你的帳號
 			</text>
+			<button label="現在就開始" name="create_new_account_btn"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 53ecf3eb19..0ad3d8506d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="事物" name="main inventory panel">
 	<panel.string name="ItemcountFetching">
-		Fetching [ITEM_COUNT] Items... [FILTER]
+		正在擷取 [ITEM_COUNT] 個物項… [FILTER]
 	</panel.string>
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] 物品 [FILTER]
diff --git a/indra/newview/skins/default/xui/zh/panel_me.xml b/indra/newview/skins/default/xui/zh/panel_me.xml
index a236dfc17a..aad1348e46 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_me.xml
+++ b/indra/newview/skins/default/xui/zh/panel_me.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="我的檔案" name="panel_me">
-	<tab_container name="tabs">
-		<panel label="我的檔案" name="panel_profile"/>
-		<panel label="我的精選地點" name="panel_picks"/>
-	</tab_container>
+<panel label="我的個人檔案" name="panel_me">
+	<panel label="我的精選地點" name="panel_picks"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
index 321c003acd..0c11befcf5 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_general.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="一般" name="Media Settings General">
+<panel label="基本設定" name="Media Settings General">
 	<text name="home_label">
 		首頁：
 	</text>
 	<text name="home_fails_whitelist_label">
-		(This page does not pass the specified whitelist)
+		（這頁面未通過所指定的許可清單）
 	</text>
-	<line_editor name="home_url" tool_tip="The home page for this media source"/>
+	<line_editor name="home_url" tool_tip="這個媒體來源的首頁"/>
 	<text name="preview_label">
 		預覽
 	</text>
 	<text name="current_url_label">
 		目前頁面：
 	</text>
-	<text name="current_url" tool_tip="The current page for this media source" value=""/>
+	<text name="current_url" tool_tip="這個媒體來源目前的頁面" value=""/>
 	<button label="重設" name="current_url_reset_btn"/>
-	<check_box initial_value="false" label="Auto Loop" name="auto_loop"/>
-	<check_box initial_value="false" label="First Click Interacts" name="first_click_interact"/>
+	<check_box initial_value="false" label="自動連續播放" name="auto_loop"/>
+	<check_box initial_value="false" label="第一次點擊將進行互動" name="first_click_interact"/>
 	<check_box initial_value="false" label="自動縮放" name="auto_zoom"/>
 	<check_box initial_value="false" label="自動播放媒體" name="auto_play"/>
 	<text name="media_setting_note">
-		Note: Residents can override this setting
+		注意：居民可以否定這項設定
 	</text>
-	<check_box initial_value="false" label="Auto Scale Media on Face of Object" name="auto_scale"/>
+	<check_box initial_value="false" label="物件臉部媒體自動調整比例" name="auto_scale"/>
 	<text name="size_label">
 		尺寸：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
index 173edc76f6..4a1eaef3a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_permissions.xml
@@ -12,7 +12,7 @@
 		</combo_item>
 	</combo_box>
 	<text name="owner_label">
-		擁有者
+		所有人
 	</text>
 	<check_box initial_value="false" label="允許導航與互動" name="perms_owner_interact"/>
 	<check_box initial_value="false" label="顯示控制列" name="perms_owner_control"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
index aaaf6bfb94..da84d6fe02 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/zh/panel_media_settings_security.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Security" name="Media Settings Security">
-	<check_box initial_value="false" label="Only Allow Access to Specified URL patterns" name="whitelist_enable"/>
+<panel label="安全" name="Media Settings Security">
+	<check_box initial_value="false" label="只允許進入符合特定形態的 URL 目標" name="whitelist_enable"/>
 	<text name="home_url_fails_some_items_in_whitelist">
-		Entries that the home page fails against are marked:
+		被首頁視為出錯的物項已標示：
 	</text>
 	<button label="添加" name="whitelist_add"/>
 	<button label="刪除" name="whitelist_del"/>
 	<text name="home_url_fails_whitelist">
-		Warning: the home page specified in the General tab fails to pass this whitelist. It has been disabled until a valid entry has been added.
+		警告：在基本資料頁籤裡指定的首頁，未能通過這一許可清單。 它已被停用，請設定有效的資料。
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
index 60a5767d09..7a11aa961b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_navigation_bar.xml
@@ -1,18 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="navigation_bar">
-	<panel name="navigation_panel">
-		<pull_button name="back_btn" tool_tip="前往上一個位置"/>
-		<pull_button name="forward_btn" tool_tip="前往下一個位置"/>
-		<button name="home_btn" tool_tip="瞬間傳送到我家的位置"/>
-		<location_input label="位置" name="location_combo"/>
-		<search_combo_box label="搜尋" name="search_combo_box" tool_tip="搜尋">
-			<combo_editor label="搜尋 [SECOND_LIFE]" name="search_combo_editor"/>
-		</search_combo_box>
-	</panel>
-	<favorites_bar name="favorite" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
-		<label name="favorites_bar_label" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
-			最愛列
-		</label>
-		<chevron_button name="&gt;&gt;" tool_tip="顯示更多我的最愛"/>
-	</favorites_bar>
+	<layout_stack name="nvp_stack">
+		<layout_panel name="navigation_layout_panel">
+			<panel name="navigation_panel">
+				<pull_button name="back_btn" tool_tip="前往上一個位置"/>
+				<pull_button name="forward_btn" tool_tip="前往下一個位置"/>
+				<button name="home_btn" tool_tip="瞬間返回我的家"/>
+				<location_input label="位置" name="location_combo"/>
+			</panel>
+		</layout_panel>
+		<layout_panel name="favorites_layout_panel">
+			<favorites_bar name="favorite" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
+				<label name="favorites_bar_label" tool_tip="拖曳傳送地標到此以便讓你在第二人生中能快速傳送到你最愛的地點!!">
+					最愛列
+				</label>
+				<more_button name="&gt;&gt;" tool_tip="顯示更多我的最愛">
+					詳情 ▼
+				</more_button>
+			</favorites_bar>
+		</layout_panel>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
new file mode 100755
index 0000000000..bb52c13a11
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="重新產出地區" name="navmesh_btn" tool_tip="點按即可重新產出該地區的導航網面。"/>
+	<button label="正在請求重新產出" name="navmesh_btn_sending" tool_tip="正向伺服器發送重新產出請求。"/>
+	<button label="地區正在重新產出" name="navmesh_btn_baking" tool_tip="地區正在重新產出。  完成後，這個按鈕將會消失。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
new file mode 100755
index 0000000000..fc52168bb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="nearby_chat">
+	<layout_stack name="stack">
+		<layout_panel name="translate_chat_checkbox_lp">
+			<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
index 3cabfcfaba..9489113d09 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
-	<line_editor label="點擊此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
+<panel name="nearby_chat">
+	<line_editor label="點按此處開始聊天。" name="chat_box" tool_tip="按下 Enter 鍵來說或按下 Ctrl+Enter 來喊叫"/>
 	<button name="show_nearby_chat" tool_tip="顯示 / 隱藏 附近的聊天紀錄"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
index 6a4b5fcf35..c11a7a088b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/zh/panel_nearby_media.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_media">
 	<string name="media_item_count_format">
-		(%ld media items)
+		(%ld 項媒體物件）
 	</string>
 	<string name="empty_item_text">
-		&lt;empty&gt;
+		&lt;空白&gt;
 	</string>
 	<string name="parcel_media_name">
 		地段串流媒體
@@ -18,8 +18,8 @@
 	<panel name="minimized_controls">
 		<button label="全部停止" name="all_nearby_media_disable_btn" tool_tip="關閉附近全部的媒體"/>
 		<button label="全部開始" name="all_nearby_media_enable_btn" tool_tip="開啟附近全部的媒體"/>
-		<button name="open_prefs_btn" tool_tip="Bring up media prefs"/>
-		<button label="更多 &gt;&gt;" label_selected="&lt;&lt; 更少" name="more_btn" tool_tip="進階控制"/>
+		<button name="open_prefs_btn" tool_tip="打開媒體偏好設定"/>
+		<button label="細節&gt;&gt;" label_selected="&lt;&lt;基本" name="more_btn" tool_tip="進階控制"/>
 	</panel>
 	<panel name="nearby_media_panel">
 		<text name="nearby_media_title">
@@ -35,9 +35,9 @@
 			<combo_box.item label="在其他化身身上" name="OnOthers"/>
 		</combo_box>
 		<scroll_list name="media_list">
-			<scroll_list.columns label="Proximity" name="media_proximity"/>
-			<scroll_list.columns label="Visible" name="media_visibility"/>
-			<scroll_list.columns label="Class" name="media_class"/>
+			<scroll_list.columns label="鄰近" name="media_proximity"/>
+			<scroll_list.columns label="可看到" name="media_visibility"/>
+			<scroll_list.columns label="類型" name="media_class"/>
 			<scroll_list.columns label="名稱" name="media_name"/>
 			<scroll_list.columns label="除錯" name="media_debug"/>
 		</scroll_list>
@@ -59,10 +59,10 @@
 					<button name="mute_btn" tool_tip="靜音所選擇的媒體音頻"/>
 				</layout_panel>
 				<layout_panel name="zoom">
-					<button name="zoom_btn" tool_tip="Zoom into selected media"/>
+					<button name="zoom_btn" tool_tip="以所選媒體為中心放大"/>
 				</layout_panel>
 				<layout_panel name="unzoom">
-					<button name="unzoom_btn" tool_tip="Zoom back from selected media"/>
+					<button name="unzoom_btn" tool_tip="縮小遠離所選媒體"/>
 				</layout_panel>
 			</layout_stack>
 		</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
index 01a8210338..01a8210338 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
+++ b/indra/newview/skins/default/xui/zh/panel_notify_textbox.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
index a5d3afccb9..a5d3afccb9 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
+++ b/indra/newview/skins/default/xui/zh/panel_online_status_toast.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
new file mode 100755
index 0000000000..8de0bb0e4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_outbox_inventory.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="將物項拖曳並置放到這裡，準備在你的商店出售"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
index 263106d13a..a698da0ab1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfit_edit.xml
@@ -5,7 +5,7 @@
 	<string name="unsaved_changes" value="變更未儲存"/>
 	<string name="now_editing" value="現在編輯中"/>
 	<panel.string name="not_available">
-		(N\A)
+		（不適用）
 	</panel.string>
 	<panel.string name="unknown">
 		（未知）
@@ -15,7 +15,7 @@
 	<string name="Filter.Objects" value="物件"/>
 	<string name="Filter.Clothing" value="服裝"/>
 	<string name="Filter.Bodyparts" value="身體部位"/>
-	<string name="replace_body_part" value="點擊以取代你現存的體形"/>
+	<string name="replace_body_part" value="點按以取代你現存的體形"/>
 	<text name="title" value="編輯裝扮"/>
 	<panel name="header_panel">
 		<panel name="outfit_name_and_status">
@@ -39,10 +39,10 @@
 		</layout_panel>
 	</layout_stack>
 	<panel name="no_add_wearables_button_bar">
-		<button name="shop_btn_1" tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"/>
+		<button name="shop_btn_1" tool_tip="前往第二人生購物市集。 你也可選擇你穿著中的一個物件，再點按這裡察看其他同類物件。"/>
 	</panel>
 	<panel name="add_wearables_button_bar">
-		<button name="shop_btn_2" tool_tip="Visit the SL Marketplace. You can also select something you are wearing, then click here to see more things like it"/>
+		<button name="shop_btn_2" tool_tip="前往第二人生購物市集。 你也可選擇你穿著中的一個物件，再點按這裡察看其他同類物件。"/>
 	</panel>
 	<panel name="save_revert_button_bar">
 		<layout_stack name="button_bar_ls">
@@ -50,7 +50,7 @@
 				<button label="儲存" name="save_btn"/>
 			</layout_panel>
 			<layout_panel name="revert_btn_lp">
-				<button label="復原變更" name="revert_btn" tool_tip="Revert to last saved version"/>
+				<button label="復原變更" name="revert_btn" tool_tip="恢復上一個已儲存版本"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
index d9718d8294..8dd93543c0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory.xml
@@ -4,19 +4,19 @@
 		穿上所選擇的裝扮
 	</panel.string>
 	<panel.string name="wear_items_tooltip">
-		Wear selected items
+		穿上所選擇的物件
 	</panel.string>
 	<tab_container name="appearance_tabs">
 		<panel label="我的裝扮" name="outfitslist_tab"/>
-		<panel label="WEARING" name="cof_tab"/>
+		<panel label="目前穿著" name="cof_tab"/>
 	</tab_container>
 	<panel name="bottom_panel">
 		<layout_stack name="bottom_panel_ls">
 			<layout_panel name="save_btn_lp">
-				<button label="另存" name="save_btn"/>
+				<button label="另存為" name="save_btn"/>
 			</layout_panel>
 			<layout_panel name="wear_btn_lp">
-				<button label="Wear" name="wear_btn"/>
+				<button label="穿上" name="wear_btn"/>
 			</layout_panel>
 		</layout_stack>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
index 92ec774f9b..92ec774f9b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_inventory_gear_default.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
index a4b041469b..cfb0180f9c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_list.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Outfits">
+	<accordion name="outfits_accordion">
+		<no_matched_tabs_text name="no_matched_outfits_msg" value="找不到你要找的嗎？ 請試試 [secondlife:///app/search/places/ 搜尋]。"/>
+		<no_visible_tabs_text name="no_outfits_msg" value="你還沒有任何裝扮。 請試試[secondlife:///app/search/all/ 搜尋]"/>
+	</accordion>
 	<panel name="bottom_panel">
 		<menu_button name="options_gear_btn" tool_tip="顯示額外選項"/>
 		<button name="trash_btn" tool_tip="刪除所選擇的裝扮"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
index 693cdcdeca..693cdcdeca 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
+++ b/indra/newview/skins/default/xui/zh/panel_outfits_wearing.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 9c265622fa..da5918d553 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -1,94 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人群" name="people_panel">
-	<string name="no_recent_people" value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
-	<string name="no_filtered_recent_people" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
-	<string name="no_one_near" value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]."/>
-	<string name="no_one_filtered_near" value="Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search]."/>
+	<string name="no_recent_people" value="沒有最近的人。 想找人見面聊天？ 請試試[secondlife:///app/search/people 搜尋]或[secondlife:///app/worldmap 世界地圖]。"/>
+	<string name="no_filtered_recent_people" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。"/>
+	<string name="no_one_near" value="附近無人。 想找人見面聊天？ 請試試[secondlife:///app/search/people 搜尋]或[secondlife:///app/worldmap 世界地圖]。"/>
+	<string name="no_one_filtered_near" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_friends_online" value="無朋友上線"/>
 	<string name="no_friends" value="無朋友"/>
 	<string name="no_friends_msg">
-		Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
-Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
+		用 [secondlife:///app/search/people 搜尋] 找朋友，或選擇一位居民，再按右鍵將他加為朋友。
+想找人見面聊天？ 請試一試 [secondlife:///app/worldmap 世界地圖]。
 	</string>
 	<string name="no_filtered_friends_msg">
-		Didn&apos;t find what you&apos;re looking for? Try [secondlife:///app/search/people/[SEARCH_TERM] Search].
+		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
-	<string name="people_filter_label" value="人員過濾器"/>
-	<string name="groups_filter_label" value="群組過濾器"/>
-	<string name="no_filtered_groups_msg" value="沒有發現你要找的嗎？何不試試 [secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
-	<string name="no_groups_msg" value="想找尋群組加入嗎？何不試試 [secondlife:///app/search/groups 搜尋]。"/>
+	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
+	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
-	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加已選擇的居民到Ad你的朋友清單"/>
+			<panel label="bottom_panel" name="nearby_buttons_panel">
+				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
-		<panel label="我的朋友" name="friends_panel">
+		<panel label="朋友" name="friends_panel">
+			<panel label="bottom_panel" name="friends_buttons_panel">
+				<filter_editor label="人員過濾器" name="friends_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			</panel>
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
-			<panel label="bottom_panel" name="bottom_panel">
-				<layout_stack name="bottom_panel">
-					<layout_panel name="options_gear_btn_panel">
-						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
-					</layout_panel>
-					<layout_panel name="add_btn_panel">
-						<button name="add_btn" tool_tip="向居民提出加為好友邀請"/>
-					</layout_panel>
-					<layout_panel name="trash_btn_panel">
-						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
-					</layout_panel>
-				</layout_stack>
-			</panel>
 		</panel>
-		<panel label="我的群組" name="groups_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
-				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
+		<panel label="群組" name="groups_panel">
+			<panel label="bottom_panel" name="groups_buttons_panel">
+				<filter_editor label="群組過濾器" name="groups_filter_input"/>
+				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
+				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
+				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
 			</panel>
+			<text name="groupcount">
+				你目前屬於 [COUNT] 個群組，可再加入 [REMAINING] 個。
+			</text>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="bottom_panel">
-				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
-				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
+			<panel label="bottom_panel" name="recent_buttons_panel">
+				<filter_editor label="人員過濾器" name="recent_filter_input"/>
+				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
+				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
+				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
+				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
 			</panel>
 		</panel>
+		<panel label="已封鎖的" name="blocked_panel">
+			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
+		</panel>
 	</tab_container>
-	<panel name="button_bar">
-		<layout_stack name="bottom_bar_ls">
-			<layout_panel name="view_profile_btn_lp">
-				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="通話" name="call_btn" tool_tip="與此居民進行通話"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="瞬間傳送" name="teleport_btn" tool_tip="發給瞬間傳送請求"/>
-			</layout_panel>
-		</layout_stack>
-		<layout_stack name="bottom_bar_ls1">
-			<layout_panel name="group_info_btn_lp">
-				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
-			</layout_panel>
-			<layout_panel name="chat_btn_lp">
-				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
-			</layout_panel>
-			<layout_panel name="group_call_btn_lp">
-				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
-			</layout_panel>
-		</layout_stack>
-	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_pick_info.xml b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
index cd4cdbf999..cd4cdbf999 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/zh/panel_pick_info.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_picks.xml b/indra/newview/skins/default/xui/zh/panel_picks.xml
index 15733b71b0..98d36eaea0 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_picks.xml
+++ b/indra/newview/skins/default/xui/zh/panel_picks.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="精選地點" name="panel_picks">
 	<string name="no_picks" value="無精選地點"/>
-	<string name="no_classifieds" value="No Classifieds"/>
+	<string name="no_classifieds" value="禁止個人廣告"/>
 	<accordion name="accordion">
 		<accordion_tab name="tab_picks" title="精選地點"/>
-		<accordion_tab name="tab_classifieds" title="Classifieds"/>
+		<accordion_tab name="tab_classifieds" title="個人廣告"/>
 	</accordion>
 	<panel label="bottom_panel" name="edit_panel">
 		<layout_stack name="edit_panel_ls">
diff --git a/indra/newview/skins/default/xui/zh/panel_place_profile.xml b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
index 1772b65434..a364f732d8 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/zh/panel_place_profile.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="place_profile">
-	<string name="on" value="On"/>
-	<string name="off" value="Off"/>
-	<string name="anyone" value="Anyone"/>
-	<string name="available" value="available"/>
+	<string name="on" value="啟動"/>
+	<string name="off" value="關閉"/>
+	<string name="anyone" value="任何人"/>
+	<string name="available" value="可用的"/>
 	<string name="allocated" value="已分配"/>
 	<string name="title_place" value="地點檔案"/>
 	<string name="title_teleport_history" value="瞬間傳送歷史紀錄"/>
-	<string name="not_available" value="（N\A）"/>
+	<string name="not_available" value="（不適用）"/>
 	<string name="unknown" value="（未知）"/>
 	<string name="public" value="（公開）"/>
 	<string name="none_text" value="（無）"/>
 	<string name="sale_pending_text" value="（擱置銷售）"/>
-	<string name="group_owned_text" value="（群組所擁有）"/>
+	<string name="group_owned_text" value="（由群組所擁有）"/>
 	<string name="price_text" value="L$"/>
-	<string name="area_text" value="m²"/>
+	<string name="area_text" value="平方公尺"/>
 	<string name="all_residents_text" value="全部居民"/>
 	<string name="group_text" value="群組"/>
 	<string name="can_resell">
@@ -33,10 +33,10 @@
 		地點資訊因無伺服器更新故無法提供。
 	</string>
 	<string name="server_error_text">
-		Information about this location is unavailable at this time, please try again later.
+		目前無法取得此位置的訊息，請稍候再試。
 	</string>
 	<string name="server_forbidden_text">
-		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+		權限不足，無法取得此位置的資訊。  請向地段所有人查詢你的權限。
 	</string>
 	<string name="acquired_date">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
@@ -48,7 +48,7 @@
 			<text name="region_title" value="SampleRegion"/>
 			<text name="parcel_title" value="SampleParcel, Name Long (145, 228, 26)"/>
 			<expandable_text name="description" value="Du waltz die spritz"/>
-			<text name="owner_label" value="擁有者："/>
+			<text name="owner_label" value="所有人："/>
 			<text name="owner_value" value="Alex Superduperlongenamenton"/>
 			<text name="maturity_value" value="未知"/>
 			<accordion name="advanced_info_accordion">
@@ -57,18 +57,20 @@
 						<text name="rating_label" value="分級："/>
 						<text name="rating_value" value="未知"/>
 						<text name="voice_label" value="語音："/>
-						<text name="voice_value" value="On"/>
+						<text name="voice_value" value="啟動"/>
 						<text name="fly_label" value="飛行："/>
-						<text name="fly_value" value="On"/>
+						<text name="fly_value" value="啟動"/>
 						<text name="push_label" value="推撞："/>
-						<text name="push_value" value="Off"/>
+						<text name="push_value" value="關閉"/>
 						<text name="build_label" value="建造："/>
-						<text name="build_value" value="On"/>
+						<text name="build_value" value="啟動"/>
 						<text name="scripts_label" value="腳本："/>
-						<text name="scripts_value" value="On"/>
+						<text name="scripts_value" value="啟動"/>
 						<text name="damage_label" value="傷害："/>
-						<text name="damage_value" value="Off"/>
-						<button label="關於土地" name="about_land_btn"/>
+						<text name="damage_value" value="關閉"/>
+						<text name="see_avatars_label" value="察看化身："/>
+						<text name="see_avatars_value" value="關閉"/>
+						<button label="土地資料" name="about_land_btn"/>
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="region_information_tab" title="地區">
@@ -79,21 +81,21 @@
 						<text name="region_type" value="Moose"/>
 						<text name="region_rating_label" value="分級："/>
 						<text name="region_rating" value="完全成人"/>
-						<text name="region_owner_label" value="擁有者："/>
+						<text name="region_owner_label" value="所有人："/>
 						<text name="region_owner" value="moose Van Moose extra long name moose"/>
 						<text name="region_group_label" value="群組："/>
 						<text name="region_group">
 							The Mighty Moose of mooseville soundvillemoose
 						</text>
-						<button label="地區 / 領地" name="region_info_btn"/>
+						<button label="地區/領地" name="region_info_btn"/>
 					</panel>
 				</accordion_tab>
 				<accordion_tab name="estate_information_tab" title="領地">
 					<panel name="estate_information_panel">
 						<text name="estate_name_label" value="領地："/>
 						<text name="estate_rating_label" value="分級："/>
-						<text name="estate_owner_label" value="擁有者："/>
-						<text name="estate_owner" value="Testing owner name length with long name"/>
+						<text name="estate_owner_label" value="所有人："/>
+						<text name="estate_owner" value="正在測試名稱很長很長很長的所有人名稱…"/>
 						<text name="covenant_label" value="契約："/>
 					</panel>
 				</accordion_tab>
diff --git a/indra/newview/skins/default/xui/zh/panel_places.xml b/indra/newview/skins/default/xui/zh/panel_places.xml
index 8ac464271e..08cae610f6 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_places.xml
+++ b/indra/newview/skins/default/xui/zh/panel_places.xml
@@ -8,7 +8,7 @@
 			<layout_panel name="lp1">
 				<layout_stack name="bottom_bar_ls1">
 					<layout_panel name="teleport_btn_lp">
-						<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選擇的區域"/>
+						<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選的區域"/>
 					</layout_panel>
 					<layout_panel name="chat_btn_lp">
 						<button label="地圖" name="map_btn" tool_tip="在世界地圖上顯示相對應的區域"/>
@@ -24,7 +24,7 @@
 						<menu_button name="overflow_btn" tool_tip="顯示額外選項"/>
 					</layout_panel>
 				</layout_stack>
-				<layout_stack name="bottom_bar_ls3">
+				<layout_stack name="bottom_bar_profile_ls">
 					<layout_panel name="profile_btn_lp">
 						<button label="檔案" name="profile_btn" tool_tip="顯示地點檔案"/>
 					</layout_panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_postcard.xml b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
index 6f6b75f468..563c4fca3c 100644..100755
--- a/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/zh/panel_postcard_message.xml
@@ -1,33 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="EMAIL SNAPSHOT">
-	<floater.string name="default_subject">
-		Postcard from [SECOND_LIFE].
-	</floater.string>
-	<floater.string name="default_message">
-		Check this out!
-	</floater.string>
-	<floater.string name="upload_message">
-		傳送中...
-	</floater.string>
+<panel name="panel_postcard_message">
 	<text name="to_label">
-		收件人電子郵件地址：
-	</text>
-	<text name="from_label">
-		你的電子郵件地址：
+		收件人：
 	</text>
 	<text name="name_label">
-		你的名稱：
+		發件人：
 	</text>
 	<text name="subject_label">
 		主旨：
 	</text>
 	<line_editor label="在此輸入你的主旨。" name="subject_form"/>
 	<text name="msg_label">
-		訓息：
+		訊息：
 	</text>
 	<text_editor name="msg_form">
 		在此輸入你的訊息。
 	</text_editor>
 	<button label="取消" name="cancel_btn"/>
 	<button label="送出" name="send_btn"/>
-</floater>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
new file mode 100755
index 0000000000..900ab3a54e
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_postcard_settings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_postcard_settings">
+	<combo_box label="解析度" name="postcard_size_combo">
+		<combo_box.item label="目前視窗" 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="自訂" name="Custom"/>
+	</combo_box>
+	<layout_stack name="postcard_image_params_ls">
+		<layout_panel name="postcard_image_size_lp">
+			<spinner label="寬" name="postcard_snapshot_width"/>
+			<spinner label="高度" name="postcard_snapshot_height"/>
+			<check_box label="鎖住比例" name="postcard_keep_aspect_check"/>
+		</layout_panel>
+		<layout_panel name="postcard_image_format_quality_lp">
+			<slider label="圖像品質" name="image_quality_slider"/>
+			<text name="image_quality_level">
+				（[QLVL]）
+			</text>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
index c5dce10d63..3a7d79e04b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_advanced.xml
@@ -3,6 +3,19 @@
 	<panel.string name="aspect_ratio_text">
 		[NUM]:[DEN]
 	</panel.string>
+	<text name="Cache:">
+		快取：
+	</text>
+	<spinner label="快取大小 (64 - 9984MB)" name="cachesizespinner"/>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="清除快取" label_selected="清除快取" name="clear_cache"/>
+	<text name="Cache location">
+		快取位置：
+	</text>
+	<button label="瀏覽" label_selected="瀏覽" name="set_cache"/>
+	<button label="預設位置" label_selected="預設位置" name="default_cache_location"/>
 	<text name="UI Size:">
 		使用者界面尺寸：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
index 94eb3c1389..94eb3c1389 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_alerts.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index 738c77fd08..b5cdddc252 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,57 +1,99 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<text name="font_size">
-		字型尺寸：
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item label="小" name="radio" value="0"/>
-		<radio_item label="中" name="radio2" value="1"/>
-		<radio_item label="大" name="radio3" value="2"/>
-	</radio_group>
-	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
-	<check_box label="聊天泡泡" name="bubble_text_chat"/>
-	<text name="show_ims_in_label">
-		顯示 IMs 於：
-	</text>
-	<text name="requires_restart_label">
-		（須重新啟動）
-	</text>
-	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
-		<radio_item label="分開視窗" name="radio" value="0"/>
-		<radio_item label="頁籤" name="radio2" value="1"/>
-	</radio_group>
-	<text name="disable_toast_label">
-		啟用傳入聊天的突顯示視窗：
-	</text>
-	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
-	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
-	<spinner label="Nearby chat toasts life time:" name="nearby_toasts_lifetime"/>
-	<spinner label="Nearby chat toasts fading time:" name="nearby_toasts_fadingtime"/>
-	<text name="translate_chb_label">
-		聊天時使用機器自動進行翻譯
-	</text>
-	<text name="translate_language_text">
-		聊天翻譯為：
-	</text>
-	<combo_box name="translate_language_combobox">
-		<combo_box.item label="系統預設" name="System Default Language"/>
-		<combo_box.item label="English" name="English"/>
-		<combo_box.item label="Dansk (Danish)" name="Danish"/>
-		<combo_box.item label="Deutsch (German)" name="German"/>
-		<combo_box.item label="Español (Spanish)" name="Spanish"/>
-		<combo_box.item label="Français (French)" name="French"/>
-		<combo_box.item label="Italiano (Italian)" name="Italian"/>
-		<combo_box.item label="Magyar (Hungarian)" name="Hungarian"/>
-		<combo_box.item label="Nederlands (Dutch)" name="Dutch"/>
-		<combo_box.item label="Polski (Polish)" name="Polish"/>
-		<combo_box.item label="Português (Portuguese)" name="Portugese"/>
-		<combo_box.item label="Русский (Russian)" name="Russian"/>
-		<combo_box.item label="Türkçe (Turkish)" name="Turkish"/>
-		<combo_box.item label="Українська (Ukrainian)" name="Ukrainian"/>
-		<combo_box.item label="中文 (正體) (Chinese)" name="Chinese"/>
-		<combo_box.item label="日本語 (Japanese)" name="Japanese"/>
-		<combo_box.item label="한국어 (Korean)" name="Korean"/>
-	</combo_box>
+	<panel name="general_chat_settings">
+		<check_box initial_value="true" label="聊天時呈現打字動作" name="play_typing_animation"/>
+		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+		<check_box label="只允許我的朋友和群組與我通話或 IM 給我" name="voice_call_friends_only_check"/>
+		<text name="font_size">
+			字型大小：
+		</text>
+		<combo_box name="chat_font_size">
+			<item label="小" name="Small" value="0"/>
+			<item label="中" name="Medium" value="1"/>
+			<item label="大" name="Large" value="2"/>
+		</combo_box>
+		<check_box label="聊天泡泡" name="bubble_text_chat"/>
+	</panel>
+	<panel name="im_notification_settings">
+		<text name="friend_ims">
+			朋友 IM：
+		</text>
+		<combo_box name="FriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_friend_im"/>
+		<text name="non_friend_ims">
+			非朋友 IM：
+		</text>
+		<combo_box name="NonFriendIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_non_friend_im"/>
+		<text name="conference_ims">
+			多方交談 IM：
+		</text>
+		<combo_box name="ConferenceIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_conference_im"/>
+		<text name="group_chat">
+			群組聊天：
+		</text>
+		<combo_box name="GroupChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_group_chat_im"/>
+		<text name="nearby_chat">
+			附近的聊天：
+		</text>
+		<combo_box name="NearbyChatOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_nearby_chat_im"/>
+		<text name="object_ims">
+			來自物件的 IM：
+		</text>
+		<combo_box name="ObjectIMOptions">
+			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
+			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
+			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
+			<item label="無動作" name="NoAction" value="noaction"/>
+		</combo_box>
+		<check_box label="播放聲音" name="play_sound_object_im"/>
+		<text name="notifications_alert">
+			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
+		</text>
+	</panel>
+	<panel name="play_sound_settings">
+		<text name="play_sound">
+			播放聲音：
+		</text>
+		<check_box label="新交談" name="new_conversation"/>
+		<check_box label="語音通話來電" name="incoming_voice_call"/>
+		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
+		<check_box label="收納物品贈送" name="inventory_offer"/>
+	</panel>
+	<panel name="log_settings">
+		<button label="清空記錄…" name="clear_log"/>
+		<button label="刪除交談內容記錄…" name="delete_transcripts"/>
+		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
+	</panel>
+	<button label="翻譯…" name="ok_btn"/>
+	<button label="自動取代…" name="autoreplace_showgui"/>
+	<button label="拼字檢查…" name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index 8d92eadd20..6af4bb8970 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -3,12 +3,12 @@
 	<text name="effects_color_textbox">
 		我的效果（選擇指標）：
 	</text>
-	<color_swatch name="effect_color_swatch" tool_tip="點擊以開啟顏色挑選器"/>
+	<color_swatch name="effect_color_swatch" tool_tip="點按以開啟顏色挑選器"/>
 	<text name="font_colors">
 		聊天字型顏色：
 	</text>
 	<text name="text_box1">
-		自己
+		我自己
 	</text>
 	<text name="text_box2">
 		其他人
@@ -22,11 +22,14 @@
 	<text name="text_box5">
 		錯誤
 	</text>
+	<text name="text_box10">
+		直接
+	</text>
 	<text name="text_box7">
-		擁有者
+		所有人
 	</text>
 	<text name="text_box9">
-		URLs
+		URL
 	</text>
 	<text name="bubble_chat">
 		名稱標籤背景色（亦會影響聊天泡泡）：
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 6827fab6e6..044edbed70 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="一般" name="general_panel">
+<panel label="基本設定" name="general_panel">
 	<text name="language_textbox">
 		語言：
 	</text>
 	<combo_box name="language_combobox">
 		<combo_box.item label="系統預設" name="System Default Language"/>
-		<combo_box.item label="English （英語）" name="English"/>
-		<combo_box.item label="Dansk （丹麥語） - Beta" name="Danish"/>
-		<combo_box.item label="Deutsch （德語） - Beta" name="Deutsch(German)"/>
-		<combo_box.item label="Español （西班牙語） - Beta" name="Spanish"/>
-		<combo_box.item label="Français （法語） - Beta" name="French"/>
-		<combo_box.item label="Italiano （義大利語） - Beta" name="Italian"/>
-		<combo_box.item label="Polski （波蘭語） - Beta" name="Polish"/>
-		<combo_box.item label="Português （葡萄牙語） - Beta" name="Portugese"/>
-		<combo_box.item label="日本語 （日語） - Beta" name="(Japanese)"/>
+		<combo_box.item label="英語" name="English"/>
+		<combo_box.item label="Dansk（丹麥語）- 試用版" name="Danish"/>
+		<combo_box.item label="Deutsch（德語）- 試用版" name="Deutsch(German)"/>
+		<combo_box.item label="Español（西班牙語）- 試用版" name="Spanish"/>
+		<combo_box.item label="Français（法語）- 試用版" name="French"/>
+		<combo_box.item label="Italiano（義大利語）- 試用版" name="Italian"/>
+		<combo_box.item label="Polski（波蘭語）- 試用版" name="Polish"/>
+		<combo_box.item label="Português（葡萄牙語）- 試用版" name="Portugese"/>
+		<combo_box.item label="Русский（俄羅斯語）- 測試版" name="Russian"/>
+		<combo_box.item label="Türkçe（土耳其語）- 試用版" name="Turkish"/>
+		<combo_box.item label="日本語（日語）- 試用版" name="(Japanese)"/>
+		<combo_box.item label="正體中文 - 測試版" name="Traditional Chinese"/>
 	</combo_box>
 	<text name="language_textbox2">
 		（須重新啟動）
@@ -38,15 +41,15 @@
 		名稱標籤：
 	</text>
 	<radio_group name="Name_Tag_Preference">
-		<radio_item label="Off" name="radio" value="0"/>
-		<radio_item label="On" name="radio2" value="1"/>
+		<radio_item label="關閉" name="radio" value="0"/>
+		<radio_item label="啟動" name="radio2" value="1"/>
 		<radio_item label="簡短顯示" name="radio3" value="2"/>
 	</radio_group>
 	<check_box label="我的名字" name="show_my_name_checkbox1"/>
 	<check_box label="使用者名稱" name="show_slids" tool_tip="顯示使用者名稱，就像 bobsmith123 這類的"/>
-	<check_box label="群組頭銜" name="show_all_title_checkbox1" tool_tip="顯示群組頭銜，像是 Officer 或成員"/>
+	<check_box label="群組頭銜" name="show_all_title_checkbox1" tool_tip="顯示群組頭銜，如職員或成員"/>
 	<check_box label="高亮標示朋友" name="show_friends" tool_tip="高亮顯示你朋友的名稱標籤"/>
-	<check_box label="察看顯示名稱" name="display_names_check" tool_tip="Check to use display names in chat, IM, name tags, etc."/>
+	<check_box label="察看顯示名稱" name="display_names_check" tool_tip="若勾選，將在聊天、IM 和名稱標籤等處使用顯示名稱。"/>
 	<text name="inworld_typing_rg_label">
 		按下字母鍵：
 	</text>
@@ -65,9 +68,9 @@
 		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		忙碌模式回應：
+		「請勿打擾」預設回應：
 	</text>
-	<text_editor name="busy_response">
+	<text_editor name="do_not_disturb_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index 874fb6b218..2311eb99a7 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="圖形" name="Display panel">
+<panel label="顯像" name="Display panel">
 	<text name="QualitySpeed">
 		品質與速度：
 	</text>
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/>
 		<check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/>
+		<check_box initial_value="true" label="本地光線" name="LocalLights"/>
 		<check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/>
 		<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
+		<check_box initial_value="true" label="環境光遮蔽" name="UseSSAO"/>
+		<check_box initial_value="true" label="景深" name="UseDoF"/>
+		<text name="shadows_label">
+			陰影：
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="無" name="0"/>
+			<combo_box.item label="日 / 月" name="1"/>
+			<combo_box.item label="日 / 月 + 投影物" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			水文反射：
 		</text>
@@ -45,11 +57,11 @@
 		</text>
 		<slider label="描繪距離：" name="DrawDistance"/>
 		<text name="DrawDistanceMeterText2">
-			m
+			公尺
 		</text>
 		<slider label="最大粒子效果數量：" name="MaxParticleCount"/>
-		<slider label="Max. # of non-impostor avatars:" name="MaxNumberAvatarDrawn"/>
-		<slider label="後製品質：" name="RenderPostProcess"/>
+		<slider label="非假冒化身上限：" name="MaxNumberAvatarDrawn"/>
+		<slider label="後處理品質：" name="RenderPostProcess"/>
 		<text name="MeshDetailText">
 			網面細節：
 		</text>
@@ -81,10 +93,10 @@
 			低
 		</text>
 		<text name="AvatarRenderingText">
-			Avatar Rendering:
+			化身呈像：
 		</text>
-		<check_box initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
+		<check_box initial_value="true" label="化身假冒者" name="AvatarImpostors"/>
+		<check_box initial_value="true" label="硬體換膚" name="AvatarVertexProgram"/>
 		<check_box initial_value="true" label="化身衣服" name="AvatarCloth"/>
 		<text name="TerrainDetailText">
 			地形細節：
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
index ce176b1e3c..3a27477885 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_move.xml
@@ -7,18 +7,33 @@
 	</text>
 	<check_box label="建造 / 編輯" name="edit_camera_movement" tool_tip="使用進入或離開編輯模式時自動調整攝影機位置功能"/>
 	<check_box label="編輯外觀" name="appearance_camera_movement" tool_tip="使用編輯模式時自動調整攝影機位置功能"/>
-	<check_box initial_value="true" label="側邊欄" name="appearance_sidebar_positioning" tool_tip="使用開啟側邊欄時自動調整攝影機位置功能"/>
+	<text name="keyboard_lbl">
+		鍵盤：
+	</text>
+	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
+	<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
+	<text name="mouse_lbl">
+		滑鼠：
+	</text>
 	<check_box label="將我顯示於第一人稱視角中" name="first_person_avatar_visible"/>
 	<text name=" Mouse Sensitivity">
 		第一人稱視角滑鼠敏感度：
 	</text>
 	<check_box label="反轉" name="invert_mouse"/>
-	<check_box label="總是使用方向鍵移動" name="arrow_keys_move_avatar_check"/>
-	<check_box label="連點按住後跑步" name="tap_tap_hold_to_run"/>
-	<check_box label="雙擊以：" name="double_click_chkbox"/>
-	<radio_group name="double_click_action">
-		<radio_item label="瞬間傳送" name="radio_teleport"/>
-		<radio_item label="自動導航駕駛" name="radio_autopilot"/>
-	</radio_group>
+	<text name="single_click_action_lbl">
+		在土地上點按一下：
+	</text>
+	<combo_box name="single_click_action_combo">
+		<combo_box.item label="無動作" name="0"/>
+		<combo_box.item label="移動至點按的地點" name="1"/>
+	</combo_box>
+	<text name="double_click_action_lbl">
+		在土地上點按兩下：
+	</text>
+	<combo_box name="double_click_action_combo">
+		<combo_box.item label="無動作" name="0"/>
+		<combo_box.item label="移動至點按的地點" name="1"/>
+		<combo_box.item label="瞬間傳送至點按的地點" name="2"/>
+	</combo_box>
 	<button label="其他設備" name="joystick_setup_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
index 07fdfd87e3..07fdfd87e3 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index efefb92df6..ab4d9a881d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -11,34 +11,17 @@
 	</text>
 	<check_box label="自訂埠" name="connection_port_enabled"/>
 	<spinner label="埠號：" name="connection_port"/>
-	<text name="cache_size_label_l">
-		快取尺寸
-	</text>
-	<text name="text_box5">
-		MB
-	</text>
-	<text name="Cache location">
-		快取位置：
-	</text>
-	<button label="瀏覽" label_selected="瀏覽" name="set_cache"/>
-	<button label="" label_selected="重設" name="reset_cache"/>
 	<text name="Web:">
 		網頁：
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="使用我的網頁瀏覽器（例如 IE, Firefox, Safari）" name="external" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." value="1"/>
-		<radio_item label="使用內建網頁瀏覽器" name="internal" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [APP_NAME]." value=""/>
+		<radio_item label="使用我的網頁瀏覽器（例如 IE, Firefox, Safari）" name="external" tool_tip="使用系統預設的瀏覽器瀏覽幫助，開啟網頁。全螢幕模式下不建議這麼做。" value="true"/>
+		<radio_item label="使用內建網頁瀏覽器" name="internal" tool_tip="使用內建的瀏覽器瀏覽幫助，開啟網頁。該瀏覽器將透過 [APP_NAME] 開啟新視窗。" value=""/>
 	</radio_group>
 	<check_box initial_value="true" label="啟用外掛" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="接受 cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="啟用 Javascript" name="browser_javascript_enabled"/>
 	<check_box initial_value="false" label="啟用媒體瀏覽的突顯式視窗" name="media_popup_enabled"/>
-	<check_box initial_value="false" label="啟用網頁代理伺服器" name="web_proxy_enabled"/>
-	<text name="Proxy location">
-		代理伺服器位置：
-	</text>
-	<line_editor name="web_proxy_editor" tool_tip="The name or IP address of the proxy you would like to use"/>
-	<spinner label="埠號：" name="web_proxy_port"/>
 	<text name="Software updates:">
 		軟體更新：
 	</text>
@@ -46,4 +29,9 @@
 		<combo_box.item label="自動安裝" name="Install_automatically"/>
 		<combo_box.item label="手動下載及安裝" name="Install_manual"/>
 	</combo_box>
+	<check_box label="願意在更新時搶先試用釋出候選版" name="update_willing_to_test"/>
+	<text name="Proxy Settings:">
+		代理伺服器設定：
+	</text>
+	<button label="調整代理伺服器設定" label_selected="瀏覽" name="set_proxy"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
index 3280b9357b..e57f08fd74 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_sound.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="聲音" name="Preference Media panel">
 	<panel.string name="middle_mouse">
-		Middle Mouse
+		滑鼠中鍵
 	</panel.string>
 	<slider label="主音量" name="System Volume"/>
 	<check_box initial_value="true" name="mute_when_minimized"/>
@@ -18,7 +18,8 @@
 	<slider label="語音聊天" name="Voice Volume"/>
 	<check_box label="已啟用" name="enable_voice_check"/>
 	<check_box label="允許媒體自動播放" name="media_auto_play_btn" tool_tip="若你想要，可以勾選這個允許媒體自動播放" value="true"/>
-	<check_box label="播放附加到其他化身身上的媒體" name="media_show_on_others_btn" tool_tip="Uncheck this to hide media attached to other avatars nearby" value="true"/>
+	<check_box label="播放附加到其他化身身上的媒體" name="media_show_on_others_btn" tool_tip="若未勾選，將隱藏附著於附近其他化身身上的媒體" value="true"/>
+	<check_box label="播放來自姿勢的聲音" name="gesture_audio_play_btn" tool_tip="勾選即可聽到來自姿勢的聲音" value="true"/>
 	<text name="voice_chat_settings">
 		語音聊天設定
 	</text>
@@ -30,33 +31,10 @@
 		<radio_item label="化身位置" name="1"/>
 	</radio_group>
 	<check_box label="說話時同步移動化身嘴唇" name="enable_lip_sync"/>
-	<check_box label="Toggle speak on/off when I press:" name="push_to_talk_toggle_check" tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
-	<line_editor label="Push-to-Speak trigger" name="modifier_combo"/>
+	<check_box label="切換說話 / 靜音，當我按下：" name="push_to_talk_toggle_check" tool_tip="在切換模式下，按下再放開啟動鍵一次，即可打開或關閉麥克風。 不在切換狀態時，麥克風只有在啟動鍵被按下時才會放送你的聲音。"/>
+	<line_editor label="「按下後說話」啟動鍵" name="modifier_combo"/>
 	<button label="設定按鍵" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="重設滑鼠中鍵按鈕"/>
 	<button label="輸入 / 輸出設備" name="device_settings_btn"/>
-	<panel label="設備設定" name="device_settings_panel">
-		<panel.string name="default_text">
-			預設
-		</panel.string>
-		<panel.string name="default system device">
-			預設系統設備
-		</panel.string>
-		<panel.string name="no device">
-			無設備
-		</panel.string>
-		<text name="Input">
-			輸入
-		</text>
-		<text name="My volume label">
-			我的音量：
-		</text>
-		<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="Change the volume using this slider"/>
-		<text name="wait_text">
-			請稍候
-		</text>
-		<text name="Output">
-			輸出
-		</text>
-	</panel>
+	<panel label="設備設定" name="device_settings_panel"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
index df1a1b73a1..09043311da 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
@@ -26,15 +26,15 @@
 	</string>
 	<layout_stack name="progress_indicator_area">
 		<layout_panel name="media_progress_indicator">
-			<progress_bar name="media_progress_bar" tool_tip="Media is Loading"/>
+			<progress_bar name="media_progress_bar" tool_tip="媒體載入中"/>
 		</layout_panel>
 	</layout_stack>
 	<layout_stack name="media_controls">
 		<layout_panel name="back">
-			<button name="back_btn" tool_tip="Navigate back"/>
+			<button name="back_btn" tool_tip="向後導覽"/>
 		</layout_panel>
 		<layout_panel name="fwd">
-			<button name="fwd_btn" tool_tip="Navigate forward"/>
+			<button name="fwd_btn" tool_tip="向前導覽"/>
 		</layout_panel>
 		<layout_panel name="home">
 			<button name="home_btn" tool_tip="首頁"/>
@@ -61,31 +61,31 @@
 					<icon name="media_whitelist_flag" tool_tip="白名單已啟用"/>
 				</layout_panel>
 				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Secured Browsing"/>
+					<icon name="media_secure_lock_flag" tool_tip="加密的瀏覽"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
-			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="Movie play progress"/>
+			<slider_bar initial_value="0.5" name="media_play_slider" tool_tip="影片播放進度"/>
 		</layout_panel>
 		<layout_panel name="skip_back">
-			<button name="skip_back_btn" tool_tip="Step back"/>
+			<button name="skip_back_btn" tool_tip="倒轉"/>
 		</layout_panel>
 		<layout_panel name="skip_forward">
-			<button name="skip_forward_btn" tool_tip="Step forward"/>
+			<button name="skip_forward_btn" tool_tip="快轉"/>
 		</layout_panel>
 		<layout_panel name="media_volume">
-			<button name="media_mute_button" tool_tip="Mute This Media"/>
-			<slider name="volume_slider" tool_tip="Media Volume"/>
+			<button name="media_mute_button" tool_tip="把這個媒體消音"/>
+			<slider name="volume_slider" tool_tip="媒體音量"/>
 		</layout_panel>
 		<layout_panel name="zoom_frame">
-			<button name="zoom_frame_btn" tool_tip="Zoom into media"/>
+			<button name="zoom_frame_btn" tool_tip="以媒體為中心放大"/>
 		</layout_panel>
 		<layout_panel name="close">
-			<button name="close_btn" tool_tip="Zoom Back"/>
+			<button name="close_btn" tool_tip="縮小"/>
 		</layout_panel>
 		<layout_panel name="new_window">
-			<button name="new_window_btn" tool_tip="Open URL in browser"/>
+			<button name="new_window_btn" tool_tip="用瀏覽器開啟 URL"/>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index ad94c4c7e9..d5dd337795 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="契約" name="Covenant">
 	<panel.string name="can_resell">
-		Purchased land in this region may be resold.
+		購買這地區的土地允許轉售。
 	</panel.string>
 	<panel.string name="can_not_resell">
-		Purchased land in this region may not be resold.
+		購買這地區的土地不允許轉售。
 	</panel.string>
 	<panel.string name="can_change">
-		Purchased land in this region may be joined or subdivided.
+		購買這地區的土地允許進行合併或分割。
 	</panel.string>
 	<panel.string name="can_not_change">
-		Purchased land in this region may not be joined or subdivided.
+		購買這地區的土地不允許進行合併或分割。
 	</panel.string>
 	<text name="estate_section_lbl">
 		領地
@@ -19,10 +19,10 @@
 		名稱：
 	</text>
 	<text name="estate_name_text">
-		mainland
+		大陸
 	</text>
 	<text name="estate_owner_lbl">
-		擁有者：
+		所有人：
 	</text>
 	<text name="estate_owner_text">
 		（無）
@@ -31,17 +31,17 @@
 		契約：
 	</text>
 	<text name="covenant_timestamp_text">
-		Last Modified Wed Dec 31 16:00:00 1969
+		上次修改於 Wed Dec 31 16:00:00 1969
 	</text>
 	<text_editor name="covenant_editor">
-		There is no Covenant provided for this Estate.
+		此領地沒有任何契約要求。
 	</text_editor>
 	<button label="重設" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Changes to the covenant will show on all parcels in the estate.
+		契約修訂內容將顯示於領地裡所有地段。
 	</text>
 	<text name="covenant_instructions">
-		Drag and drop a notecard to change the Covenant for this estate.
+		拖曳並置放一張記事卡，即可修訂領地契約。
 	</text>
 	<text name="region_section_lbl">
 		地區
@@ -56,7 +56,7 @@
 		類型：
 	</text>
 	<text name="region_landtype_text">
-		Mainland / Homestead
+		大陸 / 家園
 	</text>
 	<text name="region_maturity_lbl">
 		分級：
diff --git a/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index ed5e6e9d2c..e5d5e6eaf7 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -7,7 +7,7 @@
 		未知
 	</text>
 	<check_box label="關閉腳本" name="disable_scripts_check" tool_tip="關閉這個地區現在的全部腳本"/>
-	<check_box label="關閉碰撞" name="disable_collisions_check" tool_tip="關閉這個地區現在的非化身碰撞"/>
+	<check_box label="禁止碰撞" name="disable_collisions_check" tool_tip="關閉這個地區現在的非化身碰撞"/>
 	<check_box label="關閉物理" name="disable_physics_check" tool_tip="關閉這個地區現在的全部物理"/>
 	<button label="套用" name="apply_btn"/>
 	<text name="objret_text_lbl">
@@ -28,7 +28,7 @@
 	<check_box label="於這個領地內的每一個地區" name="return_estate_wide" tool_tip="退回這個領地內全部地區中標記為他的物件"/>
 	<button label="退回" name="return_btn"/>
 	<button label="取得最常碰撞的物件..." name="top_colliders_btn" tool_tip="條列出目前運作中最常碰撞的物件清單"/>
-	<button label="取得最耗能腳本..." name="top_scripts_btn" tool_tip="條列出目前運作中最耗能的腳本清單"/>
+	<button label="取得最耗能腳本..." name="top_scripts_btn" tool_tip="條列���目前運作中最耗能的腳本清單"/>
 	<button label="地區重新啟動" name="restart_btn" tool_tip="給予兩分鐘倒數計時並重新啟動"/>
-	<button label="延遲重新啟動" name="cancel_restart_btn" tool_tip="延遲地區重新啟動一小時"/>
+	<button label="取消重新啟動" name="cancel_restart_btn" tool_tip="取消地區重新啟動"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_environment.xml b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
new file mode 100755
index 0000000000..8f466af39e
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_region_environment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="環境" name="panel_env_info">
+	<text name="water_settings_title">
+		選擇你希望到你地區的訪客所能看到的水和天空 / 日循環設定。  詳情
+	</text>
+	<radio_group name="region_settings_radio_group">
+		<radio_item label="使用第二人生預設值" name="use_sl_default_settings"/>
+		<radio_item label="使用以下設定" name="use_my_settings"/>
+	</radio_group>
+	<panel name="user_environment_settings">
+		<text name="water_settings_title">
+			水的設定
+		</text>
+		<combo_box name="water_settings_preset_combo">
+			<combo_box.item label="-選擇一個自訂配置-" name="item0"/>
+		</combo_box>
+		<text name="sky_dayc_settings_title">
+			天空 / 日循環
+		</text>
+		<radio_group name="sky_dayc_settings_radio_group">
+			<radio_item label="固定天空" name="my_sky_settings"/>
+			<radio_item label="日循環" name="my_dayc_settings"/>
+		</radio_group>
+		<combo_box name="sky_settings_preset_combo">
+			<combo_box.item label="-選擇一個自訂配置-" name="item0"/>
+		</combo_box>
+		<combo_box name="dayc_settings_preset_combo">
+			<combo_box.item label="-選擇一個自訂配置-" name="item0"/>
+		</combo_box>
+	</panel>
+	<button label="套用" name="apply_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index efa3be2f51..f3c1c85379 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -10,20 +10,20 @@
 		（未知）
 	</text>
 	<text name="owner_text">
-		領地擁有者：
+		領地所有人：
 	</text>
 	<text name="estate_owner">
 		（未知）
 	</text>
-	<check_box label="Use Global Time" name="use_global_time_check"/>
+	<check_box label="使用全域時間" name="use_global_time_check"/>
 	<check_box label="固定太陽" name="fixed_sun_check"/>
-	<slider label="Phase" name="sun_hour_slider"/>
+	<slider label="相位" name="sun_hour_slider"/>
 	<check_box label="允許公開出入" name="externally_visible_check"/>
 	<text name="Only Allow">
-		Restrict Access to accounts verified by:
+		僅允許符合以下條件的居民進入：
 	</text>
-	<check_box label="Payment Information on File" name="limit_payment" tool_tip="Ban unidentified Residents"/>
-	<check_box label="年齡驗證" name="limit_age_verified" tool_tip="Ban Residents who have not verified their age. See the [SUPPORT_SITE] for more information."/>
+	<check_box label="已經預留付款資料" name="limit_payment" tool_tip="居民必須提供付款資料才能進入這領地。  參閱 [SUPPORT_SITE] 獲取進一步資訊。"/>
+	<check_box label="已年滿 18 歲" name="limit_age_verified" tool_tip="居民必須年滿 18 歲才能進入這領地。 參閱 [SUPPORT_SITE] 獲取進一步資訊。"/>
 	<check_box label="允許語音聊天" name="voice_chat_check"/>
 	<check_box label="允許直接瞬間傳送" name="allow_direct_teleport"/>
 	<button label="套用" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index a441b8898d..f6b2c46354 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -18,16 +18,17 @@
 	<text name="region_type">
 		未知
 	</text>
-	<check_box label="阻止變形" name="block_terraform_check"/>
+	<check_box label="阻止土地變形" name="block_terraform_check"/>
 	<check_box label="阻止飛行" name="block_fly_check"/>
 	<check_box label="允許傷害" name="allow_damage_check"/>
 	<check_box label="限制推撞" name="restrict_pushobject"/>
 	<check_box label="允許土地轉售" name="allow_land_resell_check"/>
 	<check_box label="允許土地 合併/分割" name="allow_parcel_changes_check"/>
 	<check_box label="阻擋土地顯示於搜尋中" name="block_parcel_search_check" tool_tip="讓其他人可以在搜尋結果中看到這個地區與其中的地段"/>
+	<check_box label="允許網面物件" name="mesh_rez_enabled_check" tool_tip="允許大家在此地區產生網面物件"/>
 	<spinner label="人數上限" name="agent_limit_spin"/>
-	<spinner label="Object Bonus" name="object_bonus_spin"/>
-	<text label="Maturity" name="access_text">
+	<spinner label="物件紅利" name="object_bonus_spin"/>
+	<text label="分級" name="access_text">
 		分級：
 	</text>
 	<icons_combo_box label="適度成人" name="access_combo">
@@ -36,8 +37,8 @@
 		<icons_combo_box.item label="一般普級" name="PG" value="13"/>
 	</icons_combo_box>
 	<button label="套用" name="apply_btn"/>
-	<button label="強制瞬間傳送一個居民回家..." name="kick_btn"/>
-	<button label="強制瞬間傳送所有居民回家..." name="kick_all_btn"/>
-	<button label="送出訊息到地區..." name="im_btn"/>
+	<button label="瞬間傳送一位居民回家..." name="kick_btn"/>
+	<button label="瞬間傳送所有居民回家..." name="kick_all_btn"/>
+	<button label="向地區發出訊息..." name="im_btn"/>
 	<button label="管理瞬間傳送中心..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 7cae8fe8cf..85e759e445 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -9,11 +9,52 @@
 	<spinner label="水文高度" name="water_height_spin"/>
 	<spinner label="地形提升限制" name="terrain_raise_spin"/>
 	<spinner label="地形降低限制" name="terrain_lower_spin"/>
-	<check_box label="使用領地的太陽設定" name="use_estate_sun_check"/>
-	<check_box label="固定太陽" name="fixed_sun_check"/>
-	<slider label="Phase" name="sun_hour_slider"/>
+	<text name="detail_texture_text">
+		地形材質（須 512x512，24 位元 .tga 檔格式）
+	</text>
+	<text name="height_text_lbl">
+		1（低）
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4（高）
+	</text>
+	<text name="height_text_lbl5">
+		材質海拔範圍
+	</text>
+	<text name="height_text_lbl10">
+		這些值代表以上材質的混合範圍。
+	</text>
+	<text name="height_text_lbl11">
+		以公尺為單位，低值是材質 #1 的最大高度，高值是材質 #4 的最小高度。
+	</text>
+	<text name="height_text_lbl6">
+		西北
+	</text>
+	<text name="height_text_lbl7">
+		東北
+	</text>
+	<spinner label="低" name="height_start_spin_1"/>
+	<spinner label="低" name="height_start_spin_3"/>
+	<spinner label="高" name="height_range_spin_1"/>
+	<spinner label="高" name="height_range_spin_3"/>
+	<text name="height_text_lbl8">
+		西南
+	</text>
+	<text name="height_text_lbl9">
+		東南
+	</text>
+	<spinner label="低" name="height_start_spin_0"/>
+	<spinner label="低" name="height_start_spin_2"/>
+	<spinner label="高" name="height_range_spin_0"/>
+	<spinner label="高" name="height_range_spin_2"/>
+	<button label="下載 RAW 地形..." name="download_raw_btn" tool_tip="只允許領地所有人而非管理者進行操作"/>
+	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="只允許領地所有人而非管理者進行操作"/>
+	<button label="確定地形" name="bake_terrain_btn" tool_tip="將目前地形設為「升高 / 降低」極限的中心值"/>
 	<button label="套用" name="apply_btn"/>
-	<button label="下載 RAW 地形..." name="download_raw_btn" tool_tip="只允許領地擁有者而非管理者進行操作"/>
-	<button label="上傳 RAW 地形檔..." name="upload_raw_btn" tool_tip="只允許領地擁有者而非管理者進行操作"/>
-	<button label="Bake Terrain" name="bake_terrain_btn" tool_tip="Set current terrain as mid-point for raise/lower limits"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_texture.xml b/indra/newview/skins/default/xui/zh/panel_region_texture.xml
deleted file mode 100644
index 7b6152121f..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_region_texture.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地面材質" name="Textures">
-	<text name="region_text_lbl">
-		地區：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<text name="detail_texture_text">
-		地形材質（須 512x512，24 位元 .tga 檔格式）
-	</text>
-	<text name="height_text_lbl">
-		1 (Low)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (High)
-	</text>
-	<text name="height_text_lbl5">
-		Texture Elevation Ranges
-	</text>
-	<text name="height_text_lbl6">
-		Northwest
-	</text>
-	<text name="height_text_lbl7">
-		Northeast
-	</text>
-	<spinner label="Low" name="height_start_spin_1"/>
-	<spinner label="Low" name="height_start_spin_3"/>
-	<spinner label="High" name="height_range_spin_1"/>
-	<spinner label="High" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		Southwest
-	</text>
-	<text name="height_text_lbl9">
-		Southeast
-	</text>
-	<spinner label="Low" name="height_start_spin_0"/>
-	<spinner label="Low" name="height_start_spin_2"/>
-	<spinner label="High" name="height_range_spin_0"/>
-	<spinner label="High" name="height_range_spin_2"/>
-	<text name="height_text_lbl10">
-		These values represent the blend range for the textures above.
-	</text>
-	<text name="height_text_lbl11">
-		Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
-	</text>
-	<button label="套用" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_ed.xml b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
index cc2b0fc673..198e59be7b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_ed.xml
@@ -4,7 +4,7 @@
 		載入中...
 	</panel.string>
 	<panel.string name="can_not_view">
-		你不能察看或編輯此腳本，自從它被設定為 &quot;no copy&quot; 後。你需要完整權限去察看或編輯有包含腳本在內的物件。
+		你無法察看或編輯這腳本，它被設為「禁止複製」。 你需要完整權限去察看或編輯物件內的腳本。
 	</panel.string>
 	<panel.string name="public_objects_can_not_run">
 		公開物件不能執行腳本
@@ -22,16 +22,19 @@
 		<menu label="檔案" name="File">
 			<menu_item_call label="儲存" name="Save"/>
 			<menu_item_call label="還原全部變更" name="Revert All Changes"/>
+			<menu_item_call label="從檔案載入…" name="LoadFromFile"/>
+			<menu_item_call label="存入檔案…" name="SaveToFile"/>
 		</menu>
 		<menu label="編輯" name="Edit">
 			<menu_item_call label="復原" name="Undo"/>
 			<menu_item_call label="重做" name="Redo"/>
 			<menu_item_call label="剪下" name="Cut"/>
-			<menu_item_call label="覆製" name="Copy"/>
+			<menu_item_call label="恚庨" name="Copy"/>
 			<menu_item_call label="貼上" name="Paste"/>
 			<menu_item_call label="全選" name="Select All"/>
 			<menu_item_call label="取消選擇" name="Deselect"/>
 			<menu_item_call label="搜尋 / 取代..." name="Search / Replace..."/>
+			<menu_item_call label="前往某行數…" name="Go to line..."/>
 		</menu>
 		<menu label="幫助" name="Help">
 			<menu_item_call label="幫助..." name="Help..."/>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
index 32cc2f9a5d..eb32d39f78 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_my_avatar.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="我的化身" name="script_limits_my_avatar_panel">
 	<text name="script_memory">
-		Avatar Script Usage
+		化身腳本使用量
 	</text>
 	<text name="loading_text">
 		載入中...
 	</text>
 	<scroll_list name="scripts_list">
 		<scroll_list.columns label="尺寸（kb）" name="size"/>
-		<scroll_list.columns label="URLs" name="urls"/>
+		<scroll_list.columns label="URL" name="urls"/>
 		<scroll_list.columns label="物件名稱" name="name"/>
 		<scroll_list.columns label="位置" name="location"/>
 	</scroll_list>
-	<button label="Refresh List" name="refresh_list_btn"/>
+	<button label="刷新清單" name="refresh_list_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
index 950abbfb4c..40a2dd6926 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_script_limits_region_memory.xml
@@ -8,13 +8,13 @@
 	</text>
 	<scroll_list name="scripts_list">
 		<scroll_list.columns label="尺寸（kb）" name="size"/>
-		<scroll_list.columns label="URLs" name="urls"/>
+		<scroll_list.columns label="URL" name="urls"/>
 		<scroll_list.columns label="物件名稱" name="name"/>
-		<scroll_list.columns label="物件擁有者" name="owner"/>
+		<scroll_list.columns label="物件所有人" name="owner"/>
 		<scroll_list.columns label="地段" name="parcel"/>
 		<scroll_list.columns label="位置" name="location"/>
 	</scroll_list>
-	<button label="Refresh List" name="refresh_list_btn"/>
-	<button label="Highlight" name="highlight_btn"/>
+	<button label="刷新清單" name="refresh_list_btn"/>
+	<button label="高亮顯示" name="highlight_btn"/>
 	<button label="退回" name="return_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
new file mode 100755
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
index bc29058f77..bc29058f77 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
index fa659040ea..fa659040ea 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
+++ b/indra/newview/skins/default/xui/zh/panel_scrolling_param_base.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
deleted file mode 100644
index e5c7deb7d6..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="側邊欄切換。" name="sidebar_openclose" tab_title="側邊欄切換"/>
-	<sidetray_tab description="首頁。" name="sidebar_home" tab_title="首頁">
-		<panel label="首頁" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="編輯你的公開檔案及精選地點。" name="sidebar_me" tab_title="我的檔案">
-		<panel_container name="panel_container">
-			<panel label="自己" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="人群">
-		<panel_container name="panel_container">
-			<panel label="群組檔案" name="panel_group_info_sidetray"/>
-			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Find places to go and places you&apos;ve visited before." label="地點" name="sidebar_places" tab_title="地點">
-		<panel label="地點" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="瀏覽你的收納區。" name="sidebar_inventory" tab_title="我的收納區">
-		<panel label="編輯收納區" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="變更你的外觀與目前樣貌。" name="sidebar_appearance" tab_title="我的外觀">
-		<panel label="編輯外觀" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
index cdd79da30c..cdd79da30c 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
+++ b/indra/newview/skins/default/xui/zh/panel_side_tray_tab_caption.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
new file mode 100755
index 0000000000..20fb9b494a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_inventory">
+	<text name="title">
+		儲存到我的收納區
+	</text>
+	<text name="hint_lbl">
+		將圖像儲存到收納區的費用為 L$[UPLOAD_COST]。 若要將圖像存為材質，請選擇一個正方格式。
+	</text>
+	<combo_box label="解析度" name="texture_size_combo">
+		<combo_box.item label="目前視窗" name="CurrentWindow"/>
+		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
+		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
+		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
+		<combo_box.item label="自訂" name="Custom"/>
+	</combo_box>
+	<spinner label="寬" name="inventory_snapshot_width"/>
+	<spinner label="高度" name="inventory_snapshot_height"/>
+	<check_box label="鎖住比例" name="inventory_keep_aspect_check"/>
+	<button label="取消" name="cancel_btn"/>
+	<button label="儲存" name="save_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
new file mode 100755
index 0000000000..a929c9a3fb
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_local.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_local">
+	<text name="title">
+		儲存到電腦上
+	</text>
+	<combo_box label="解析度" name="local_size_combo">
+		<combo_box.item label="目前視窗" 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="自訂" name="Custom"/>
+	</combo_box>
+	<layout_stack name="local_image_params_ls">
+		<layout_panel name="local_image_size_lp">
+			<spinner label="寬" name="local_snapshot_width"/>
+			<spinner label="高度" name="local_snapshot_height"/>
+			<check_box label="鎖住比例" name="local_keep_aspect_check"/>
+		</layout_panel>
+		<layout_panel name="local_image_format_quality_lp">
+			<combo_box label="格式" 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>
+			<slider label="圖像品質" name="image_quality_slider"/>
+			<text name="image_quality_level">
+				（[QLVL]）
+			</text>
+		</layout_panel>
+	</layout_stack>
+	<button label="取消" name="cancel_btn"/>
+	<flyout_button label="儲存" name="save_btn" tool_tip="儲存圖像到檔案">
+		<flyout_button.item label="儲存" name="save_item"/>
+		<flyout_button.item label="另存..." name="saveas_item"/>
+	</flyout_button>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
new file mode 100755
index 0000000000..82c2b10d8d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_options">
+	<button label="送至我的檔案訊息發佈" name="save_to_profile_btn"/>
+	<button label="電郵" name="save_to_email_btn"/>
+	<button label="儲存到我的收納區（L$[AMOUNT]）" name="save_to_inventory_btn"/>
+	<button label="儲存到電腦上" name="save_to_computer_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
new file mode 100755
index 0000000000..853a856104
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_postcard.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_postcard">
+	<string name="default_subject">
+		來自 [SECOND_LIFE] 的明信片。
+	</string>
+	<string name="default_message">
+		快來看看這個！
+	</string>
+	<string name="upload_message">
+		傳送中...
+	</string>
+	<text name="title">
+		電郵
+	</text>
+	<button label="訊息" name="message_btn"/>
+	<button label="設定" name="settings_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
new file mode 100755
index 0000000000..6f64a4e83c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_profile.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_snapshot_profile">
+	<text name="title">
+		送至我的檔案訊息發佈
+	</text>
+	<combo_box label="解析度" name="profile_size_combo">
+		<combo_box.item label="目前視窗" 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="自訂" name="Custom"/>
+	</combo_box>
+	<layout_stack name="profile_image_params_ls">
+		<layout_panel name="profile_image_size_lp">
+			<spinner label="寬" name="profile_snapshot_width"/>
+			<spinner label="高度" name="profile_snapshot_height"/>
+			<check_box label="鎖住比例" name="profile_keep_aspect_check"/>
+		</layout_panel>
+		<layout_panel name="profile_image_metadata_lp">
+			<text name="caption_label">
+				內容敘述：
+			</text>
+			<check_box initial_value="true" label="加入所在位置" name="add_location_cb"/>
+		</layout_panel>
+	</layout_stack>
+	<button label="取消" name="cancel_btn"/>
+	<button label="發佈" name="post_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
new file mode 100755
index 0000000000..fa4e24a605
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="設備設定" name="device_settings_panel">
+	<panel.string name="default_text">
+		預設
+	</panel.string>
+	<string name="name_no_device">
+		無設備
+	</string>
+	<string name="name_default_system_device">
+		預設系統設備
+	</string>
+	<text name="Input">
+		輸入
+	</text>
+	<text name="Output">
+		輸出
+	</text>
+	<text name="My volume label">
+		我的音量：
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="用這控制條改變音量"/>
+	<text name="wait_text">
+		請稍候
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
index 1dd3acef5d..4586d4eca1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
+++ b/indra/newview/skins/default/xui/zh/panel_stand_stop_flying.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
 <panel name="panel_stand_stop_flying">
-	<button label="站立" name="stand_btn" tool_tip="點擊此處起立。"/>
+	<button label="站立" name="stand_btn" tool_tip="點按此處起立。"/>
 	<button label="停止飛行" name="stop_fly_btn" tool_tip="停止飛行"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index 808e14f3c3..b4cdff9d6b 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -16,12 +16,13 @@
 		L$ [AMT]
 	</panel.string>
 	<panel name="balance_bg">
-		<text name="balance" tool_tip="點擊以重新更新你的 L$ 帳戶餘額" value="L$20"/>
-		<button label="購買 L$" name="buyL" tool_tip="點擊以購買更多 L$"/>
+		<text name="balance" tool_tip="點按以重新更新你的 L$ 帳戶餘額" value="L$20"/>
+		<button label="購買 L$" name="buyL" tool_tip="點按以購買更多 L$"/>
+		<button label="購物" name="goShop" tool_tip="打開第二人生購物市集"/>
 	</panel>
 	<text name="TimeText" tool_tip="目前時區（太平洋）">
 		24:00 AM PST
 	</text>
-	<button name="media_toggle_btn" tool_tip="開始 / 停止全部媒體（音樂、影片、網頁）"/>
+	<button name="media_toggle_btn" tool_tip="開始/停止全部媒體（音樂、影片、網頁）"/>
 	<button name="volume_btn" tool_tip="全域音量控制"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
index a2a63db000..44d545a86d 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/zh/panel_teleport_history.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Teleport History">
 	<accordion name="history_accordion">
-		<no_matched_tabs_text name="no_matched_teleports_msg" value="沒有發現你要找的嗎？試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。"/>
-		<no_visible_tabs_text name="no_teleports_msg" value="瞬間傳送紀錄是空白的。試試 [secondlife:///app/search/places/ Search]。"/>
+		<no_matched_tabs_text name="no_matched_teleports_msg" value="找不到你要找的嗎？ 請試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。"/>
+		<no_visible_tabs_text name="no_teleports_msg" value="瞬間傳送歷史記錄目前空白。 請試試[secondlife:///app/search/places/ 搜尋]。"/>
 		<accordion_tab name="today" title="今天"/>
 		<accordion_tab name="yesterday" title="昨天"/>
 		<accordion_tab name="2_days_ago" title="前天"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
index c251994906..c251994906 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_teleport_history_item.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
new file mode 100644
index 0000000000..5ea6d818c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="材質" name="Texture">
+	<panel.string name="string repeats per meter">
+		每公尺重覆次數
+	</panel.string>
+	<panel.string name="string repeats per face">
+		每一面重覆次數
+	</panel.string>
+	<text name="color label">
+		顏色
+	</text>
+	<color_swatch label="" name="colorswatch" tool_tip="點按以開啟顏色挑選器"/>
+	<text name="color trans">
+		透明度 %
+	</text>
+	<text name="glow label">
+		光暈
+	</text>
+	<check_box label="全亮" name="checkbox fullbright"/>
+	<combo_box name="combobox matmedia">
+		<combo_box.item label="材料" name="Materials"/>
+		<combo_box.item label="媒體" name="Media"/>
+	</combo_box>
+	<combo_box name="combobox mattype">
+		<combo_box.item label="材質（漫反射圖）" name="Texture (diffuse)"/>
+		<combo_box.item label="凹凸度（正交）" name="Bumpiness (normal)"/>
+		<combo_box.item label="閃亮度（鏡反光）" name="Shininess (specular)"/>
+	</combo_box>
+	<texture_picker label="材質" name="texture control" tool_tip="點按以挑選圖片"/>
+	<text name="label alphamode">
+		半透明模式
+	</text>
+	<combo_box name="combobox alphamode">
+		<combo_box.item label="無" name="None"/>
+		<combo_box.item label="半透明攙混" name="Alpha blending"/>
+		<combo_box.item label="半透明遮罩" name="Alpha masking"/>
+		<combo_box.item label="自發光遮罩" name="Emissive mask"/>
+	</combo_box>
+	<text name="label maskcutoff">
+		遮罩截斷值
+	</text>
+	<texture_picker label="材質" name="bumpytexture control" tool_tip="點按以挑選圖片"/>
+	<text name="label bumpiness">
+		凹凸度
+	</text>
+	<combo_box name="combobox bumpiness">
+		<combo_box.item label="無" name="None"/>
+		<combo_box.item label="亮度" name="Brightness"/>
+		<combo_box.item label="暗度" name="Darkness"/>
+		<combo_box.item label="木紋" name="woodgrain"/>
+		<combo_box.item label="樹皮" name="bark"/>
+		<combo_box.item label="磚" name="bricks"/>
+		<combo_box.item label="格子" name="checker"/>
+		<combo_box.item label="混凝土" name="concrete"/>
+		<combo_box.item label="粗花磚" name="crustytile"/>
+		<combo_box.item label="石磚" name="cutstone"/>
+		<combo_box.item label="圓盤" name="discs"/>
+		<combo_box.item label="碎石" name="gravel"/>
+		<combo_box.item label="培養皿" name="petridish"/>
+		<combo_box.item label="側邊片" name="siding"/>
+		<combo_box.item label="石磚格" name="stonetile"/>
+		<combo_box.item label="彩色沙岩" name="stucco"/>
+		<combo_box.item label="吸附" name="suction"/>
+		<combo_box.item label="編織" name="weave"/>
+	</combo_box>
+	<texture_picker label="材質" name="shinytexture control" tool_tip="點按以挑選圖片"/>
+	<text name="label shininess">
+		閃亮度
+	</text>
+	<combo_box name="combobox shininess">
+		<combo_box.item label="無" name="None"/>
+		<combo_box.item label="低" name="Low"/>
+		<combo_box.item label="中" name="Medium"/>
+		<combo_box.item label="高" name="High"/>
+	</combo_box>
+	<text name="label glossiness">
+		光滑度
+	</text>
+	<text name="label environment">
+		環境
+	</text>
+	<text name="label shinycolor">
+		顏色
+	</text>
+	<color_swatch label="" name="shinycolorswatch" tool_tip="點按以開啟顏色挑選器"/>
+	<text name="media_info">
+		所選媒體如有 URL，置於此
+	</text>
+	<button label="選擇…" name="add_media" tool_tip="添加媒體"/>
+	<button label="移除" name="delete_media" tool_tip="刪除這個媒體材質"/>
+	<button label="對齊" label_selected="對齊媒體" name="button align" tool_tip="對齊媒體材質（須先載入）"/>
+	<text name="tex gen">
+		映射方式
+	</text>
+	<combo_box name="combobox texgen">
+		<combo_box.item label="預設" name="Default"/>
+		<combo_box.item label="平面" name="Planar"/>
+	</combo_box>
+	<spinner label="水平刻度" name="TexScaleU"/>
+	<spinner label="垂直刻度" name="TexScaleV"/>
+	<spinner label="每公尺重覆次數" name="rptctrl"/>
+	<spinner label="旋轉角度" name="TexRot"/>
+	<spinner label="水平偏距" name="TexOffsetU"/>
+	<spinner label="垂直偏距" name="TexOffsetV"/>
+	<spinner label="水平刻度" name="bumpyScaleU"/>
+	<spinner label="垂直刻度" name="bumpyScaleV"/>
+	<spinner label="旋轉角度" name="bumpyRot"/>
+	<spinner label="水平偏距" name="bumpyOffsetU"/>
+	<spinner label="垂直偏距" name="bumpyOffsetV"/>
+	<spinner label="水平刻度" name="shinyScaleU"/>
+	<spinner label="垂直刻度" name="shinyScaleV"/>
+	<spinner label="旋轉角度" name="shinyRot"/>
+	<spinner label="水平偏距" name="shinyOffsetU"/>
+	<spinner label="垂直偏距" name="shinyOffsetV"/>
+	<check_box initial_value="false" label="對齊平面" name="checkbox planar align" tool_tip="以最後所選擇的面為基準，對齊全部所選擇的面上的材質。 這必須使用平面材質映射方式。"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
index 6c8a452014..6c8a452014 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
diff --git a/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
new file mode 100755
index 0000000000..70ec028176
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_volume_pulldown.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="volumepulldown_floater">
+	<slider label="主控音量" name="System Volume"/>
+	<slider label="按鍵音" name="UI Volume"/>
+	<slider label="環境" name="Wind Volume"/>
+	<slider label="聲音" name="SFX Volume"/>
+	<check_box name="gesture_audio_play_btn" tool_tip="啟用姿勢聲音"/>
+	<slider label="音樂" name="Music Volume"/>
+	<check_box name="enable_music" tool_tip="啟用串流音樂"/>
+	<slider label="媒體" name="Media Volume"/>
+	<check_box name="enable_media" tool_tip="啟用串流媒體"/>
+	<slider label="語音" name="Voice Volume"/>
+	<check_box name="enable_voice_check" tool_tip="啟用語音聊天"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_world_map.xml b/indra/newview/skins/default/xui/zh/panel_world_map.xml
index b5aa659bf0..84018768a1 100644..100755
--- a/indra/newview/skins/default/xui/zh/panel_world_map.xml
+++ b/indra/newview/skins/default/xui/zh/panel_world_map.xml
@@ -7,57 +7,57 @@
 		無效的位置
 	</panel.string>
 	<panel.string name="world_map_north">
-		N
+		北
 	</panel.string>
 	<panel.string name="world_map_east">
 		E
 	</panel.string>
 	<panel.string name="world_map_west">
-		W
+		西
 	</panel.string>
 	<panel.string name="world_map_south">
-		S
+		南
 	</panel.string>
 	<panel.string name="world_map_southeast">
-		SE
+		東南
 	</panel.string>
 	<panel.string name="world_map_northeast">
-		NE
+		東北
 	</panel.string>
 	<panel.string name="world_map_southwest">
-		SW
+		西南
 	</panel.string>
 	<panel.string name="world_map_northwest">
-		NW
+		西北
 	</panel.string>
 	<panel.string name="world_map_person">
-		1 person
+		1 人
 	</panel.string>
 	<panel.string name="world_map_people">
-		[NUMBER] people
+		[NUMBER] 人
 	</panel.string>
-	<text label="N" name="floater_map_north">
-		N
+	<text label="北" name="floater_map_north">
+		北
 	</text>
 	<text label="E" name="floater_map_east">
 		E
 	</text>
-	<text label="W" name="floater_map_west">
-		W
+	<text label="西" name="floater_map_west">
+		西
 	</text>
-	<text label="S" name="floater_map_south">
-		S
+	<text label="南" name="floater_map_south">
+		南
 	</text>
-	<text label="SE" name="floater_map_southeast">
-		SE
+	<text label="東南" name="floater_map_southeast">
+		東南
 	</text>
-	<text label="NE" name="floater_map_northeast">
-		NE
+	<text label="東北" name="floater_map_northeast">
+		東北
 	</text>
-	<text label="SW" name="floater_map_southwest">
-		SW
+	<text label="西南" name="floater_map_southwest">
+		西南
 	</text>
-	<text label="NW" name="floater_map_northwest">
-		NW
+	<text label="西北" name="floater_map_northwest">
+		西北
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/role_actions.xml b/indra/newview/skins/default/xui/zh/role_actions.xml
index 32bf0d22d8..9587981444 100644..100755
--- a/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <role_actions>
-	<action_set description="These Abilities include powers to add and remove group Members, and allow new Members to join without an invitation." name="Membership">
-		<action description="邀請他人加入這個群組" longdescription="邀請他人加入這個群組，請按下於角色區段中的成員頁籤中的 &apos;邀請&apos; 按鈕。" name="member invite" value="1"/>
-		<action description="將會員由這個群組中踢出" longdescription="Eject Members from this Group using the &apos;Eject&apos; button in the Roles section &gt; Members tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability." name="member eject" value="2"/>
-		<action description="Toggle &apos;Open Enrollment&apos; and change &apos;Enrollment fee&apos;" longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change the &apos;Enrollment fee&apos; in the General section." name="member options" value="3"/>
+	<action_set description="這些能力包括新增或移除群組成員和允許新成員不受邀即可加入群組的等權力。" name="Membership">
+		<action description="邀請他人加入這個群組" longdescription="欲邀請他人加入這個群組，請按下角色欄下的成員頁籤中的「邀請」按鈕。" name="member invite" value="1"/>
+		<action description="將會員由這個群組中踢出" longdescription="欲將成員從群組踢出，請按下角色欄下的成員頁籤中的「踢出」按鈕。 所有人可踢出任何不具所有人角色的人。 如果你不是所有人，一位成員只在他僅屬於「任何人」角色且沒有其他角色的情況下被踢出群組。 欲卸除成員的角色，你必須有「卸除成員角色」的能力。" name="member eject" value="2"/>
+		<action description="切換「免費自由加入」設定，更改「加入費」。" longdescription="切換「免費自由加入」設定，讓成員不受邀也可加入，並在基本設定欄更改「加入費」。" name="member options" value="3"/>
 	</action_set>
-	<action_set description="These Abilities include powers to add, remove, and change group Roles, add and remove Members in Roles, and assign Abilities to Roles." name="Roles">
-		<action description="創立一個新角色" longdescription="創立一個新角色於角色區段 &gt; 角色頁籤。" name="role create" value="4"/>
-		<action description="刪除角色" longdescription="Delete Roles in the Roles section &gt; Roles tab." name="role delete" value="5"/>
-		<action description="Change Role names, titles, descriptions, and whether Role members are publicly revealed" longdescription="Change Role names, titles, descriptions, and whether Role members are publicly revealed. This is done at the bottom of the the Roles section &gt; Roles tab after selecting a Role." name="role properties" value="6"/>
-		<action description="Assign Members to Assigner&apos;s Roles" longdescription="Assign Members to Roles in the list of Assigned Roles (Roles section &gt; Members tab). A Member with this Ability can only add Members to a Role that the assigner is already in." name="role assign member limited" value="7"/>
-		<action description="Assign Members to Any Role" longdescription="Assign Members to Any Role in the list of Assigned Roles (Roles section &gt; Members tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability." name="role assign member" value="8"/>
-		<action description="由角色中移除成員" longdescription="Remove Members from Roles in the list of Assigned Roles (Roles section &gt; Members tab). Owners can&apos;t be removed." name="role remove member" value="9"/>
-		<action description="Assign and Remove Abilities in Roles" longdescription="Assign and Remove Abilities for each Role in the list of Allowed Abilities (Roles section &gt; Roles tab). *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability." name="role change actions" value="10"/>
+	<action_set description="這些能力包括新增、移除、更改群組角色，新增或移除成員的角色，和為角色設定能力等權力。" name="Roles">
+		<action description="創立一個新角色" longdescription="到角色欄的角色頁籤，可以建立新角色。" name="role create" value="4"/>
+		<action description="刪除角色" longdescription="到角色欄的角色頁籤，可以刪除角色。" name="role delete" value="5"/>
+		<action description="變更角色名稱、頭銜、描述，設定角色的成員名單是否公開" longdescription="變更角色名稱、頭銜、描述，設定角色的成員名單是否公開。 選取一個角色後，可到角色欄底下的角色頁籤完成這動作。" name="role properties" value="6"/>
+		<action description="賦予成員「指派者」角色" longdescription="從已知的指派角色中選擇若干，賦予給成員（角色欄 &gt; 成員頁籤）。 有這能力的成員，只能把他自己已身負的角色賦予給別的成員。" name="role assign member limited" value="7"/>
+		<action description="賦予成員「任何人」角色" longdescription="從已知的指派角色中，賦予給成員「任何人」角色（角色欄 &gt; 成員頁籤）。 *警告* 任何身負具這能力的角色的成員，都可以把某些角色賦予自己或任何不是所有人的成員，因此使自己或別人得到比現在更多的權力，最終可能擁有近似「所有人」的權力。 賦予這項能力之前，敬請慎重考慮。" name="role assign member" value="8"/>
+		<action description="由角色中移除成員" longdescription="從已知的指派角色中選擇，將成員卸除該角色（角色欄 &gt; 成員頁籤）。 所有人角色不得被卸除。" name="role remove member" value="9"/>
+		<action description="設定或卸除角色能力" longdescription="從允許的能力清單中選擇，為每一角色設定或卸除該能力（角色欄 &gt; 角色頁籤）。 *警告* 任何身負具有這能力的角色的成員，都可以將所有能力賦予自己和任何其他不是所有人的人，因此讓自己或他人提升為近似「所有人」權力的層級。 賦予這項能力之前，敬請慎重考慮。" name="role change actions" value="10"/>
 	</action_set>
-	<action_set description="These Abilities include powers to modify this group&apos;s identity, such as changing public visibility, charter, and insignia." name="Group Identity">
-		<action description="Change Charter, Insignia, and &apos;Show in search&apos;" longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General section." name="group change identity" value="11"/>
+	<action_set description="這些能力包括有權修改群組身份，例如更改公開程度、規章和徽章。" name="Group Identity">
+		<action description="更改規章、徽章，設定是否「顯示於搜尋結果」。" longdescription="更改規章、徽章，設定是否「顯示於搜尋結果」。 這可在「基本資料」欄設定。" name="group change identity" value="11"/>
 	</action_set>
-	<action_set description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land&apos;, or click the &apos;i&apos; icon in the Navigation Bar." name="Parcel Management">
-		<action description="讓渡土地或購買土地給群組" longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab." name="land deed" value="12"/>
-		<action description="Abandon land to Governor Linden" longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability." name="land release" value="13"/>
-		<action description="Set land for sale info" longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability." name="land set sale info" value="14"/>
-		<action description="Subdivide and join parcels" longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide&apos;. To join, select two or more contiguous parcels and click &apos;Join&apos;." name="land divide join" value="15"/>
+	<action_set description="這些能力包括有權讓渡、修改或出售本群組擁有的土地。 欲前往「土地資料」視窗，請在地面任一處點按右鍵，選擇「土地資料」，或點按導覽列的「i」圖示。" name="Parcel Management">
+		<action description="讓渡土地或購買土地給群組" longdescription="讓渡土地或為群組購地。 這可在「土地資料」&gt; 基本頁籤完成。" name="land deed" value="12"/>
+		<action description="放棄土地，將所有權轉給 Governor Linden（林登總長）" longdescription="放棄土地，將所有權轉給 Governor Linden（林登總長）。 *警告* 任何身負具有這能力的角色的成員，都可以到「土地資料」&gt; 基本頁籤放棄任何群組所有的土地，不經出售就將所有權轉給 Linden！ 賦予這項能力之前，敬請慎重考慮。" name="land release" value="13"/>
+		<action description="設定待售土地資訊" longdescription="設定待售土地資訊。 *警告* 任何身負具有這能力的角色的成員，都可以到「土地資料」&gt; 基本頁籤任意出售群組所有的土地！ 賦予這項能力之前，敬請慎重考慮。" name="land set sale info" value="14"/>
+		<action description="分割或合併地段" longdescription="分割或合併地段。 欲進行此動作，請在地面任一處點按右鍵，選擇「編輯地形」，並在土地上拖曳滑鼠選取一個範圍。 要進行分割，做好選擇後點按「分割」。 要合併，選取至少兩塊相鄰地段，再點選「合併」。" name="land divide join" value="15"/>
 	</action_set>
-	<action_set description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point &amp; TP routing options." name="Parcel Identity">
-		<action description="Toggle &apos;Show Place in Search&apos; and set category" longdescription="Toggle &apos;Show Place in Search&apos; and setting a parcel&apos;s category in About Land &gt; Options tab." name="land find places" value="17"/>
-		<action description="Change parcel name, description, and &apos;Show Place in Search&apos; settings" longdescription="Change parcel name, description, and &apos;Show Place in Search&apos; settings. This is done in About Land &gt; Options tab." name="land change identity" value="18"/>
-		<action description="Set landing point and set teleport routing" longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab." name="land set landing point" value="19"/>
+	<action_set description="這些能力包括可更改地段名稱和發佈設定、設定是否公開到搜尋結果、設定登陸地點和瞬間傳送繞路選項。" name="Parcel Identity">
+		<action description="切換「將地點顯示在搜尋結果」設定，並選定類別" longdescription="切換「將地點顯示在搜尋結果」設定，並在「土地資料」&gt; 選項頁籤設定地段類別。" name="land find places" value="17"/>
+		<action description="更改地段名稱、描述、「適度成人內容」設定" longdescription="更改地段名稱、描述、「適度成人內容」設定。 這可在「土地資料」&gt; 選項頁籤完成。" name="land change identity" value="18"/>
+		<action description="設定登陸地點和瞬間傳送繞路設定。" longdescription="在群組所有的地段上，身負具此能力的成員，可以設定人們瞬間傳送進來時的登陸地點，和瞬間傳送的繞路選項。 這可在「土地資料」&gt; 選項頁籤完成。" name="land set landing point" value="19"/>
 	</action_set>
-	<action_set description="These Abilities include powers which affect parcel options, such as &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, and music &amp; media settings." name="Parcel Settings">
-		<action description="Change music &amp; media settings" longdescription="Change streaming music and movie settings in About Land &gt; Media tab." name="land change media" value="20"/>
-		<action description="Toggle &apos;Edit Terrain&apos;" longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab." name="land edit" value="21"/>
-		<action description="Toggle various About Land &gt; Options settings" longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Edit Terrain&apos;, &apos;Build&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab." name="land options" value="22"/>
+	<action_set description="這些能力包括有權更改地段選項，例如「新建物件」、「編輯地形」，和音樂、媒體設定等。" name="Parcel Settings">
+		<action description="更改音樂和媒體設定" longdescription="在「土地資料」&gt; 媒體頁籤更改串流音樂和影片設定。" name="land change media" value="20"/>
+		<action description="切換「編輯地形」設定" longdescription="切換「編輯地形」設定。 *警告* 「土地資料」&gt; 「選項」頁籤 &gt;「編輯地形」可允許任何人變更你的土地形狀，放置或移動 Linden 植物。 賦予這項能力之前，敬請慎重考慮。 編輯地形可在「土地資料」&gt; 選項頁籤做切換。" name="land edit" value="21"/>
+		<action description="切換各項「土地資料」&gt; 選項設定" longdescription="在「土地資料」&gt; 選項頁籤切換「安全（無傷害）」設定，並允許其他居民在群組所有土地上「編輯地形」、「建製」、「建立地標」、「執行腳本」。" name="land options" value="22"/>
 	</action_set>
-	<action_set description="These Abilities include powers which allow Members to bypass restrictions on group-owned parcels." name="Parcel Powers">
-		<action description="Always allow &apos;Edit Terrain&apos;" longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow edit land" value="23"/>
-		<action description="Always allow &apos;Fly&apos;" longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow fly" value="24"/>
-		<action description="Always allow &apos;Create Objects&apos;" longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow create" value="25"/>
-		<action description="總是允許 &apos;創造地標&apos;" longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab." name="land allow landmark" value="26"/>
-		<action description="Allow &apos;Set Home to Here&apos; on group land" longdescription="Members in a Role with this Ability can use World menu &gt; Landmarks &gt; Set Home to Here on a parcel deeded to this group." name="land allow set home" value="28"/>
-		<action description="Allow &apos;Event Hosting&apos; on group land" longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event." name="land allow host event" value="41"/>
+	<action_set description="這些能力包括可允許成員在群組所有地段上規避限制。" name="Parcel Powers">
+		<action description="固定允許「編輯地形」" longdescription="身負具此能力的角色的成員可以在群組所有地段上編輯地形，無論這功能在「土地資料」&gt; 選項頁籤裡是否被禁止。" name="land allow edit land" value="23"/>
+		<action description="固定允許「飛行」" longdescription="身負具此能力的角色的成員可以在群組所有地段上飛行，無論這能力是否在「土地資料」&gt; 選項頁籤裡被禁止。" name="land allow fly" value="24"/>
+		<action description="固定允許「新建物件」" longdescription="身負具此能力的角色的成員可以在群組所有地段上新建物件，無論這能力是否在「土地資料」&gt; 選項頁籤裡被禁止。" name="land allow create" value="25"/>
+		<action description="總是允許「新建地標」" longdescription="身負具此能力的角色的成員可以將群組所有的地段設為地標，無論這能力是否在「土地資料」&gt; 選項頁籤裡被禁止。" name="land allow landmark" value="26"/>
+		<action description="允許在群組所有土地上「將這裡設為我的家」" longdescription="身負具此能力的角色的成員，可以在讓渡給這群組的地段上使用「世界」選單 &gt; 地標 &gt; 「將這裡設為我的家」。" name="land allow set home" value="28"/>
+		<action description="允許在群組所有土地上「開辦活動」" longdescription="身負具這能力的角色的成員，可以選擇群組所有的地段作為開辦活動的場地。" name="land allow host event" value="41"/>
 	</action_set>
-	<action_set description="These Abilities include powers to allow or restrict access to group-owned parcels, including freezing and ejecting Residents." name="Parcel Access">
-		<action description="Manage parcel Access lists" longdescription="Manage parcel Access lists in About Land &gt; Access tab." name="land manage allowed" value="29"/>
-		<action description="Manage parcel Ban lists" longdescription="Manage parcel Ban lists in About Land &gt; Access tab." name="land manage banned" value="30"/>
-		<action description="Change parcel &apos;Sell passes to&apos; settings" longdescription="Change parcel &apos;Sell passes to&apos; settings in About Land &gt; Access tab." name="land manage passes" value="31"/>
-		<action description="將地段內的居民踢出及凍結" longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, then selecting &apos;Eject&apos; or &apos;Freeze&apos;." name="land admin" value="32"/>
+	<action_set description="這些能力包括可允許或限制人們出入群組所有的地段，包括把居民凍結或踢出。" name="Parcel Access">
+		<action description="管理地段出入許可名單" longdescription="在「土地資料」&gt; 出入許可頁籤管理地段的出入許可名單。" name="land manage allowed" value="29"/>
+		<action description="管理地段禁入名單" longdescription="在「土地資料」&gt; 出入許可頁籤管理地段的禁入名單。" name="land manage banned" value="30"/>
+		<action description="變更地段的「通行證出售對象」設定" longdescription="在「土地資料」&gt; 出入許可頁籤變更地段的「通行證出售對象」設定。" name="land manage passes" value="31"/>
+		<action description="將地段內的居民踢出及凍結" longdescription="身負具此能力的角色的成員，可以在群組所有地段上處置不受歡迎的居民，按右鍵加以「踢出」或「凍結」。" name="land admin" value="32"/>
 	</action_set>
-	<action_set description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects." name="Parcel Content">
-		<action description="Return objects owned by group" longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab." name="land return group owned" value="48"/>
-		<action description="Return objects set to group" longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab." name="land return group set" value="33"/>
-		<action description="退回非群組物件" longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab." name="land return non group" value="34"/>
-		<action description="Landscaping using Linden plants" longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder, or they can be created via the Build menu." name="land gardening" value="35"/>
+	<action_set description="這些能力包括有權允許成員送返物件，或放置或移動 Linden 植物。 這能力的用處是讓成員清理一下土地，做一做景觀佈置，但必須小心使用，因為物件一旦被送返後即無法復原。" name="Parcel Content">
+		<action description="送返群組所有的物件" longdescription="在「土地資料」&gt; 物件頁籤送返位於群組所擁有地段上的群組所擁有物件。" name="land return group owned" value="48"/>
+		<action description="送返設給群組的物件" longdescription="在「土地資料」&gt; 物件頁籤送返位於群組所擁有地段的設給群組的物件。" name="land return group set" value="33"/>
+		<action description="退回非群組物件" longdescription="在「土地資料」&gt; 物件頁籤送返位於群組所擁有地段的非群組物件。" name="land return non group" value="34"/>
+		<action description="用 Linden 植物佈置景觀。" longdescription="允許放置或移動 Linden 樹種、草地和其他植物的景觀佈置能力。 這些物項在你收納區的資源庫 &gt; 物件資料夾可找到，你也可以透過「建製」選單加以新建。" name="land gardening" value="35"/>
 	</action_set>
-	<action_set description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Build Tools &gt; General tab. Right-click an object and Edit to see its settings." name="Object Management">
-		<action description="讓渡物件給群組" longdescription="Deed objects to group in the Build Tools &gt; General tab." name="object deed" value="36"/>
-		<action description="Manipulate (move, copy, modify) group-owned objects" longdescription="Manipulate (move, copy, modify) group-owned objects in the Build Tools &gt; General tab." name="object manipulate" value="38"/>
-		<action description="Set group-owned objects for sale" longdescription="Set group-owned objects for sale in the Build Tools &gt; General tab." name="object set sale" value="39"/>
+	<action_set description="這些能力包括有權讓渡、修改或出售本群組擁有的物件。 這些變更可在「建製工具」&gt; 基本頁籤完成。 對一個物件點按右鍵，選擇「編輯」即可察看其設定。" name="Object Management">
+		<action description="讓渡物件給群組" longdescription="在「建製工具」&gt; 基本頁籤將物件讓渡給群組。" name="object deed" value="36"/>
+		<action description="操縱（移動、複製、修改）群組所擁有物件" longdescription="在「建製工具」&gt; 基本頁籤操縱（移動、複製、修改）群組所擁有物件。" name="object manipulate" value="38"/>
+		<action description="設定出售群組所擁有物件" longdescription="在「建製工具」&gt; 基本頁籤設定出售群組所擁有物件。" name="object set sale" value="39"/>
 	</action_set>
-	<action_set description="These Abilities include powers which require Members to pay group liabilities and receive group dividends, and restrict access to group account history." name="Accounting">
-		<action description="Pay group liabilities and receive group dividends" longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees." name="accounting accountable" value="40"/>
+	<action_set description="這些能力包括有權要求成員支付群組開銷、收取群組利息，限制群組帳號歷史開放對象。" name="Accounting">
+		<action description="支付群組開銷，收取群組利息" longdescription="身負具這能力的角色的成員，將自動支付群組開銷並收取群組利息。 這表示他們將獲取群組所擁有土地出售後的部分收入，每日結算，同時並分攤地段刊登費等開銷。" name="accounting accountable" value="40"/>
 	</action_set>
-	<action_set description="These Abilities include powers to allow Members to send, receive, and view group Notices." name="Notices">
-		<action description="送出通知" longdescription="Members in a Role with this Ability can send Notices via the Group &gt; Notices section." name="notices send" value="42"/>
-		<action description="接收通知與察看過去通知" longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group &gt; Notices section." name="notices receive" value="43"/>
+	<action_set description="這些能力包括可允許成員發送、接收並察看群組通知。" name="Notices">
+		<action description="送出通知" longdescription="身負具這能力的角色的成員，可以到「群組」&gt; 通知欄發送通知。" name="notices send" value="42"/>
+		<action description="接收通知與察看過去通知" longdescription="身負具這能力的角色的成員，可以到「群組」&gt; 通知欄接收通知並察看過去的通知。" name="notices receive" value="43"/>
 	</action_set>
-	<action_set description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." name="Chat">
-		<action description="加入群組聊天" longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice." name="join group chat" value="16"/>
-		<action description="加入群組語音聊天" longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session." name="join voice chat" value="27"/>
-		<action description="適度成人內容的群組聊天" longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions." name="moderate group chat" value="37"/>
+	<action_set description="這些能力包括可允許或限制人們加入群組聊天會話和群組語音聊天。" name="Chat">
+		<action description="加入群組聊天" longdescription="身負具這能力的角色的成員，可以加入群組的文字或語音聊天會話。" name="join group chat" value="16"/>
+		<action description="加入群組語音聊天" longdescription="身負具這能力的角色的成員，可以加入群組的語音聊天會話。  注意：欲加入語音聊天會話，需有「加入群組聊天」能力。" name="join voice chat" value="27"/>
+		<action description="適度成人內容的群組聊天" longdescription="身負具這能力的角色的成員，可以控制誰可加入群組語音和文字聊天會話。" name="moderate group chat" value="37"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
index 7d8a502594..83a9bdf6a5 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
@@ -11,7 +11,7 @@
 			（狀態）
 		</text>
 		<text name="currentlook_name">
-			MyOutfit With a really Long Name like MOOSE
+			名稱很長、很長、很長、很長、很長的 MyOutfit
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="編輯這裝扮"/>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
index 7abe95a402..c8aae15011 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_inventory.xml
@@ -1,16 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="事物" name="objects panel">
 	<panel label="" name="sidepanel__inventory_panel">
+		<layout_stack name="inventory_layout_stack">
+			<layout_panel name="inbox_layout_panel">
+				<panel label="" name="marketplace_inbox">
+					<string name="InboxLabelWithArg">
+						收到的物項 ([NUM])
+					</string>
+					<string name="InboxLabelNoArg">
+						收到的物項
+					</string>
+					<button label="收到的物項" name="inbox_btn"/>
+					<text name="inbox_fresh_new_count">
+						[NUM] 項新的
+					</text>
+					<panel name="inbox_inventory_placeholder_panel" tool_tip="將物項拖曳置放到收納區，即可開始使用">
+						<text name="inbox_inventory_placeholder">
+							從第二人生購物市集購得物項將送到這裡。
+						</text>
+					</panel>
+				</panel>
+			</layout_panel>
+		</layout_stack>
 		<panel name="button_panel">
 			<layout_stack name="button_panel_ls">
 				<layout_panel name="info_btn_lp">
 					<button label="檔案" name="info_btn" tool_tip="顯示物件檔案"/>
 				</layout_panel>
 				<layout_panel name="share_btn_lp">
-					<button label="分享" name="share_btn" tool_tip="Share an inventory item"/>
+					<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
 				</layout_panel>
 				<layout_panel name="shop_btn_lp">
-					<button label="Shop" name="shop_btn" tool_tip="Open Marketplace webpage"/>
+					<button label="購物" name="shop_btn" tool_tip="開啟 Marketplace 購物市集網頁"/>
 					<button label="穿上" name="wear_btn" tool_tip="穿上所選擇的裝扮"/>
 					<button label="播放" name="play_btn"/>
 					<button label="瞬間傳送" name="teleport_btn" tool_tip="瞬間傳送到所選的區域"/>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
index adc815fb4b..1b093e0ecd 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		（未知）
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		（未知 / 多項）
+	</panel.string>
 	<panel.string name="public">
 		（公開）
 	</panel.string>
@@ -10,7 +13,7 @@
 		你可以：
 	</panel.string>
 	<panel.string name="owner_can">
-		擁有者可以：
+		所有人可以：
 	</panel.string>
 	<panel.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
@@ -19,7 +22,7 @@
 		（收納區）
 	</panel.string>
 	<panel.string name="origin_inworld">
-		(Inworld)
+		（在虛擬世界）
 	</panel.string>
 	<text name="title" value="物品檔案"/>
 	<text name="origin" value="（收納區）"/>
@@ -35,7 +38,7 @@
 				創造者：
 			</text>
 			<text name="LabelOwnerTitle">
-				擁有者：
+				所有人：
 			</text>
 			<text name="LabelAcquiredTitle">
 				取得於：
@@ -45,26 +48,26 @@
 					你可以：
 				</text>
 				<check_box label="修改" name="CheckOwnerModify"/>
-				<check_box label="覆製" name="CheckOwnerCopy"/>
+				<check_box label="恚庨" name="CheckOwnerCopy"/>
 				<check_box label="轉移" name="CheckOwnerTransfer"/>
 				<text name="AnyoneLabel">
 					任何人：
 				</text>
-				<check_box label="覆製" name="CheckEveryoneCopy"/>
+				<check_box label="恚庨" name="CheckEveryoneCopy"/>
 				<text name="GroupLabel">
 					群組：
 				</text>
-				<check_box label="分享" name="CheckShareWithGroup" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
+				<check_box label="分享" name="CheckShareWithGroup" tool_tip="允許此群組所有成員共享你修改此物件的權限。 你必須讓渡才能啟動角色限制。"/>
 				<text name="NextOwnerLabel">
-					下一個擁有者：
+					下一個所有人：
 				</text>
 				<check_box label="修改" name="CheckNextOwnerModify"/>
-				<check_box label="覆製" name="CheckNextOwnerCopy"/>
-				<check_box label="轉移" name="CheckNextOwnerTransfer" tool_tip="Next owner can give away or resell this object"/>
+				<check_box label="恚庨" name="CheckNextOwnerCopy"/>
+				<check_box label="轉移" name="CheckNextOwnerTransfer" tool_tip="下一個所有人可贈送或轉售這個物件"/>
 			</panel>
 			<check_box label="出售" name="CheckPurchase"/>
 			<combo_box name="combobox sale copy">
-				<combo_box.item label="副本" name="Copy"/>
+				<combo_box.item label="恚庨" name="Copy"/>
 				<combo_box.item label="原件" name="Original"/>
 			</combo_box>
 			<spinner label="價格： L$" name="Edit Cost"/>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 3d46e52726..60f44a3d88 100644..100755
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -7,28 +7,34 @@
 		讓渡
 	</panel.string>
 	<panel.string name="text modify info 1">
-		你可以修改這個物件
+		你能修改這個物件
 	</panel.string>
 	<panel.string name="text modify info 2">
-		你可以修改這些物件
+		你能修改這些物件
 	</panel.string>
 	<panel.string name="text modify info 3">
-		你不可以修改這個物件
+		你不能修改這個物件
 	</panel.string>
 	<panel.string name="text modify info 4">
-		你不可以修改這些物件
+		你不能修改這些物件
+	</panel.string>
+	<panel.string name="text modify info 5">
+		無法跨地區修改這個物件
+	</panel.string>
+	<panel.string name="text modify info 6">
+		無法跨地區修改這些物件
 	</panel.string>
 	<panel.string name="text modify warning">
-		這個物件有聯結到其他部分
+		這個物件含有聯結的部分
 	</panel.string>
 	<panel.string name="Cost Default">
 		價格： L$
 	</panel.string>
 	<panel.string name="Cost Total">
-		總價： L$
+		總價：L$
 	</panel.string>
 	<panel.string name="Cost Per Unit">
-		單價： L$
+		單價：L$
 	</panel.string>
 	<panel.string name="Cost Mixed">
 		混合價格
@@ -37,7 +43,7 @@
 		混合銷售
 	</panel.string>
 	<text name="title" value="物件檔案"/>
-	<text name="where" value="(Inworld)"/>
+	<text name="where" value="（在虛擬世界）"/>
 	<panel label="" name="properties_panel">
 		<text name="Name:">
 			名稱：
@@ -49,23 +55,24 @@
 			創造者：
 		</text>
 		<text name="Owner:">
-			擁有者：
+			所有人：
 		</text>
 		<text name="Group_label">
 			群組：
 		</text>
-		<button name="button set group" tool_tip="選擇一個群組以分享這個物件的權限"/>
+		<button name="button set group" tool_tip="選擇一個群組以分享這物件的權限"/>
 		<name_box initial_value="載入中..." name="Group Name Proxy"/>
-		<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."/>
+		<button label="讓渡" label_selected="讓渡" name="button deed" tool_tip="「讓渡」會把這物件贈送出去並賦予「下一個所有人」權限。 群組所分享的物件可由群組職員加以讓渡。"/>
 		<text name="label click action">
-			點擊以：
+			點按以：
 		</text>
 		<combo_box name="clickaction">
 			<combo_box.item label="觸碰（預設）" name="Touch/grab(default)"/>
 			<combo_box.item label="坐在物件上" name="Sitonobject"/>
 			<combo_box.item label="購買物件" name="Buyobject"/>
 			<combo_box.item label="支付物件" name="Payobject"/>
-			<combo_box.item label="開啟" name="Open"/>
+			<combo_box.item label="打開" name="Open"/>
+			<combo_box.item label="縮放" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
@@ -74,27 +81,30 @@
 			<text name="Anyone can:">
 				任何人：
 			</text>
-			<check_box label="覆製" name="checkbox allow everyone copy"/>
+			<check_box label="恚庨" name="checkbox allow everyone copy"/>
 			<check_box label="移動" name="checkbox allow everyone move"/>
 			<text name="GroupLabel">
 				群組：
 			</text>
-			<check_box label="分享" name="checkbox share with group" tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."/>
+			<check_box label="分享" name="checkbox share with group" tool_tip="允許此群組所有成員共享你修改此物件的權限。 你必須讓渡才能啟動角色限制。"/>
 			<text name="NextOwnerLabel">
-				下一個擁有者：
+				下一個所有人：
 			</text>
 			<check_box label="修改" name="checkbox next owner can modify"/>
-			<check_box label="覆製" name="checkbox next owner can copy"/>
-			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個擁有者可以送出或轉售這個物件"/>
+			<check_box label="恚庨" name="checkbox next owner can copy"/>
+			<check_box label="轉移" name="checkbox next owner can transfer" tool_tip="下一個所有人可贈送或轉售這個物件"/>
 		</panel>
 		<check_box label="出售" name="checkbox for sale"/>
 		<combo_box name="sale type">
-			<combo_box.item label="副本" name="Copy"/>
+			<combo_box.item label="恚庨" name="Copy"/>
 			<combo_box.item label="內容" name="Contents"/>
 			<combo_box.item label="原件" name="Original"/>
 		</combo_box>
 		<spinner label="價格： L$" name="Edit Cost"/>
 		<check_box label="顯示在搜尋中" name="search_check" tool_tip="讓其他人可以在搜尋結果中察看到此物件"/>
+		<text name="pathfinding_attributes_label">
+			尋徑屬性：
+		</text>
 		<text name="B:">
 			B:
 		</text>
@@ -115,7 +125,7 @@
 		</text>
 	</panel>
 	<panel name="button_panel">
-		<button label="開啟" name="open_btn"/>
+		<button label="打開" name="open_btn"/>
 		<button label="支付" name="pay_btn"/>
 		<button label="購買" name="buy_btn"/>
 		<button label="細節" name="details_btn"/>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 6dbe44d32e..d9fa105ef4 100644..100755
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -29,11 +29,14 @@
 		快取清除中...
 	</string>
 	<string name="StartupInitializingTextureCache">
-		材質快取初始化中...
+		正在初始化材質快取...
 	</string>
 	<string name="StartupInitializingVFS">
 		VFS 初始化中...
 	</string>
+	<string name="StartupRequireDriverUpdate">
+		顯像初始化失敗。 請更新你的顯像卡驅動程式！
+	</string>
 	<string name="ProgressRestoring">
 		回存中...
 	</string>
@@ -44,7 +47,7 @@
 		全亮（舊版）
 	</string>
 	<string name="LoginInProgress">
-		登入中。[APP_NAME] 可能出現凍結狀態。請耐心稍等。
+		登入中。[APP_NAME] 可能看似凍結，請耐心稍等。  請稍候。
 	</string>
 	<string name="LoginInProgressNoFrozen">
 		登入中...
@@ -56,7 +59,7 @@
 		進行帳戶維護...
 	</string>
 	<string name="LoginAttempt">
-		先前企圖嘗試登入失敗。現登入中，嘗試 [NUMBER]
+		前一次登入失敗。 登入中，第 [NUMBER] 次嘗試
 	</string>
 	<string name="LoginPrecaching">
 		世界載入中...
@@ -74,10 +77,10 @@
 		驗證快取檔案（約需 60-90 秒左右）...
 	</string>
 	<string name="LoginProcessingResponse">
-		回應處理中...
+		正在處理回應...
 	</string>
 	<string name="LoginInitializingWorld">
-		世界初始化中...
+		正在初始化虛擬世界…
 	</string>
 	<string name="LoginDecodingImages">
 		圖像解碼中...
@@ -91,6 +94,12 @@
 	<string name="LoginQuicktimeOK">
 		QuickTime 已成功初始化。
 	</string>
+	<string name="LoginRequestSeedCapGrant">
+		詢問地區負荷力…
+	</string>
+	<string name="LoginRetrySeedCapGrant">
+		詢問地區負荷力，第 [NUMBER] 次嘗試…
+	</string>
 	<string name="LoginWaitingForRegionHandshake">
 		地區交握等待中...
 	</string>
@@ -101,25 +110,25 @@
 		服裝下載中...
 	</string>
 	<string name="InvalidCertificate">
-		伺服器回傳一個無效果損壞的憑證。請連繫網格管理者。
+		伺服器回傳一個無效或損壞的憑證。 請聯絡網格管理員。
 	</string>
 	<string name="CertInvalidHostname">
-		An invalid hostname was used to access the server, please check your SLURL or Grid hostname.
+		用了無效的主機名來聯絡伺服器，請檢查你的 SLURL 或網格主機名。
 	</string>
 	<string name="CertExpired">
-		The certificate returned by the Grid appears to be expired.  Please check your system clock, or contact your Grid administrator.
+		網格傳回的憑證似乎已過期。  請檢查系統時鐘，或聯絡網格管理員。
 	</string>
 	<string name="CertKeyUsage">
-		The certificate returned by the server could not be used for SSL.  Please contact your Grid administrator.
+		伺服器傳回的憑證無法用於 SSL。  請聯絡網格管理員。
 	</string>
 	<string name="CertBasicConstraints">
-		Too many certificates were in the servers Certificate chain.  Please contact your Grid administrator.
+		伺服器憑證鍊中的憑證數目太多。  請聯絡網格管理員。
 	</string>
 	<string name="CertInvalidSignature">
-		The certificate signature returned by the Grid server could not be verified.  Please contact your Grid administrator.
+		無法檢驗通過網格伺服器傳回的憑證簽名。  請聯絡網格管理員。
 	</string>
 	<string name="LoginFailedNoNetwork">
-		Network Error: Could not establish connection, please check your network connection.
+		網路錯誤：無法建立連線，請檢查網路連線是否正常。
 	</string>
 	<string name="LoginFailed">
 		登入失敗。
@@ -128,10 +137,141 @@
 		結束退出
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/
+		http://join.secondlife.com/?sourceid=[sourceid]
+	</string>
+	<string name="ViewerDownloadURL">
+		http://secondlife.com/download
+	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		你目前所用的 Viewer 已經無法再進入第二人生。 請到這個頁面下載最新 Viewer：
+http://secondlife.com/download
+
+欲知詳情，請參閱下面的常見問題集：
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		有可以選擇性安裝的更新版：[VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		你必須更新為這個版本：[VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		此用戶已經登入。
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		抱歉！ 我們無法讓你登入。
+請檢查確定你輸入了正確的
+    * 使用者名稱（例：bobsmith123 或 steller.sunshine）
+    * 密碼
+並請確定鍵盤沒有鎖定大寫鍵。
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		為了安全起見，已經變更你的密碼。
+請到位於 http://secondlife.com/password 的帳號頁面
+回答安全驗證問題後，重設密碼。
+如有造成不便請多包涵。
+	</string>
+	<string name="LoginFailedPasswordReset">
+		我們系統有所變更，你必須重設密碼。
+請到位於 http://secondlife.com/password 的帳號頁面
+回答安全驗證問題後，重設密碼。
+如有造成不便請多包涵。
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		第二人生目前暫時關閉進行維護。
+目前僅允許林登員工登入。
+請到 www.secondlife.com/status 察看最新公告。
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		第二人生此時暫時限制登入，以確保不影響效能，讓目前虛擬世界裡的用戶享受最佳的體驗。
+
+免費帳戶的用戶此時暫時無法進入第二人生，因為我們必須優先容納付費用戶。
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		無法從這部電腦進入第二人生。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		你的帳號要等到 [TIME] （太平洋時間）才可使用。
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		此時無法完成你的請求。
+請到 http://secondlife.com/support 聯絡支援人員獲得幫助。
+如果你無法變更密碼，請致電 (866) 476-9763 （美國）。
+	</string>
+	<string name="LoginFailedTransformError">
+		登入時的資料不一致。
+請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		你的帳號目前正在進行小規模的維護。
+你的帳號要等到 [TIME] （太平洋時間）才可使用。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		模擬器回應：登出請求出錯。
+	</string>
+	<string name="LoginFailedPendingLogout">
+		系統正在處理你的登出。
+你的帳號要等到 [TIME] （太平洋時間）才可使用。
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		無法建立有效的時域。
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		無法連接到模擬器。
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		你的帳號僅能在 [START] 到 [END] （太平洋時間）時段進入第二人生。
+請耐心等到該時段再回來。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		錯誤的參數。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		全名的第一個字(first name)須為英文字母或數字。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		全名的第二個字(last name)須為英文字母或數字。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		地區即將離線。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		用戶不在地區裡。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		地區正在登入另一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		地區正在登入上一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		地區正在登出上一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutSucceeded">
+		地區剛剛登出上一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		地區已經開始登出程序。
+請稍待一分鐘再試。
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		系統已經開始登出你的上一個時域。
+請稍待一分鐘再試。
 	</string>
 	<string name="AgentLostConnection">
-		這個地區可能遭遇問題，請檢查你的網路連線。
+		本區域可能正發生問題。  請檢查你的網際網路連線是否正常。
 	</string>
 	<string name="SavingSettings">
 		你的設定儲存中...
@@ -158,7 +298,7 @@
 		（無名稱）
 	</string>
 	<string name="TooltipOwner">
-		擁有者：
+		所有人：
 	</string>
 	<string name="TooltipPublic">
 		公開
@@ -196,60 +336,90 @@
 	<string name="TooltipMustSingleDrop">
 		只有一個物品可以被拖曳到此處
 	</string>
-	<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+	<string name="TooltipPrice" value="L$[AMOUNT]："/>
+	<string name="TooltipOutboxDragToWorld">
+		商家發件匣內的物項無法產生到虛擬世界
+	</string>
+	<string name="TooltipOutboxNoTransfer">
+		至少一個物件無法出售或轉移。
+	</string>
+	<string name="TooltipOutboxNotInInventory">
+		你的商家發件匣只能接受直接來自收納區的物項。
+	</string>
+	<string name="TooltipOutboxWorn">
+		你穿著中的物項無法放入商家發件匣。
+	</string>
+	<string name="TooltipOutboxCallingCard">
+		名片不得放入商家發件匣
+	</string>
+	<string name="TooltipOutboxFolderLevels">
+		巢狀資料夾深度超過 3
+	</string>
+	<string name="TooltipOutboxTooManyFolders">
+		頂層資料夾的子資料夾數目超過 20
+	</string>
+	<string name="TooltipOutboxTooManyObjects">
+		頂層資料夾物項數目超過 200
+	</string>
+	<string name="TooltipDragOntoOwnChild">
+		資料夾不得移到其子資料夾底下
+	</string>
+	<string name="TooltipDragOntoSelf">
+		資料夾移動的目標不得為它本身
+	</string>
 	<string name="TooltipHttpUrl">
-		點擊以察看這個網頁
+		點按以察看這個網頁
 	</string>
 	<string name="TooltipSLURL">
-		點擊以察看這個位置資訊
+		點按以察看這個位置資訊
 	</string>
 	<string name="TooltipAgentUrl">
-		點擊以察看這個居民檔案
+		點按以察看這個居民檔案
 	</string>
 	<string name="TooltipAgentInspect">
 		瞭解更多有關這個居民
 	</string>
 	<string name="TooltipAgentMute">
-		點擊以封鎖這位居民
+		點按以封鎖這位居民
 	</string>
 	<string name="TooltipAgentUnmute">
-		點擊以解除封鎖這位居民
+		點按以解除封鎖這位居民
 	</string>
 	<string name="TooltipAgentIM">
-		點擊開始 IM 這位居民
+		點按開始 IM 這位居民
 	</string>
 	<string name="TooltipAgentPay">
-		點擊以支付這位居民
+		點按以支付這位居民
 	</string>
 	<string name="TooltipAgentOfferTeleport">
-		點擊以送出瞬間傳送邀請給這位居民
+		點按以送出瞬間傳送邀請給這位居民
 	</string>
 	<string name="TooltipAgentRequestFriend">
-		點擊以送出交友邀請給這位居民
+		點按以送出交友邀請給這位居民
 	</string>
 	<string name="TooltipGroupUrl">
-		點擊以察看這個群組的描述
+		點按以察看這個群組的描述
 	</string>
 	<string name="TooltipEventUrl">
-		點擊以察看這個活動的描述
+		點按以察看這個活動的描述
 	</string>
 	<string name="TooltipClassifiedUrl">
-		Click to view this classified
+		點按察看這個個人廣告
 	</string>
 	<string name="TooltipParcelUrl">
-		點擊以察看這個地段的描述
+		點按以察看這個地段的描述
 	</string>
 	<string name="TooltipTeleportUrl">
-		點擊以傳送到這個位置
+		點按以傳送到這個位置
 	</string>
 	<string name="TooltipObjectIMUrl">
-		點擊以察看這個物件的描述
+		點按以察看這個物件的描述
 	</string>
 	<string name="TooltipMapUrl">
-		點擊以察看此處在地圖上的位置
+		點按以察看此處在地圖上的位置
 	</string>
 	<string name="TooltipSLAPP">
-		點擊以執行 secondlife:// 指令
+		點按以執行 secondlife:// 指令
 	</string>
 	<string name="CurrentURL" value="目前網址：[CurrentURL]"/>
 	<string name="SLurlLabelTeleport">
@@ -276,6 +446,9 @@
 	<string name="SLappAgentRequestFriend">
 		交友要求
 	</string>
+	<string name="SLappAgentRemoveFriend">
+		移除朋友
+	</string>
 	<string name="BUTTON_CLOSE_DARWIN">
 		關閉（⌘W）
 	</string>
@@ -304,7 +477,7 @@
 		搜尋中...
 	</string>
 	<string name="NoneFound">
-		未發現。
+		查無結果。
 	</string>
 	<string name="RetrievingData">
 		檢索...
@@ -328,7 +501,7 @@
 		（無）
 	</string>
 	<string name="AvalineCaller">
-		Avaline Caller [ORDER]
+		Avaline 通話者 [ORDER]
 	</string>
 	<string name="AssetErrorNone">
 		無錯誤
@@ -355,10 +528,10 @@
 		檔案傳輸逾時
 	</string>
 	<string name="AssetErrorCircuitGone">
-		Circuit gone
+		失去線路
 	</string>
 	<string name="AssetErrorPriceMismatch">
-		Viewer and server do not agree on price
+		Viewer 和伺服器無法同意價格
 	</string>
 	<string name="AssetErrorUnknownStatus">
 		未知狀態
@@ -391,13 +564,13 @@
 		資料夾
 	</string>
 	<string name="root">
-		root
+		根目錄
 	</string>
 	<string name="lsl2 script">
-		LSL2 script
+		LSL2 腳本
 	</string>
 	<string name="lsl bytecode">
-		LSL bytecode
+		LSL 位元組碼
 	</string>
 	<string name="tga texture">
 		tga 材質
@@ -409,7 +582,7 @@
 		快照
 	</string>
 	<string name="lost and found">
-		Lost and Found
+		失物招領
 	</string>
 	<string name="targa image">
 		targa 圖像
@@ -438,14 +611,17 @@
 	<string name="symbolic folder link">
 		資料夾聯結
 	</string>
+	<string name="mesh">
+		網面
+	</string>
 	<string name="AvatarEditingAppearance">
 		（外觀編輯中）
 	</string>
 	<string name="AvatarAway">
 		離開
 	</string>
-	<string name="AvatarBusy">
-		忙碌
+	<string name="AvatarDoNotDisturb">
+		請勿打擾
 	</string>
 	<string name="AvatarMuted">
 		封鎖的
@@ -457,88 +633,88 @@
 		生氣
 	</string>
 	<string name="anim_away">
-		Away
+		離開
 	</string>
 	<string name="anim_backflip">
-		Backflip
+		後空翻
 	</string>
 	<string name="anim_express_laugh">
-		Belly Laugh
+		捧腹大笑
 	</string>
 	<string name="anim_express_toothsmile">
-		BigSmile
+		大微笑
 	</string>
 	<string name="anim_blowkiss">
-		Blow Kiss
+		飛吻
 	</string>
 	<string name="anim_express_bored">
 		無聊
 	</string>
 	<string name="anim_bow">
-		Bow
+		彎腰點頭
 	</string>
 	<string name="anim_clap">
 		拍手
 	</string>
 	<string name="anim_courtbow">
-		Court Bow
+		宮廷鞠躬
 	</string>
 	<string name="anim_express_cry">
 		哭泣
 	</string>
 	<string name="anim_dance1">
-		Dance 1
+		跳舞1
 	</string>
 	<string name="anim_dance2">
-		Dance 2
+		跳舞2
 	</string>
 	<string name="anim_dance3">
-		Dance 3
+		跳舞3
 	</string>
 	<string name="anim_dance4">
-		Dance 4
+		跳舞4
 	</string>
 	<string name="anim_dance5">
-		Dance 5
+		跳舞5
 	</string>
 	<string name="anim_dance6">
-		Dance 6
+		跳舞6
 	</string>
 	<string name="anim_dance7">
-		Dance 7
+		跳舞7
 	</string>
 	<string name="anim_dance8">
-		Dance 8
+		跳舞8
 	</string>
 	<string name="anim_express_disdain">
-		Disdain
+		鄙視
 	</string>
 	<string name="anim_drink">
-		Drink
+		喝一口
 	</string>
 	<string name="anim_express_embarrased">
-		Embarrassed
+		尷尬
 	</string>
 	<string name="anim_angry_fingerwag">
-		Finger Wag
+		揮動食指
 	</string>
 	<string name="anim_fist_pump">
-		Fist Pump
+		高舉右拳
 	</string>
 	<string name="anim_yoga_float">
-		Floating Yoga
+		漂浮瑜伽
 	</string>
 	<string name="anim_express_frown">
-		Frown
+		皺眉
 	</string>
 	<string name="anim_impatient">
-		Impatient
+		不耐煩
 	</string>
 	<string name="anim_jumpforjoy">
-		Jump For Joy
+		雀躍
 	</string>
 	<string name="anim_kissmybutt">
-		Kiss My Butt
+		親我屁股！
 	</string>
 	<string name="anim_express_kiss">
 		親吻
@@ -547,55 +723,55 @@
 		笑
 	</string>
 	<string name="anim_musclebeach">
-		Muscle Beach
+		秀健美肌肉
 	</string>
 	<string name="anim_no_unhappy">
 		不（不快樂）
 	</string>
 	<string name="anim_no_head">
-		不
+		否
 	</string>
 	<string name="anim_nyanya">
 		Nya-nya-nya
 	</string>
 	<string name="anim_punch_onetwo">
-		One-Two Punch
+		連續左右出拳
 	</string>
 	<string name="anim_express_open_mouth">
-		Open Mouth
+		張口
 	</string>
 	<string name="anim_peace">
-		Peace
+		和平手勢
 	</string>
 	<string name="anim_point_you">
-		Point at Other
+		指著別人
 	</string>
 	<string name="anim_point_me">
-		Point at Self
+		指著自己
 	</string>
 	<string name="anim_punch_l">
-		Punch Left
+		左出拳
 	</string>
 	<string name="anim_punch_r">
-		Punch Right
+		右出拳
 	</string>
 	<string name="anim_rps_countdown">
-		RPS count
+		剪刀石頭布預備動作
 	</string>
 	<string name="anim_rps_paper">
-		RPS paper
+		剪刀石頭布：布
 	</string>
 	<string name="anim_rps_rock">
-		RPS rock
+		剪刀石頭布：石頭
 	</string>
 	<string name="anim_rps_scissors">
-		RPS scissors
+		剪刀石頭布：剪刀
 	</string>
 	<string name="anim_express_repulsed">
-		Repulsed
+		作噁
 	</string>
 	<string name="anim_kick_roundhouse_r">
-		Roundhouse Kick
+		旋踢
 	</string>
 	<string name="anim_express_sad">
 		傷心
@@ -604,37 +780,37 @@
 		敬禮
 	</string>
 	<string name="anim_shout">
-		Shout
+		吶喊
 	</string>
 	<string name="anim_express_shrug">
-		Shrug
+		聳聳肩
 	</string>
 	<string name="anim_express_smile">
 		微笑
 	</string>
 	<string name="anim_smoke_idle">
-		Smoke Idle
+		悠閒抽菸
 	</string>
 	<string name="anim_smoke_inhale">
-		Smoke Inhale
+		吸一口菸
 	</string>
 	<string name="anim_smoke_throw_down">
-		Smoke Throw Down
+		甩菸蒂
 	</string>
 	<string name="anim_express_surprise">
 		驚喜
 	</string>
 	<string name="anim_sword_strike_r">
-		Sword Strike
+		劍擊
 	</string>
 	<string name="anim_angry_tantrum">
-		Tantrum
+		鬧脾氣
 	</string>
 	<string name="anim_express_tongue_out">
-		TongueOut
+		吐舌頭
 	</string>
 	<string name="anim_hello">
-		Wave
+		揮手
 	</string>
 	<string name="anim_whisper">
 		耳語
@@ -657,6 +833,12 @@
 	<string name="anim_yes_head">
 		是
 	</string>
+	<string name="multiple_textures">
+		多個
+	</string>
+	<string name="use_texture">
+		使用材質
+	</string>
 	<string name="texture_loading">
 		載入中...
 	</string>
@@ -664,19 +846,25 @@
 		離線
 	</string>
 	<string name="worldmap_item_tooltip_format">
-		[AREA] m² L$[PRICE]
+		[AREA] 平方公尺 L$[PRICE]
 	</string>
 	<string name="worldmap_results_none_found">
-		沒有發現。
+		查無結果。
 	</string>
 	<string name="Ok">
 		確定
 	</string>
 	<string name="Premature end of file">
-		Premature end of file
+		檔案異常中止
 	</string>
 	<string name="ST_NO_JOINT">
-		Can&apos;t find ROOT or JOINT.
+		找不到 ROOT 或旋軸。
+	</string>
+	<string name="NearbyChatTitle">
+		附近的聊天中
+	</string>
+	<string name="NearbyChatLabel">
+		（附近的聊天）
 	</string>
 	<string name="whisper">
 		低語：
@@ -700,34 +888,37 @@
 		現在你將重新聯接到附近的語音聊天
 	</string>
 	<string name="ScriptQuestionCautionChatGranted">
-		&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].
+		物件「[OBJECTNAME]&apos;」（所有人「[OWNERNAME]」，位於「[REGIONNAME]」，方位「[REGIONPOS]」）已獲得下列權限：[PERMISSIONS]。
 	</string>
 	<string name="ScriptQuestionCautionChatDenied">
-		&apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
+		物件「[OBJECTNAME]&apos;」（所有人「[OWNERNAME]」，位於「[REGIONNAME]」，方位「[REGIONPOS]」）已被撤除下列權限：[PERMISSIONS]。
+	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		你如果打開帳戶權限，也將一併允許該物件：
 	</string>
 	<string name="ScriptTakeMoney">
 		由你身上拿走林登幣（L$）
 	</string>
 	<string name="ActOnControlInputs">
-		Act on your control inputs
+		按你的控制輸入行動
 	</string>
 	<string name="RemapControlInputs">
-		Remap your control inputs
+		重新規劃你的控制輸入
 	</string>
 	<string name="AnimateYourAvatar">
-		Animate your avatar
+		使化身動起來
 	</string>
 	<string name="AttachToYourAvatar">
-		Attach to your avatar
+		附加到化身
 	</string>
 	<string name="ReleaseOwnership">
-		Release ownership and become public
+		釋出所有權，開放給所有人
 	</string>
 	<string name="LinkAndDelink">
-		Link and delink from other objects
+		連結其他物件或去除連結
 	</string>
 	<string name="AddAndRemoveJoints">
-		Add and remove joints with other objects
+		和其他物件建立或移除旋軸
 	</string>
 	<string name="ChangePermissions">
 		變更它的權限
@@ -741,6 +932,27 @@
 	<string name="NotConnected">
 		未聯接
 	</string>
+	<string name="AgentNameSubst">
+		（你）
+	</string>
+	<string name="TeleportYourAgent">
+		瞬間傳送你本人
+	</string>
+	<string name="JoinAnExperience">
+		加入體驗
+	</string>
+	<string name="SilentlyManageEstateAccess">
+		管理領出入許可名單時，不顯示警示
+	</string>
+	<string name="OverrideYourAnimations">
+		替換你預設的動作
+	</string>
+	<string name="ScriptReturnObjects">
+		為你送返物件
+	</string>
+	<string name="UnknownScriptPermission">
+		（未知）！
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -799,7 +1011,7 @@
 		AVI 視頻檔案
 	</string>
 	<string name="xaf_animation_file">
-		XAF Anim File
+		XAF 動畫檔案
 	</string>
 	<string name="xml_file">
 		XML 檔案
@@ -816,17 +1028,11 @@
 	<string name="choose_the_directory">
 		選擇目錄
 	</string>
-	<string name="AvatarSetNotAway">
-		非離開
-	</string>
-	<string name="AvatarSetAway">
-		離開
-	</string>
-	<string name="AvatarSetNotBusy">
-		非忙碌
+	<string name="script_files">
+		腳本
 	</string>
-	<string name="AvatarSetBusy">
-		忙碌
+	<string name="dictionary_files">
+		字典
 	</string>
 	<string name="shape">
 		體形
@@ -991,19 +1197,19 @@
 		送出由
 	</string>
 	<string name="GroupNotifyAttached">
-		Attached:
+		附件：
 	</string>
 	<string name="GroupNotifyViewPastNotices">
-		View past notices or opt-out of receiving these messages here.
+		在這裡察看舊通知或選擇不接收訊息。
 	</string>
 	<string name="GroupNotifyOpenAttachment">
-		Open Attachment
+		開啟附件
 	</string>
 	<string name="GroupNotifySaveAttachment">
-		Save Attachment
+		儲存附件
 	</string>
 	<string name="TeleportOffer">
-		Teleport offering
+		發出「瞬間傳送」邀請
 	</string>
 	<string name="StartUpNotifications">
 		當你離開時有新的通知送達。
@@ -1042,16 +1248,75 @@
 		按下 ESC 鍵回復到世界的視角
 	</string>
 	<string name="InventoryNoMatchingItems">
-		沒有發現你想要找的嗎？試試 [secondlife:///app/search/all/[SEARCH_TERM] 搜尋]。
+		找不到你要找的嗎？ 請試試 [secondlife:///app/search/places/ 搜尋]。
 	</string>
 	<string name="PlacesNoMatchingItems">
-		沒有發現你想要找的嗎？試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。
+		找不到你要找的嗎？ 請試試 [secondlife:///app/search/places/[SEARCH_TERM] 搜尋]。
 	</string>
 	<string name="FavoritesNoMatchingItems">
-		Drag a landmark here to add it to your favorites.
+		將一個地標拖曳到這裡，加進「我的最愛」。
 	</string>
 	<string name="InventoryNoTexture">
-		You do not have a copy of this texture in your inventory
+		你的收納區裡沒有這個材質的副本
+	</string>
+	<string name="InventoryInboxNoItems">
+		你從第二人生購物市集購買的物品將出現在這裡。 你可以把它們拖曳到你的收納區，開始使用。
+	</string>
+	<string name="MarketplaceURL">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/
+	</string>
+	<string name="MarketplaceURL_CreateStore">
+		http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4
+	</string>
+	<string name="MarketplaceURL_Dashboard">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard
+	</string>
+	<string name="MarketplaceURL_Imports">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports
+	</string>
+	<string name="MarketplaceURL_LearnMore">
+		https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more
+	</string>
+	<string name="InventoryOutboxNotMerchantTitle">
+		任何人都可在第二人生購物市集出售物品。
+	</string>
+	<string name="InventoryOutboxNotMerchantTooltip"/>
+	<string name="InventoryOutboxNotMerchant">
+		如果你想成為商家，你需要在第二人生購物市集[[MARKETPLACE_CREATE_STORE_URL]開設一間商店]。
+	</string>
+	<string name="InventoryOutboxNoItemsTitle">
+		你的發件匣目前是空的。
+	</string>
+	<string name="InventoryOutboxNoItemsTooltip"/>
+	<string name="InventoryOutboxNoItems">
+		將資料夾拖曳到這個區域，再點按「送往第二人生購物市集」，即可在[[MARKETPLACE_DASHBOARD_URL]第二人生購物市集]登列出售。
+	</string>
+	<string name="Marketplace Error None">
+		零錯誤
+	</string>
+	<string name="Marketplace Error Not Merchant">
+		發生錯誤：將物項送往第二人生購物市集之前，你必須取得商家的身份（免費）。
+	</string>
+	<string name="Marketplace Error Empty Folder">
+		錯誤：此資料夾沒有內容。
+	</string>
+	<string name="Marketplace Error Unassociated Products">
+		錯誤：此物項上傳失敗，因為你的商家帳戶有太多和產品無關聯的物項。  要解決這個問題，請登入第二人生購物市集網站，減低你的無關聯物項數目。
+	</string>
+	<string name="Marketplace Error Object Limit">
+		錯誤：此物項包含太多物件。  要解決這錯誤，請將物件裝箱，使總物件數目不超過 200。
+	</string>
+	<string name="Marketplace Error Folder Depth">
+		錯誤：此物項含有太多層的巢狀資料夾。  請加以重新整理，至多允許 3 層的巢狀資料夾。
+	</string>
+	<string name="Marketplace Error Unsellable Item">
+		錯誤：此物項無法在第二人生購物市集出售。
+	</string>
+	<string name="Marketplace Error Internal Import">
+		錯誤：這個物項有問題。  請稍候再試一次。
+	</string>
+	<string name="Open landmarks">
+		開啟地標
 	</string>
 	<string name="no_transfer" value="（禁止轉讓）"/>
 	<string name="no_modify" value="（禁止修改）"/>
@@ -1066,7 +1331,7 @@
 		無內容
 	</string>
 	<string name="WornOnAttachmentPoint" value="（已穿 [ATTACHMENT_POINT]）"/>
-	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
+	<string name="ActiveGesture" value="[GESLABEL]（使用中）"/>
 	<string name="PermYes">
 		是
 	</string>
@@ -1078,30 +1343,27 @@
 	<string name="Wait" value="--- 等待："/>
 	<string name="AnimFlagStop" value="停止動作："/>
 	<string name="AnimFlagStart" value="開始動作："/>
-	<string name="Wave" value="Wave"/>
+	<string name="Wave" value="揮手"/>
 	<string name="GestureActionNone" value="無"/>
-	<string name="HelloAvatar" value="Hello, avatar!"/>
+	<string name="HelloAvatar" value="你好，化身！"/>
 	<string name="ViewAllGestures" value="察看全部 &gt;&gt;"/>
 	<string name="GetMoreGestures" value="取得更多 &gt;&gt;"/>
-	<string name="Animations" value="動作,"/>
-	<string name="Calling Cards" value="名片,"/>
-	<string name="Clothing" value="服裝,"/>
-	<string name="Gestures" value="姿勢,"/>
-	<string name="Landmarks" value="地標,"/>
-	<string name="Notecards" value="記事卡,"/>
-	<string name="Objects" value="物件,"/>
-	<string name="Scripts" value="腳本,"/>
-	<string name="Sounds" value="聲音,"/>
-	<string name="Textures" value="材質,"/>
-	<string name="Snapshots" value="快照,"/>
-	<string name="No Filters" value="No"/>
+	<string name="Animations" value="動作，"/>
+	<string name="Calling Cards" value="名片，"/>
+	<string name="Clothing" value="服裝，"/>
+	<string name="Gestures" value="姿勢，"/>
+	<string name="Landmarks" value="地標，"/>
+	<string name="Notecards" value="記事卡，"/>
+	<string name="Objects" value="物件，"/>
+	<string name="Scripts" value="腳本，"/>
+	<string name="Sounds" value="聲音，"/>
+	<string name="Textures" value="材質，"/>
+	<string name="Snapshots" value="快照，"/>
+	<string name="No Filters" value="否"/>
 	<string name="Since Logoff" value="- 自上次登出"/>
 	<string name="InvFolder My Inventory">
 		我的收納區
 	</string>
-	<string name="InvFolder My Favorites">
-		我的最愛
-	</string>
 	<string name="InvFolder Library">
 		資源庫
 	</string>
@@ -1136,7 +1398,7 @@
 		收納區
 	</string>
 	<string name="InvFolder Uncompressed Images">
-		Uncompressed Images
+		未壓縮圖像
 	</string>
 	<string name="InvFolder Body Parts">
 		身體部位
@@ -1148,10 +1410,10 @@
 		相簿
 	</string>
 	<string name="InvFolder Lost And Found">
-		Lost And Found
+		失物招領
 	</string>
 	<string name="InvFolder Uncompressed Sounds">
-		無壓縮聲音
+		未壓縮聲音
 	</string>
 	<string name="InvFolder Animations">
 		動作
@@ -1165,6 +1427,12 @@
 	<string name="InvFolder favorite">
 		我的最愛
 	</string>
+	<string name="InvFolder Favorites">
+		我的最愛
+	</string>
+	<string name="InvFolder favorites">
+		我的最愛
+	</string>
 	<string name="InvFolder Current Outfit">
 		目前裝扮
 	</string>
@@ -1177,17 +1445,32 @@
 	<string name="InvFolder Accessories">
 		配件
 	</string>
+	<string name="InvFolder Meshes">
+		網面
+	</string>
+	<string name="InvFolder Received Items">
+		收到的物項
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		商家發件匣
+	</string>
 	<string name="InvFolder Friends">
 		朋友
 	</string>
 	<string name="InvFolder All">
 		全部
 	</string>
+	<string name="no_attachments">
+		未穿著任何附件
+	</string>
+	<string name="Attachments remain">
+		附件（尚可容納 [COUNT] 件）
+	</string>
 	<string name="Buy">
 		購買
 	</string>
 	<string name="BuyforL$">
-		Buy for L$
+		出價購買：L$
 	</string>
 	<string name="Stone">
 		石頭
@@ -1211,13 +1494,13 @@
 		橡膠
 	</string>
 	<string name="Light">
-		Light
+		光源
 	</string>
 	<string name="KBShift">
-		Shift
+		Shift 鍵
 	</string>
 	<string name="KBCtrl">
-		Ctrl
+		Ctrl 鍵
 	</string>
 	<string name="Chest">
 		胸部
@@ -1250,7 +1533,7 @@
 		骨盆
 	</string>
 	<string name="Mouth">
-		嘴
+		嘴巴
 	</string>
 	<string name="Chin">
 		下巴
@@ -1309,23 +1592,29 @@
 	<string name="Right Pec">
 		右胸肌
 	</string>
+	<string name="Neck">
+		頸部
+	</string>
+	<string name="Avatar Center">
+		化身中心
+	</string>
 	<string name="Invalid Attachment">
-		無效的附件聯接點
+		無效的附接點
 	</string>
 	<string name="YearsMonthsOld">
-		[AGEYEARS] [AGEMONTHS] old
+		年齡：[AGEYEARS] 年 [AGEMONTHS] 月
 	</string>
 	<string name="YearsOld">
-		[AGEYEARS] old
+		年齡：[AGEYEARS] 年
 	</string>
 	<string name="MonthsOld">
-		[AGEMONTHS] old
+		[AGEMONTHS] 月
 	</string>
 	<string name="WeeksOld">
-		[AGEWEEKS] old
+		[AGEWEEKS] 週
 	</string>
 	<string name="DaysOld">
-		[AGEDAYS] old
+		[AGEDAYS] 天
 	</string>
 	<string name="TodayOld">
 		今日剛加入
@@ -1367,40 +1656,40 @@
 		[COUNT] 天
 	</string>
 	<string name="GroupMembersA">
-		[COUNT] 成員
+		[COUNT] 位成員
 	</string>
 	<string name="GroupMembersB">
-		[COUNT] 成員
+		[COUNT] 位成員
 	</string>
 	<string name="GroupMembersC">
-		[COUNT] 成員
+		[COUNT] 位成員
 	</string>
 	<string name="AcctTypeResident">
 		居民
 	</string>
 	<string name="AcctTypeTrial">
-		Trial
+		試用
 	</string>
 	<string name="AcctTypeCharterMember">
-		Charter Member
+		老牌 Charter 成員
 	</string>
 	<string name="AcctTypeEmployee">
 		林登實驗室員工
 	</string>
 	<string name="PaymentInfoUsed">
-		Payment Info Used
+		使用的付款資料
 	</string>
 	<string name="PaymentInfoOnFile">
-		Payment Info On File
+		預留付款資料
 	</string>
 	<string name="NoPaymentInfoOnFile">
-		No Payment Info On File
+		未預留付款資料
 	</string>
 	<string name="AgeVerified">
-		已年齡驗證
+		通過年齡驗證
 	</string>
 	<string name="NotAgeVerified">
-		未年齡驗證
+		未通過年齡驗證
 	</string>
 	<string name="Center 2">
 		中央 2
@@ -1427,22 +1716,22 @@
 		右下
 	</string>
 	<string name="CompileQueueDownloadedCompiling">
-		已下載，現在進行編譯中
+		已下載，正在編譯中
 	</string>
 	<string name="CompileQueueScriptNotFound">
 		伺服器上未發現腳本。
 	</string>
 	<string name="CompileQueueProblemDownloading">
-		問題下載中
+		下載時出問題
 	</string>
 	<string name="CompileQueueInsufficientPermDownload">
-		Insufficient permissions to download a script.
+		下載腳本的權限不足。
 	</string>
 	<string name="CompileQueueInsufficientPermFor">
-		Insufficient permissions for
+		權限不足：
 	</string>
 	<string name="CompileQueueUnknownFailure">
-		Unknown failure to download
+		下載失敗，原因不明
 	</string>
 	<string name="CompileQueueTitle">
 		重新編譯進度
@@ -1457,19 +1746,19 @@
 		重設
 	</string>
 	<string name="RunQueueTitle">
-		設定執行中程序
+		設定「執行中」進度
 	</string>
 	<string name="RunQueueStart">
-		設為執行中
+		設為「執行中」
 	</string>
 	<string name="NotRunQueueTitle">
-		設定非執行中程序
+		設定「非執行中」進度
 	</string>
 	<string name="NotRunQueueStart">
-		設為非執行中
+		設為「非執行中」
 	</string>
 	<string name="CompileSuccessful">
-		編譯成功!!
+		編譯成功！
 	</string>
 	<string name="CompileSuccessfulSaving">
 		編譯成功，儲存中...
@@ -1490,36 +1779,42 @@
 	<string name="Unknown">
 		（未知）
 	</string>
-	<string name="SummaryForTheWeek" value="Summary for this week, beginning on"/>
+	<string name="SummaryForTheWeek" value="本週摘要，起始日："/>
 	<string name="NextStipendDay" value="下一個發薪日為"/>
-	<string name="GroupIndividualShare" value="Group       Individual Share"/>
+	<string name="GroupPlanningDate">
+		[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]
+	</string>
+	<string name="GroupIndividualShare" value="群組       個人份額"/>
 	<string name="GroupColumn" value="群組"/>
 	<string name="Balance">
-		Balance
+		餘額
 	</string>
 	<string name="Credits">
-		Credits
+		貸記
 	</string>
 	<string name="Debits">
-		Debits
+		借記
 	</string>
 	<string name="Total">
-		Total
+		總額
 	</string>
 	<string name="NoGroupDataFound">
-		無群組資料發現
+		查無群組資料
 	</string>
 	<string name="IMParentEstate">
-		parent estate
+		母領地
 	</string>
 	<string name="IMMainland">
-		mainland
+		大陸
 	</string>
 	<string name="IMTeen">
-		teen
+		青少年
+	</string>
+	<string name="Anyone">
+		任何人
 	</string>
 	<string name="RegionInfoError">
-		error
+		錯誤
 	</string>
 	<string name="RegionInfoAllEstatesOwnedBy">
 		[OWNER] 所擁有的的全部領地
@@ -1528,13 +1823,13 @@
 		你所擁有的全部領地
 	</string>
 	<string name="RegionInfoAllEstatesYouManage">
-		all estates that you manage for [OWNER]
+		你為 [OWNER] 管理的全部領地
 	</string>
 	<string name="RegionInfoAllowedResidents">
-		Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])
+		允許居民：（[ALLOWEDAGENTS]，最多 [MAXACCESS]）
 	</string>
 	<string name="RegionInfoAllowedGroups">
-		允許的群群組：（[ALLOWEDGROUPS]，最大 [MAXACCESS]）
+		允許的群組：（[ALLOWEDGROUPS]，最多 [MAXACCESS]）
 	</string>
 	<string name="ScriptLimitsParcelScriptMemory">
 		地段腳本記憶體
@@ -1549,28 +1844,28 @@
 		記憶體用量：[COUNT] kb
 	</string>
 	<string name="ScriptLimitsParcelScriptURLs">
-		地段腳本 URLs
+		地段腳本的 URL
 	</string>
 	<string name="ScriptLimitsURLsUsed">
-		URLs used: [COUNT] out of [MAX]; [AVAILABLE] available
+		URL 使用狀況：最多可用 [MAX]，已用 [COUNT]，剩餘 [AVAILABLE]
 	</string>
 	<string name="ScriptLimitsURLsUsedSimple">
-		URLs used: [COUNT]
+		已用 URL：[COUNT]
 	</string>
 	<string name="ScriptLimitsRequestError">
-		Error requesting information
+		調資料時出錯
 	</string>
 	<string name="ScriptLimitsRequestNoParcelSelected">
-		無地段被選擇
+		未選擇地段
 	</string>
 	<string name="ScriptLimitsRequestWrongRegion">
-		Error: script information is only available in your current region
+		錯誤：只能在你目前所處區域取得腳本資訊
 	</string>
 	<string name="ScriptLimitsRequestWaiting">
-		Retrieving information...
+		正在調閱資料...
 	</string>
 	<string name="ScriptLimitsRequestDontOwnParcel">
-		You do not have permission to examine this parcel
+		你無權審視此地段
 	</string>
 	<string name="SITTING_ON">
 		坐在
@@ -1666,34 +1961,40 @@
 		左胸肌
 	</string>
 	<string name="ATTACH_HUD_CENTER_2">
-		HUD Center 2
+		擡頭顯示中央 2
 	</string>
 	<string name="ATTACH_HUD_TOP_RIGHT">
-		HUD Top Right
+		擡頭顯示右上
 	</string>
 	<string name="ATTACH_HUD_TOP_CENTER">
-		HUD Top Center
+		擡頭顯示中央上方
 	</string>
 	<string name="ATTACH_HUD_TOP_LEFT">
-		HUD Top Left
+		擡頭顯示左上
 	</string>
 	<string name="ATTACH_HUD_CENTER_1">
-		HUD Center 1
+		擡頭顯示中央 1
 	</string>
 	<string name="ATTACH_HUD_BOTTOM_LEFT">
-		HUD Bottom Left
+		擡頭顯示左下
 	</string>
 	<string name="ATTACH_HUD_BOTTOM">
-		HUD Bottom
+		擡頭顯示下方
 	</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
-		HUD Bottom Right
+		擡頭顯示右下
+	</string>
+	<string name="ATTACH_NECK">
+		頸部
+	</string>
+	<string name="ATTACH_AVATAR_CENTER">
+		化身中心
 	</string>
 	<string name="CursorPos">
-		Line [LINE], Column [COLUMN]
+		橫行 [LINE]，縱列 [COLUMN]
 	</string>
 	<string name="PanelDirCountFound">
-		[COUNT] found
+		找到 [COUNT]
 	</string>
 	<string name="PanelDirTimeStr">
 		[hour12,datetime,slt]:[min,datetime,slt] [ampm,datetime,slt]
@@ -1702,16 +2003,16 @@
 		[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
 	<string name="PanelContentsTooltip">
-		物件的內容
+		物件內容
 	</string>
 	<string name="PanelContentsNewScript">
 		新腳本
 	</string>
-	<string name="BusyModeResponseDefault">
-		你傳送訊息的居民目前處於忙碌模式中，這意味著他要求不被打擾。你所傳的訊息仍將會留存並顯示於 IM 面板上供他稍後時查閱。
+	<string name="DoNotDisturbModeResponseDefault">
+		這居民處於「請勿打擾」狀態，不會立即看到你的訊息。
 	</string>
 	<string name="MuteByName">
-		（由名稱）
+		（按名稱）
 	</string>
 	<string name="MuteAgent">
 		（居民）
@@ -1726,12 +2027,12 @@
 		（外部）
 	</string>
 	<string name="RegionNoCovenant">
-		此領地未提供任何契約要求。
+		此領地沒有任何契約要求。
 	</string>
 	<string name="RegionNoCovenantOtherOwner">
-		There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.
+		此領地沒有任何契約要求。 本領地土地的出售人是領地所有人，不是林登實驗室。  請聯絡領地所有人獲知售地詳情。
 	</string>
-	<string name="covenant_last_modified" value="最後修改於："/>
+	<string name="covenant_last_modified" value="最後修改時間："/>
 	<string name="none_text" value="（無）"/>
 	<string name="never_text" value="（絕不）"/>
 	<string name="GroupOwned">
@@ -1740,14 +2041,20 @@
 	<string name="Public">
 		公開
 	</string>
+	<string name="LocalSettings">
+		本地設定
+	</string>
+	<string name="RegionSettings">
+		地區設定
+	</string>
 	<string name="ClassifiedClicksTxt">
-		Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile
+		點按：[TELEPORT] 瞬間傳送，[MAP] 地圖，[PROFILE] 檔案
 	</string>
 	<string name="ClassifiedUpdateAfterPublish">
-		（將於發布後自動更新）
+		（將於發布後更新）
 	</string>
 	<string name="NoPicksClassifiedsText">
-		You haven&apos;t created any Picks or Classifieds. Click the Plus button below to create a Pick or Classified.
+		你尚未建立任何精選地點或個人廣告。 點按下面的 + 按鈕建立精選地點或個人廣告。
 	</string>
 	<string name="NoAvatarPicksClassifiedsText">
 		使用者無精選地點或個人廣告
@@ -1762,86 +2069,86 @@
 		屬性
 	</string>
 	<string name="InvOfferAnObjectNamed">
-		An object named
+		一個物件，名為
 	</string>
 	<string name="InvOfferOwnedByGroup">
-		群組所擁有
+		屬於群組
 	</string>
 	<string name="InvOfferOwnedByUnknownGroup">
-		由一個未知的群組所擁有
+		屬於一個未知群組
 	</string>
 	<string name="InvOfferOwnedBy">
-		owned by
+		所有人：
 	</string>
 	<string name="InvOfferOwnedByUnknownUser">
-		owned by an unknown user
+		屬於某未知使用者
 	</string>
 	<string name="InvOfferGaveYou">
-		gave you
+		給予你
 	</string>
 	<string name="InvOfferDecline">
-		You decline [DESC] from &lt;nolink&gt;[NAME]&lt;/nolink&gt;.
+		你拒絕了來自 &lt;nolink&gt;[NAME]&lt;/nolink&gt; 的 [DESC]。
 	</string>
 	<string name="GroupMoneyTotal">
-		Total
+		總額
 	</string>
 	<string name="GroupMoneyBought">
-		bought
+		買了
 	</string>
 	<string name="GroupMoneyPaidYou">
-		paid you
+		支付給你
 	</string>
 	<string name="GroupMoneyPaidInto">
-		paid into
+		支付給
 	</string>
 	<string name="GroupMoneyBoughtPassTo">
-		bought pass to
+		買了通行權：
 	</string>
 	<string name="GroupMoneyPaidFeeForEvent">
-		paid fee for event
+		付了費用參加活動
 	</string>
 	<string name="GroupMoneyPaidPrizeForEvent">
-		paid prize for event
+		付了賞金參加活動
 	</string>
 	<string name="GroupMoneyBalance">
-		Balance
+		餘額
 	</string>
 	<string name="GroupMoneyCredits">
-		Credits
+		貸記
 	</string>
 	<string name="GroupMoneyDebits">
-		Debits
+		借記
 	</string>
-	<string name="ViewerObjectContents">
-		Contents
+	<string name="GroupMoneyDate">
+		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
 	<string name="AcquiredItems">
-		Acquired Items
+		取得物品
 	</string>
 	<string name="Cancel">
 		取消
 	</string>
 	<string name="UploadingCosts">
-		花費 L$ [AMOUNT] 上傳 [NAME]
+		上傳 [NAME] 費用 L$ [AMOUNT]
 	</string>
 	<string name="BuyingCosts">
-		花費 L$ [AMOUNT] 購買這個
+		購買這個需要 L$ [AMOUNT]
 	</string>
 	<string name="UnknownFileExtension">
 		未知的副檔名 .%s
-預期為 .wav, .tga, .bmp, .jpg, .jpeg, or .bvh　類型
+應該是 .wav、.tga、.bmp、.jpg、.jpeg 或 .bvh
 	</string>
 	<string name="MuteObject2">
-		Block
+		封鎖
 	</string>
 	<string name="MuteAvatar">
-		Block
+		封鎖
 	</string>
 	<string name="UnmuteObject">
-		Unblock
+		解除封鎖
 	</string>
 	<string name="UnmuteAvatar">
-		Unblock
+		解除封鎖
 	</string>
 	<string name="AddLandmarkNavBarMenu">
 		添加到我的地標...
@@ -1877,25 +2184,25 @@
 		接收中
 	</string>
 	<string name="AM">
-		AM
+		上午
 	</string>
 	<string name="PM">
-		PM
+		下午
 	</string>
 	<string name="PST">
-		PST
+		太平洋時間
 	</string>
 	<string name="PDT">
-		PDT
+		太平洋日光節約時間
 	</string>
 	<string name="Direction_Forward">
 		向前
 	</string>
 	<string name="Direction_Left">
-		向左
+		左移鍵
 	</string>
 	<string name="Direction_Right">
-		向右
+		右移鍵
 	</string>
 	<string name="Direction_Back">
 		向後
@@ -1913,46 +2220,46 @@
 		東
 	</string>
 	<string name="Direction_Up">
-		向上
+		上移鍵
 	</string>
 	<string name="Direction_Down">
-		向下
+		下移鍵
 	</string>
 	<string name="Any Category">
 		任何類別
 	</string>
 	<string name="Shopping">
-		採購
+		購物
 	</string>
 	<string name="Land Rental">
-		Land Rental
+		土地租賃
 	</string>
 	<string name="Property Rental">
-		Property Rental
+		房產租賃
 	</string>
 	<string name="Special Attraction">
-		Special Attraction
+		熱門地點
 	</string>
 	<string name="New Products">
-		New Products
+		新產品
 	</string>
 	<string name="Employment">
-		Employment
+		徵人
 	</string>
 	<string name="Wanted">
-		Wanted
+		徵求
 	</string>
 	<string name="Service">
-		Service
+		服務
 	</string>
 	<string name="Personal">
-		Personal
+		交友
 	</string>
 	<string name="None">
 		無
 	</string>
 	<string name="Linden Location">
-		Linden Location
+		林登位置
 	</string>
 	<string name="Adult">
 		完全成人
@@ -1973,25 +2280,25 @@
 		聚會所
 	</string>
 	<string name="Newcomer Friendly">
-		新手友善
+		歡迎新手光臨
 	</string>
 	<string name="Parks&amp;Nature">
-		公園與自然
+		公園與自然景觀
 	</string>
 	<string name="Residential">
 		住宅
 	</string>
 	<string name="Stage">
-		Stage
+		舞臺
 	</string>
 	<string name="Other">
-		Other
+		其他
 	</string>
 	<string name="Rental">
-		Rental
+		出租
 	</string>
 	<string name="Any">
-		Any
+		任何
 	</string>
 	<string name="You">
 		你
@@ -2027,7 +2334,7 @@
 		多媒體
 	</string>
 	<string name="Play Media">
-		播放／暫停 媒體
+		播放/暫停媒體
 	</string>
 	<string name="MBCmdLineError">
 		解析命令列時發現錯誤。
@@ -2038,1510 +2345,1513 @@
 		[APP_NAME] 命令列用法：
 	</string>
 	<string name="MBUnableToAccessFile">
-		[APP_NAME] 無法存取它所需要的檔案。
+		[APP_NAME] 無法存取它所需的檔案。
 
-This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
-If this message persists, restart your computer and try again.
-If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
+你可能有多重實例執行中，或你的系統誤以為某檔案已經開啟。
+如果這個訊息持續出現，請重新啟動你的電腦。
+如果問題仍然存在，你可能需要徹底卸除 [APP_NAME] 再重新安裝。
 	</string>
 	<string name="MBFatalError">
 		致命錯誤
 	</string>
 	<string name="MBRequiresAltiVec">
-		[APP_NAME] requires a processor with AltiVec (G4 or later).
+		[APP_NAME] 需要有 AltiVec（G4 或更新版）的處理器。
 	</string>
 	<string name="MBAlreadyRunning">
 		[APP_NAME] 已經在執行中。
-請檢查你的工作列裡是否有其他最小化的相同程式。
+請檢查你的工作列裡是否已有最小化的相同程式。
 如果這個訊息持續出現，請重新啟動你的電腦。
 	</string>
 	<string name="MBFrozenCrashed">
-		[APP_NAME] appears to have frozen or crashed on the previous run.
-Would you like to send a crash report?
+		[APP_NAME] 上次執行時好像出現凍結或當掉。
+你是否想要報告當機事例？
 	</string>
 	<string name="MBAlert">
 		通知
 	</string>
 	<string name="MBNoDirectX">
-		[APP_NAME] is unable to detect DirectX 9.0b or greater.
-[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes.  While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b.
+		[APP_NAME] 偵測不到 DirectX 9.0b 或更新版。
+[APP_NAME] 使用 DirectX 來偵測可能導致不穩定、執行效能不佳或當機發生的硬體或老舊驅動器。  你可以選擇不用 DirectX 9.0b 來執行 [APP_NAME]，但我們大力推薦你使用。
 
-Do you wish to continue?
+你確定要繼續嗎？
 	</string>
 	<string name="MBWarning">
 		警告
 	</string>
 	<string name="MBNoAutoUpdate">
-		Automatic updating is not yet implemented for Linux.
-Please download the latest version from www.secondlife.com.
+		尚無試用於 Linux 的自動更新功能。
+請到 www.secondlife.com 下載最新版本。
 	</string>
 	<string name="MBRegClassFailed">
-		RegisterClass failed
+		RegisterClass 失敗
 	</string>
 	<string name="MBError">
 		錯誤
 	</string>
 	<string name="MBFullScreenErr">
-		無法執行全螢幕於 [WIDTH] x [HEIGHT].
-執行於視窗中。
+		[WIDTH] x [HEIGHT] 解析度下無法執行全螢幕。
+在視窗中執行。
 	</string>
 	<string name="MBDestroyWinFailed">
-		Shutdown Error while destroying window (DestroyWindow() failed)
+		消滅視窗時發生強行關閉錯誤（DestroyWindow()失敗）
 	</string>
 	<string name="MBShutdownErr">
-		Shutdown Error
+		強行關閉出錯
 	</string>
 	<string name="MBDevContextErr">
-		Can&apos;t make GL device context
+		無法建立 GL 裝置環境
 	</string>
 	<string name="MBPixelFmtErr">
-		Can&apos;t find suitable pixel format
+		找不到適合的像素格式
 	</string>
 	<string name="MBPixelFmtDescErr">
-		Can&apos;t get pixel format description
+		無法取得像素格式描述
 	</string>
 	<string name="MBTrueColorWindow">
-		[APP_NAME] requires True Color (32-bit) to run.
-Please go to your computer&apos;s display settings and set the color mode to 32-bit.
+		[APP_NAME] 需要全彩（32位元）才能執行。
+請到電腦的顯示設定，將色彩模式設為 32 位元。
 	</string>
 	<string name="MBAlpha">
-		[APP_NAME] is unable to run because it can&apos;t get an 8 bit alpha channel.  Usually this is due to video card driver issues.
-Please make sure you have the latest video card drivers installed.
-Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; Display &gt; Settings.
-If you continue to receive this message, contact the [SUPPORT_SITE].
+		[APP_NAME] 無法執行，無法取得 8 位元 alpha 頻道。  這通常是因為顯示卡驅動程式出問題。
+請確定你安裝了最新的顯示卡驅動程式。
+請到控制台 &gt; 顯示 &gt; 設定處將螢幕設為全彩（32 位元）。
+如果你繼續看到此訊息，請聯絡 [SUPPORT_SITE]。
 	</string>
 	<string name="MBPixelFmtSetErr">
 		無法設定像素格式
 	</string>
 	<string name="MBGLContextErr">
-		Can&apos;t create GL rendering context
+		無法建立 GL 呈像環境
 	</string>
 	<string name="MBGLContextActErr">
-		Can&apos;t activate GL rendering context
+		無法啟動 GL 呈像環境
 	</string>
 	<string name="MBVideoDrvErr">
-		[APP_NAME] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them.
+		[APP_NAME] 無法執行，這可能因為你的顯示卡驅動程式安裝不當、版本過舊，或者你的硬體不受支援。 請確定你安裝了最新的顯示卡驅動程式。如果已裝了最新驅動程式，請再重新安裝。
 
-If you continue to receive this message, contact the [SUPPORT_SITE].
+如果你繼續看到此訊息，請聯絡 [SUPPORT_SITE]。
 	</string>
 	<string name="5 O&apos;Clock Shadow">
-		5 O&apos;Clock Shadow
+		下午五點的新鬍渣
 	</string>
 	<string name="All White">
 		全白
 	</string>
 	<string name="Anime Eyes">
-		Anime Eyes
+		日式動漫眼
 	</string>
 	<string name="Arced">
-		Arced
+		彎拱的
 	</string>
 	<string name="Arm Length">
-		Arm Length
+		臂長
 	</string>
 	<string name="Attached">
-		Attached
+		貼附的
 	</string>
 	<string name="Attached Earlobes">
-		Attached Earlobes
+		附著耳垂
 	</string>
 	<string name="Back Fringe">
-		Back Fringe
+		後瀏海
 	</string>
 	<string name="Baggy">
-		Baggy
+		袋型的
 	</string>
 	<string name="Bangs">
-		Bangs
+		瀏海
 	</string>
 	<string name="Beady Eyes">
-		Beady Eyes
+		珠圓銳光眼
 	</string>
 	<string name="Belly Size">
-		Belly Size
+		腹部大小
 	</string>
 	<string name="Big">
-		Big
+		大
 	</string>
 	<string name="Big Butt">
-		Big Butt
+		大臀部
 	</string>
 	<string name="Big Hair Back">
-		Big Hair: Back
+		大型頭髮：後面
 	</string>
 	<string name="Big Hair Front">
-		Big Hair: Front
+		大型頭髮：前面
 	</string>
 	<string name="Big Hair Top">
-		Big Hair: Top
+		大型頭髮：頂部
 	</string>
 	<string name="Big Head">
-		Big Head
+		大頭
 	</string>
 	<string name="Big Pectorals">
-		Big Pectorals
+		大胸肌
 	</string>
 	<string name="Big Spikes">
-		Big Spikes
+		大尖直髮
 	</string>
 	<string name="Black">
-		Black
+		黑色
 	</string>
 	<string name="Blonde">
-		Blonde
+		金色
 	</string>
 	<string name="Blonde Hair">
-		Blonde Hair
+		金髮
 	</string>
 	<string name="Blush">
-		Blush
+		腮紅
 	</string>
 	<string name="Blush Color">
-		Blush Color
+		淺粉色
 	</string>
 	<string name="Blush Opacity">
-		Blush Opacity
+		腮紅不透明度：
 	</string>
 	<string name="Body Definition">
-		Body Definition
+		身體結實度
 	</string>
 	<string name="Body Fat">
-		Body Fat
+		體脂肪
 	</string>
 	<string name="Body Freckles">
-		Body Freckles
+		身體雀斑
 	</string>
 	<string name="Body Thick">
-		Body Thick
+		寬厚體型
 	</string>
 	<string name="Body Thickness">
-		Body Thickness
+		體型厚度
 	</string>
 	<string name="Body Thin">
-		Body Thin
+		窄瘦體型
 	</string>
 	<string name="Bow Legged">
-		Bow Legged
+		弓形腿
 	</string>
 	<string name="Breast Buoyancy">
-		Breast Buoyancy
+		乳房彈性
 	</string>
 	<string name="Breast Cleavage">
-		Breast Cleavage
+		乳溝深淺
 	</string>
 	<string name="Breast Size">
-		Breast Size
+		乳房尺寸
 	</string>
 	<string name="Bridge Width">
-		Bridge Width
+		兩眼間距
 	</string>
 	<string name="Broad">
-		Broad
+		寬
 	</string>
 	<string name="Brow Size">
-		Brow Size
+		眉毛大小
 	</string>
 	<string name="Bug Eyes">
-		Bug Eyes
+		突眼
 	</string>
 	<string name="Bugged Eyes">
-		Bugged Eyes
+		突眼
 	</string>
 	<string name="Bulbous">
-		Bulbous
+		球狀
 	</string>
 	<string name="Bulbous Nose">
-		Bulbous Nose
+		球狀鼻
 	</string>
 	<string name="Breast Physics Mass">
-		Breast Mass
+		乳房質量
 	</string>
 	<string name="Breast Physics Smoothing">
-		Breast Smoothing
+		乳房增圓滑
 	</string>
 	<string name="Breast Physics Gravity">
-		Breast Gravity
+		乳房重力特性
 	</string>
 	<string name="Breast Physics Drag">
-		Breast Drag
+		乳房阻力
 	</string>
 	<string name="Breast Physics InOut Max Effect">
-		Max Effect
+		最大效果
 	</string>
 	<string name="Breast Physics InOut Spring">
-		Spring
+		彈跳
 	</string>
 	<string name="Breast Physics InOut Gain">
-		Gain
+		增益
 	</string>
 	<string name="Breast Physics InOut Damping">
-		Damping
+		阻尼
 	</string>
 	<string name="Breast Physics UpDown Max Effect">
-		Max Effect
+		最大效果
 	</string>
 	<string name="Breast Physics UpDown Spring">
-		Spring
+		彈跳
 	</string>
 	<string name="Breast Physics UpDown Gain">
-		Gain
+		增益
 	</string>
 	<string name="Breast Physics UpDown Damping">
-		Damping
+		阻尼
 	</string>
 	<string name="Breast Physics LeftRight Max Effect">
-		Max Effect
+		最大效果
 	</string>
 	<string name="Breast Physics LeftRight Spring">
-		Spring
+		彈跳
 	</string>
 	<string name="Breast Physics LeftRight Gain">
-		Gain
+		增益
 	</string>
 	<string name="Breast Physics LeftRight Damping">
-		Damping
+		阻尼
 	</string>
 	<string name="Belly Physics Mass">
-		Belly Mass
+		腹部質量
 	</string>
 	<string name="Belly Physics Smoothing">
-		Belly Smoothing
+		腹部增圓滑
 	</string>
 	<string name="Belly Physics Gravity">
-		Belly Gravity
+		腹部重力特性
 	</string>
 	<string name="Belly Physics Drag">
-		Belly Drag
+		腹部阻力
 	</string>
 	<string name="Belly Physics UpDown Max Effect">
-		Max Effect
+		最大效果
 	</string>
 	<string name="Belly Physics UpDown Spring">
-		Spring
+		彈跳
 	</string>
 	<string name="Belly Physics UpDown Gain">
-		Gain
+		增益
 	</string>
 	<string name="Belly Physics UpDown Damping">
-		Damping
+		阻尼
 	</string>
 	<string name="Butt Physics Mass">
-		Butt Mass
+		臀部質量
 	</string>
 	<string name="Butt Physics Smoothing">
-		Butt Smoothing
+		臀部增圓滑
 	</string>
 	<string name="Butt Physics Gravity">
-		Butt Gravity
+		臀部重力特性
 	</string>
 	<string name="Butt Physics Drag">
-		Butt Drag
+		臀部阻力
 	</string>
 	<string name="Butt Physics UpDown Max Effect">
-		Max Effect
+		最大效果
 	</string>
 	<string name="Butt Physics UpDown Spring">
-		Spring
+		彈跳
 	</string>
 	<string name="Butt Physics UpDown Gain">
-		Gain
+		增益
 	</string>
 	<string name="Butt Physics UpDown Damping">
-		Damping
+		阻尼
 	</string>
 	<string name="Butt Physics LeftRight Max Effect">
-		Max Effect
+		最大效果
 	</string>
 	<string name="Butt Physics LeftRight Spring">
-		Spring
+		彈跳
 	</string>
 	<string name="Butt Physics LeftRight Gain">
-		Gain
+		增益
 	</string>
 	<string name="Butt Physics LeftRight Damping">
-		Damping
+		阻尼
 	</string>
 	<string name="Bushy Eyebrows">
-		Bushy Eyebrows
+		濃眉
 	</string>
 	<string name="Bushy Hair">
-		Bushy Hair
+		濃密頭髮
 	</string>
 	<string name="Butt Size">
-		Butt Size
+		臀部大小
 	</string>
 	<string name="Butt Gravity">
-		Butt Gravity
+		臀部重力特性
 	</string>
 	<string name="bustle skirt">
-		Bustle Skirt
+		側皺過膝長裙
 	</string>
 	<string name="no bustle">
-		No Bustle
+		無側皺
 	</string>
 	<string name="more bustle">
-		More Bustle
+		增加側皺
 	</string>
 	<string name="Chaplin">
 		Chaplin
 	</string>
 	<string name="Cheek Bones">
-		Cheek Bones
+		顴骨
 	</string>
 	<string name="Chest Size">
-		Chest Size
+		胸部大小
 	</string>
 	<string name="Chin Angle">
 		下巴角度
 	</string>
 	<string name="Chin Cleft">
-		Chin Cleft
+		下巴裂度
 	</string>
 	<string name="Chin Curtains">
-		Chin Curtains
+		絡腮鬍
 	</string>
 	<string name="Chin Depth">
-		Chin Depth
+		下巴深度
 	</string>
 	<string name="Chin Heavy">
-		Chin Heavy
+		下巴厚重
 	</string>
 	<string name="Chin In">
-		Chin In
+		下巴後縮
 	</string>
 	<string name="Chin Out">
-		Chin Out
+		下巴突出
 	</string>
 	<string name="Chin-Neck">
-		Chin-Neck
+		下巴-頸部
 	</string>
 	<string name="Clear">
 		清除
 	</string>
 	<string name="Cleft">
-		Cleft
+		分裂
 	</string>
 	<string name="Close Set Eyes">
-		Close Set Eyes
+		雙眼靠近
 	</string>
 	<string name="Closed">
-		Closed
+		閉合
 	</string>
 	<string name="Closed Back">
-		Closed Back
+		後閉合
 	</string>
 	<string name="Closed Front">
-		Closed Front
+		前閉合
 	</string>
 	<string name="Closed Left">
-		Closed Left
+		左閉合
 	</string>
 	<string name="Closed Right">
-		Closed Right
+		右閉合
 	</string>
 	<string name="Coin Purse">
-		Coin Purse
+		小錢包
 	</string>
 	<string name="Collar Back">
-		Collar Back
+		後 Collar
 	</string>
 	<string name="Collar Front">
-		Collar Front
+		前 Collar
 	</string>
 	<string name="Corner Down">
-		Corner Down
+		角落朝下
 	</string>
 	<string name="Corner Up">
-		Corner Up
+		角落朝上
 	</string>
 	<string name="Creased">
-		Creased
+		皺褶
 	</string>
 	<string name="Crooked Nose">
-		Crooked Nose
+		彎曲鼻
 	</string>
 	<string name="Cuff Flare">
-		Cuff Flare
+		袖口裝飾
 	</string>
 	<string name="Dark">
-		Dark
+		深暗
 	</string>
 	<string name="Dark Green">
-		Dark Green
+		深綠
 	</string>
 	<string name="Darker">
-		Darker
+		更深暗
 	</string>
 	<string name="Deep">
-		Deep
+		深
 	</string>
 	<string name="Default Heels">
-		Default Heels
+		預設高跟鞋
 	</string>
 	<string name="Dense">
-		Dense
+		稠密
 	</string>
 	<string name="Double Chin">
-		Double Chin
+		雙下巴
 	</string>
 	<string name="Downturned">
-		Downturned
+		嘴角下垂
 	</string>
 	<string name="Duffle Bag">
-		Duffle Bag
+		旅行袋
 	</string>
 	<string name="Ear Angle">
-		Ear Angle
+		耳朵角度
 	</string>
 	<string name="Ear Size">
-		Ear Size
+		耳朵大小
 	</string>
 	<string name="Ear Tips">
-		Ear Tips
+		耳端
 	</string>
 	<string name="Egg Head">
-		Egg Head
+		蛋形頭
 	</string>
 	<string name="Eye Bags">
-		Eye Bags
+		眼袋
 	</string>
 	<string name="Eye Color">
-		Eye Color
+		眼睛顏色
 	</string>
 	<string name="Eye Depth">
-		Eye Depth
+		眼睛深度
 	</string>
 	<string name="Eye Lightness">
-		Eye Lightness
+		眼睛亮度
 	</string>
 	<string name="Eye Opening">
-		Eye Opening
+		眼睛垂直大小
 	</string>
 	<string name="Eye Pop">
-		Eye Pop
+		眼睛 Pop
 	</string>
 	<string name="Eye Size">
-		Eye Size
+		眼睛大小
 	</string>
 	<string name="Eye Spacing">
-		Eye Spacing
+		雙眼間距
 	</string>
 	<string name="Eyebrow Arc">
-		Eyebrow Arc
+		眉毛弧度
 	</string>
 	<string name="Eyebrow Density">
-		Eyebrow Density
+		眉毛密度
 	</string>
 	<string name="Eyebrow Height">
-		Eyebrow Height
+		眉毛高度
 	</string>
 	<string name="Eyebrow Points">
-		Eyebrow Points
+		眉毛點
 	</string>
 	<string name="Eyebrow Size">
-		Eyebrow Size
+		眉毛尺寸
 	</string>
 	<string name="Eyelash Length">
-		Eyelash Length
+		睫毛長度
 	</string>
 	<string name="Eyeliner">
-		Eyeliner
+		眼線筆
 	</string>
 	<string name="Eyeliner Color">
-		Eyeliner Color
+		眼影筆顏色
 	</string>
 	<string name="Eyes Bugged">
-		Eyes Bugged
+		突眼
 	</string>
 	<string name="Face Shear">
-		Face Shear
+		臉部偏移
 	</string>
 	<string name="Facial Definition">
-		Facial Definition
+		臉部結實度
 	</string>
 	<string name="Far Set Eyes">
-		Far Set Eyes
+		雙眼距離遠
 	</string>
 	<string name="Fat Lips">
-		Fat Lips
+		厚脣
 	</string>
 	<string name="Female">
-		Female
+		女性
 	</string>
 	<string name="Fingerless">
-		Fingerless
+		無手指
 	</string>
 	<string name="Fingers">
-		Fingers
+		手指
 	</string>
 	<string name="Flared Cuffs">
-		Flared Cuffs
+		帶裝飾袖口
 	</string>
 	<string name="Flat">
-		Flat
+		平
 	</string>
 	<string name="Flat Butt">
-		Flat Butt
+		臀部扁平
 	</string>
 	<string name="Flat Head">
-		Flat Head
+		頭部扁平
 	</string>
 	<string name="Flat Toe">
-		Flat Toe
+		腳趾扁平
 	</string>
 	<string name="Foot Size">
-		Foot Size
+		腳部大小
 	</string>
 	<string name="Forehead Angle">
-		Forehead Angle
+		前額角度
 	</string>
 	<string name="Forehead Heavy">
-		Forehead Heavy
+		前額寬厚
 	</string>
 	<string name="Freckles">
-		Freckles
+		雀斑
 	</string>
 	<string name="Front Fringe">
-		Front Fringe
+		前瀏海
 	</string>
 	<string name="Full Back">
-		Full Back
+		後部飽滿
 	</string>
 	<string name="Full Eyeliner">
-		Full Eyeliner
+		厚重眼線
 	</string>
 	<string name="Full Front">
-		Full Front
+		前面飽滿
 	</string>
 	<string name="Full Hair Sides">
-		Full Hair Sides
+		側髮飽滿
 	</string>
 	<string name="Full Sides">
-		Full Sides
+		兩側飽滿
 	</string>
 	<string name="Glossy">
-		Glossy
+		光亮
 	</string>
 	<string name="Glove Fingers">
-		Glove Fingers
+		手套手指
 	</string>
 	<string name="Glove Length">
-		Glove Length
+		手套長度
 	</string>
 	<string name="Hair">
 		頭髮
 	</string>
 	<string name="Hair Back">
-		Hair: Back
+		頭髮：後面
 	</string>
 	<string name="Hair Front">
-		Hair: Front
+		頭髮：前面
 	</string>
 	<string name="Hair Sides">
-		Hair: Sides
+		頭髮：側面
 	</string>
 	<string name="Hair Sweep">
-		Hair Sweep
+		頭髮垂擺
 	</string>
 	<string name="Hair Thickess">
-		Hair Thickness
+		頭髮厚度
 	</string>
 	<string name="Hair Thickness">
-		Hair Thickness
+		頭髮厚度
 	</string>
 	<string name="Hair Tilt">
-		Hair Tilt
+		頭髮傾度
 	</string>
 	<string name="Hair Tilted Left">
-		Hair Tilted Left
+		頭髮傾左
 	</string>
 	<string name="Hair Tilted Right">
-		Hair Tilted Right
+		頭髮傾右
 	</string>
 	<string name="Hair Volume">
-		Hair: Volume
+		頭髮：髮量
 	</string>
 	<string name="Hand Size">
-		Hand Size
+		手部大小
 	</string>
 	<string name="Handlebars">
-		Handlebars
+		把手
 	</string>
 	<string name="Head Length">
-		Head Length
+		頭部長度
 	</string>
 	<string name="Head Shape">
-		Head Shape
+		頭型
 	</string>
 	<string name="Head Size">
-		Head Size
+		頭部大小
 	</string>
 	<string name="Head Stretch">
-		Head Stretch
+		頭部延展度
 	</string>
 	<string name="Heel Height">
-		Heel Height
+		腳踵高度
 	</string>
 	<string name="Heel Shape">
-		Heel Shape
+		腳踵形狀
 	</string>
 	<string name="Height">
-		Height
+		高度
 	</string>
 	<string name="High">
-		High
+		高
 	</string>
 	<string name="High Heels">
-		High Heels
+		高跟鞋
 	</string>
 	<string name="High Jaw">
-		High Jaw
+		高顎
 	</string>
 	<string name="High Platforms">
-		High Platforms
+		高平臺
 	</string>
 	<string name="High and Tight">
-		High and Tight
+		高而緊緻
 	</string>
 	<string name="Higher">
-		Higher
+		更高
 	</string>
 	<string name="Hip Length">
-		Hip Length
+		腰長
 	</string>
 	<string name="Hip Width">
-		Hip Width
+		腰寬
+	</string>
+	<string name="Hover">
+		停懸
 	</string>
 	<string name="In">
-		In
+		向內
 	</string>
 	<string name="In Shdw Color">
-		Inner Shadow Color
+		內陰影顏色
 	</string>
 	<string name="In Shdw Opacity">
-		Inner Shadow Opacity
+		內陰影不透明度
 	</string>
 	<string name="Inner Eye Corner">
-		Inner Eye Corner
+		眼內角
 	</string>
 	<string name="Inner Eye Shadow">
-		Inner Eye Shadow
+		內眼陰影
 	</string>
 	<string name="Inner Shadow">
-		Inner Shadow
+		內陰影
 	</string>
 	<string name="Jacket Length">
-		Jacket Length
+		外套長度
 	</string>
 	<string name="Jacket Wrinkles">
-		Jacket Wrinkles
+		外套皺褶
 	</string>
 	<string name="Jaw Angle">
-		Jaw Angle
+		顎角度
 	</string>
 	<string name="Jaw Jut">
-		Jaw Jut
+		顎突出
 	</string>
 	<string name="Jaw Shape">
-		Jaw Shape
+		顎形
 	</string>
 	<string name="Join">
-		Join
+		加入
 	</string>
 	<string name="Jowls">
-		Jowls
+		下頜
 	</string>
 	<string name="Knee Angle">
-		Knee Angle
+		膝部角度
 	</string>
 	<string name="Knock Kneed">
-		Knock Kneed
+		八字腿
 	</string>
 	<string name="Large">
-		Large
+		大
 	</string>
 	<string name="Large Hands">
-		Large Hands
+		大手掌
 	</string>
 	<string name="Left Part">
-		Left Part
+		左邊分
 	</string>
 	<string name="Leg Length">
-		Leg Length
+		腿長
 	</string>
 	<string name="Leg Muscles">
-		Leg Muscles
+		腿肌肉
 	</string>
 	<string name="Less">
-		Less
+		更少
 	</string>
 	<string name="Less Body Fat">
-		Less Body Fat
+		體脂肪較少
 	</string>
 	<string name="Less Curtains">
-		Less Curtains
+		絡腮鬍較短
 	</string>
 	<string name="Less Freckles">
-		Less Freckles
+		雀斑較少
 	</string>
 	<string name="Less Full">
-		Less Full
+		較不飽滿
 	</string>
 	<string name="Less Gravity">
-		Less Gravity
+		較少重力
 	</string>
 	<string name="Less Love">
-		Less Love
+		少一點愛
 	</string>
 	<string name="Less Muscles">
-		Less Muscles
+		少一點肌肉
 	</string>
 	<string name="Less Muscular">
-		Less Muscular
+		少一點肌壯感
 	</string>
 	<string name="Less Rosy">
-		Less Rosy
+		少一點紅潤
 	</string>
 	<string name="Less Round">
-		Less Round
+		少一點圓度
 	</string>
 	<string name="Less Saddle">
-		Less Saddle
+		腿靠攏一點
 	</string>
 	<string name="Less Square">
-		Less Square
+		少一點方形
 	</string>
 	<string name="Less Volume">
-		Less Volume
+		少一點量
 	</string>
 	<string name="Less soul">
-		Less soul
+		少一點靈魂
 	</string>
 	<string name="Lighter">
-		Lighter
+		亮一點
 	</string>
 	<string name="Lip Cleft">
-		Lip Cleft
+		脣裂度
 	</string>
 	<string name="Lip Cleft Depth">
-		Lip Cleft Depth
+		脣裂深度
 	</string>
 	<string name="Lip Fullness">
-		Lip Fullness
+		脣豐度
 	</string>
 	<string name="Lip Pinkness">
-		Lip Pinkness
+		脣色粉紅度
 	</string>
 	<string name="Lip Ratio">
-		Lip Ratio
+		脣比率
 	</string>
 	<string name="Lip Thickness">
-		Lip Thickness
+		脣厚度
 	</string>
 	<string name="Lip Width">
-		Lip Width
+		脣寬度
 	</string>
 	<string name="Lipgloss">
-		Lipgloss
+		脣蜜
 	</string>
 	<string name="Lipstick">
-		Lipstick
+		脣膏
 	</string>
 	<string name="Lipstick Color">
-		Lipstick Color
+		脣膏顏色
 	</string>
 	<string name="Long">
-		Long
+		長
 	</string>
 	<string name="Long Head">
-		Long Head
+		長臉
 	</string>
 	<string name="Long Hips">
-		Long Hips
+		高腰
 	</string>
 	<string name="Long Legs">
-		Long Legs
+		長腿
 	</string>
 	<string name="Long Neck">
-		Long Neck
+		長頸
 	</string>
 	<string name="Long Pigtails">
-		Long Pigtails
+		長辮子
 	</string>
 	<string name="Long Ponytail">
-		Long Ponytail
+		長馬尾辮
 	</string>
 	<string name="Long Torso">
-		Long Torso
+		長軀幹
 	</string>
 	<string name="Long arms">
-		Long arms
+		長臂
 	</string>
 	<string name="Loose Pants">
-		Loose Pants
+		寬鬆褲子
 	</string>
 	<string name="Loose Shirt">
-		Loose Shirt
+		寬鬆襯衫
 	</string>
 	<string name="Loose Sleeves">
-		Loose Sleeves
+		寬鬆袖子
 	</string>
 	<string name="Love Handles">
-		Love Handles
+		腰間贅肉
 	</string>
 	<string name="Low">
-		Low
+		低
 	</string>
 	<string name="Low Heels">
-		Low Heels
+		低跟鞋
 	</string>
 	<string name="Low Jaw">
-		Low Jaw
+		低顎
 	</string>
 	<string name="Low Platforms">
-		Low Platforms
+		低平臺
 	</string>
 	<string name="Low and Loose">
-		Low and Loose
+		低而寬鬆
 	</string>
 	<string name="Lower">
-		Lower
+		降低
 	</string>
 	<string name="Lower Bridge">
-		Lower Bridge
+		鼻樑低一點
 	</string>
 	<string name="Lower Cheeks">
-		Lower Cheeks
+		雙頰低一點
 	</string>
 	<string name="Male">
 		男性
 	</string>
 	<string name="Middle Part">
-		Middle Part
+		中間邊分
 	</string>
 	<string name="More">
 		更多
 	</string>
 	<string name="More Blush">
-		More Blush
+		增加腮紅
 	</string>
 	<string name="More Body Fat">
-		More Body Fat
+		增加體脂肪
 	</string>
 	<string name="More Curtains">
-		More Curtains
+		增加絡腮鬍
 	</string>
 	<string name="More Eyeshadow">
-		More Eyeshadow
+		增加眼影
 	</string>
 	<string name="More Freckles">
-		More Freckles
+		增加雀斑
 	</string>
 	<string name="More Full">
-		More Full
+		更飽滿
 	</string>
 	<string name="More Gravity">
-		More Gravity
+		增加重力
 	</string>
 	<string name="More Lipstick">
-		More Lipstick
+		多一點脣膏
 	</string>
 	<string name="More Love">
-		More Love
+		多一點愛
 	</string>
 	<string name="More Lower Lip">
-		More Lower Lip
+		下脣更豐滿
 	</string>
 	<string name="More Muscles">
-		More Muscles
+		多一點肌肉
 	</string>
 	<string name="More Muscular">
-		More Muscular
+		增加肌壯感
 	</string>
 	<string name="More Rosy">
-		More Rosy
+		更加紅潤
 	</string>
 	<string name="More Round">
-		More Round
+		增加圓度
 	</string>
 	<string name="More Saddle">
-		More Saddle
+		腿更加張開
 	</string>
 	<string name="More Sloped">
-		More Sloped
+		更加傾斜
 	</string>
 	<string name="More Square">
-		More Square
+		增加方形
 	</string>
 	<string name="More Upper Lip">
-		More Upper Lip
+		上脣更豐滿
 	</string>
 	<string name="More Vertical">
-		More Vertical
+		更加垂直
 	</string>
 	<string name="More Volume">
-		More Volume
+		多一點量
 	</string>
 	<string name="More soul">
-		More soul
+		多一點靈魂
 	</string>
 	<string name="Moustache">
-		Moustache
+		髭鬍
 	</string>
 	<string name="Mouth Corner">
-		Mouth Corner
+		嘴角
 	</string>
 	<string name="Mouth Position">
-		Mouth Position
+		嘴巴位置
 	</string>
 	<string name="Mowhawk">
-		Mowhawk
+		莫霍克髮型
 	</string>
 	<string name="Muscular">
-		Muscular
+		肌肉發達
 	</string>
 	<string name="Mutton Chops">
-		Mutton Chops
+		羊排式絡腮鬍
 	</string>
 	<string name="Nail Polish">
-		Nail Polish
+		指甲油
 	</string>
 	<string name="Nail Polish Color">
-		Nail Polish Color
+		指甲油顏色
 	</string>
 	<string name="Narrow">
-		Narrow
+		窄
 	</string>
 	<string name="Narrow Back">
-		Narrow Back
+		後窄
 	</string>
 	<string name="Narrow Front">
-		Narrow Front
+		前窄
 	</string>
 	<string name="Narrow Lips">
-		Narrow Lips
+		窄脣
 	</string>
 	<string name="Natural">
-		Natural
+		自然
 	</string>
 	<string name="Neck Length">
-		Neck Length
+		頸長
 	</string>
 	<string name="Neck Thickness">
-		Neck Thickness
+		頸部厚度
 	</string>
 	<string name="No Blush">
-		No Blush
+		無腮紅
 	</string>
 	<string name="No Eyeliner">
-		No Eyeliner
+		無眼線
 	</string>
 	<string name="No Eyeshadow">
-		No Eyeshadow
+		無眼影
 	</string>
 	<string name="No Lipgloss">
-		No Lipgloss
+		無脣蜜
 	</string>
 	<string name="No Lipstick">
-		No Lipstick
+		無脣膏
 	</string>
 	<string name="No Part">
-		No Part
+		無邊分
 	</string>
 	<string name="No Polish">
-		No Polish
+		無指甲油
 	</string>
 	<string name="No Red">
-		No Red
+		去紅色
 	</string>
 	<string name="No Spikes">
-		No Spikes
+		無尖直形
 	</string>
 	<string name="No White">
-		No White
+		去白色
 	</string>
 	<string name="No Wrinkles">
-		No Wrinkles
+		無皺紋
 	</string>
 	<string name="Normal Lower">
-		Normal Lower
+		正常下半
 	</string>
 	<string name="Normal Upper">
-		Normal Upper
+		正常上半
 	</string>
 	<string name="Nose Left">
-		Nose Left
+		左鼻
 	</string>
 	<string name="Nose Right">
-		Nose Right
+		右鼻
 	</string>
 	<string name="Nose Size">
-		Nose Size
+		鼻部大小
 	</string>
 	<string name="Nose Thickness">
-		Nose Thickness
+		鼻子厚度
 	</string>
 	<string name="Nose Tip Angle">
-		Nose Tip Angle
+		鼻尖角度
 	</string>
 	<string name="Nose Tip Shape">
-		Nose Tip Shape
+		鼻尖形狀
 	</string>
 	<string name="Nose Width">
-		Nose Width
+		鼻寬
 	</string>
 	<string name="Nostril Division">
-		Nostril Division
+		鼻孔分開度
 	</string>
 	<string name="Nostril Width">
-		Nostril Width
+		鼻孔寬
 	</string>
 	<string name="Opaque">
-		Opaque
+		不透明
 	</string>
 	<string name="Open">
-		Open
+		打開
 	</string>
 	<string name="Open Back">
-		Open Back
+		後開
 	</string>
 	<string name="Open Front">
-		Open Front
+		前開
 	</string>
 	<string name="Open Left">
-		Open Left
+		左開
 	</string>
 	<string name="Open Right">
-		Open Right
+		右開
 	</string>
 	<string name="Orange">
-		Orange
+		橘色
 	</string>
 	<string name="Out">
-		Out
+		外
 	</string>
 	<string name="Out Shdw Color">
-		Outer Shadow Color
+		外陰影顏色
 	</string>
 	<string name="Out Shdw Opacity">
-		Outer Shadow Opacity
+		外陰影不透明度
 	</string>
 	<string name="Outer Eye Corner">
-		Outer Eye Corner
+		眼外角
 	</string>
 	<string name="Outer Eye Shadow">
-		Outer Eye Shadow
+		外眼陰影
 	</string>
 	<string name="Outer Shadow">
-		Outer Shadow
+		外陰影
 	</string>
 	<string name="Overbite">
-		Overbite
+		齙牙
 	</string>
 	<string name="Package">
-		Package
+		配套
 	</string>
 	<string name="Painted Nails">
-		Painted Nails
+		美甲
 	</string>
 	<string name="Pale">
-		Pale
+		蒼白
 	</string>
 	<string name="Pants Crotch">
-		Pants Crotch
+		褲襠
 	</string>
 	<string name="Pants Fit">
-		Pants Fit
+		褲子合身度
 	</string>
 	<string name="Pants Length">
-		Pants Length
+		褲長
 	</string>
 	<string name="Pants Waist">
-		Pants Waist
+		褲腰
 	</string>
 	<string name="Pants Wrinkles">
-		Pants Wrinkles
+		褲子皺褶
 	</string>
 	<string name="Part">
-		Part
+		邊分
 	</string>
 	<string name="Part Bangs">
-		Part Bangs
+		邊分瀏海
 	</string>
 	<string name="Pectorals">
-		Pectorals
+		胸肌
 	</string>
 	<string name="Pigment">
-		Pigment
+		色素
 	</string>
 	<string name="Pigtails">
-		Pigtails
+		辮子
 	</string>
 	<string name="Pink">
-		Pink
+		粉紅
 	</string>
 	<string name="Pinker">
-		Pinker
+		增加粉紅
 	</string>
 	<string name="Platform Height">
-		Platform Height
+		平臺高度
 	</string>
 	<string name="Platform Width">
-		Platform Width
+		平臺寬度
 	</string>
 	<string name="Pointy">
-		Pointy
+		尖狀
 	</string>
 	<string name="Pointy Heels">
-		Pointy Heels
+		尖狀高跟鞋
 	</string>
 	<string name="Ponytail">
-		Ponytail
+		馬尾辮
 	</string>
 	<string name="Poofy Skirt">
-		Poofy Skirt
+		蓬蓬裙
 	</string>
 	<string name="Pop Left Eye">
-		Pop Left Eye
+		左眼 Pop
 	</string>
 	<string name="Pop Right Eye">
-		Pop Right Eye
+		右眼 Pop
 	</string>
 	<string name="Puffy">
-		Puffy
+		眼腫
 	</string>
 	<string name="Puffy Eyelids">
-		Puffy Eyelids
+		眼瞼腫
 	</string>
 	<string name="Rainbow Color">
-		Rainbow Color
+		虹彩
 	</string>
 	<string name="Red Hair">
-		Red Hair
+		紅髮
 	</string>
 	<string name="Regular">
-		Regular
+		一般
 	</string>
 	<string name="Right Part">
-		Right Part
+		右邊分
 	</string>
 	<string name="Rosy Complexion">
-		Rosy Complexion
+		臉色紅潤
 	</string>
 	<string name="Round">
-		Round
+		圓
 	</string>
 	<string name="Ruddiness">
-		Ruddiness
+		紅潤度
 	</string>
 	<string name="Ruddy">
-		Ruddy
+		紅潤
 	</string>
 	<string name="Rumpled Hair">
-		Rumpled Hair
+		亂髮
 	</string>
 	<string name="Saddle Bags">
-		Saddle Bags
+		馬鞍型工具袋
 	</string>
 	<string name="Scrawny Leg">
-		Scrawny Leg
+		削瘦的腿
 	</string>
 	<string name="Separate">
-		Separate
+		分開
 	</string>
 	<string name="Shallow">
-		Shallow
+		淺
 	</string>
 	<string name="Shear Back">
-		Shear Back
+		後偏移
 	</string>
 	<string name="Shear Face">
-		Shear Face
+		臉部偏移
 	</string>
 	<string name="Shear Front">
-		Shear Front
+		前偏移
 	</string>
 	<string name="Shear Left Up">
-		Shear Left Up
+		左上偏移
 	</string>
 	<string name="Shear Right Up">
-		Shear Right Up
+		右上偏移
 	</string>
 	<string name="Sheared Back">
-		Sheared Back
+		後偏移
 	</string>
 	<string name="Sheared Front">
-		Sheared Front
+		前偏移
 	</string>
 	<string name="Shift Left">
-		Shift Left
+		左移
 	</string>
 	<string name="Shift Mouth">
-		Shift Mouth
+		嘴部偏移
 	</string>
 	<string name="Shift Right">
-		Shift Right
+		右移
 	</string>
 	<string name="Shirt Bottom">
-		Shirt Bottom
+		襯衫底
 	</string>
 	<string name="Shirt Fit">
-		Shirt Fit
+		襯衫合身度
 	</string>
 	<string name="Shirt Wrinkles">
-		Shirt Wrinkles
+		襯衫皺褶
 	</string>
 	<string name="Shoe Height">
-		Shoe Height
+		鞋高
 	</string>
 	<string name="Short">
-		Short
+		短
 	</string>
 	<string name="Short Arms">
-		Short Arms
+		短臂
 	</string>
 	<string name="Short Legs">
-		Short Legs
+		短腿
 	</string>
 	<string name="Short Neck">
-		Short Neck
+		短頸
 	</string>
 	<string name="Short Pigtails">
-		Short Pigtails
+		短辮子
 	</string>
 	<string name="Short Ponytail">
-		Short Ponytail
+		短馬尾辮
 	</string>
 	<string name="Short Sideburns">
-		Short Sideburns
+		短鬢鬚
 	</string>
 	<string name="Short Torso">
-		Short Torso
+		短軀幹
 	</string>
 	<string name="Short hips">
-		Short hips
+		短腰
 	</string>
 	<string name="Shoulders">
-		Shoulders
+		肩膀
 	</string>
 	<string name="Side Fringe">
-		Side Fringe
+		側瀏海
 	</string>
 	<string name="Sideburns">
-		Sideburns
+		鬢鬚
 	</string>
 	<string name="Sides Hair">
-		Sides Hair
+		側面頭髮
 	</string>
 	<string name="Sides Hair Down">
-		Sides Hair Down
+		側面頭髮下部
 	</string>
 	<string name="Sides Hair Up">
-		Sides Hair Up
+		側面頭髮上部
 	</string>
 	<string name="Skinny Neck">
-		Skinny Neck
+		削瘦頸部
 	</string>
 	<string name="Skirt Fit">
-		Skirt Fit
+		裙子合身度
 	</string>
 	<string name="Skirt Length">
-		Skirt Length
+		裙長
 	</string>
 	<string name="Slanted Forehead">
-		Slanted Forehead
+		斜前額
 	</string>
 	<string name="Sleeve Length">
-		Sleeve Length
+		袖長
 	</string>
 	<string name="Sleeve Looseness">
-		Sleeve Looseness
+		袖子寬鬆度
 	</string>
 	<string name="Slit Back">
-		Slit: Back
+		後分
 	</string>
 	<string name="Slit Front">
-		Slit: Front
+		前分
 	</string>
 	<string name="Slit Left">
-		Slit: Left
+		左分
 	</string>
 	<string name="Slit Right">
-		Slit: Right
+		右分
 	</string>
 	<string name="Small">
-		Small
+		小
 	</string>
 	<string name="Small Hands">
-		Small Hands
+		小手
 	</string>
 	<string name="Small Head">
-		Small Head
+		小頭
 	</string>
 	<string name="Smooth">
-		Smooth
+		平滑
 	</string>
 	<string name="Smooth Hair">
-		Smooth Hair
+		平滑頭髮
 	</string>
 	<string name="Socks Length">
-		Socks Length
+		襪長
 	</string>
 	<string name="Soulpatch">
-		Soulpatch
+		脣下撮鬍
 	</string>
 	<string name="Sparse">
-		Sparse
+		稀疏
 	</string>
 	<string name="Spiked Hair">
-		Spiked Hair
+		尖直頭髮
 	</string>
 	<string name="Square">
-		Square
+		方形
 	</string>
 	<string name="Square Toe">
-		Square Toe
+		平頭鞋
 	</string>
 	<string name="Squash Head">
-		Squash Head
+		長瓜形臉
 	</string>
 	<string name="Stretch Head">
-		Stretch Head
+		延展頭部
 	</string>
 	<string name="Sunken">
-		Sunken
+		深陷
 	</string>
 	<string name="Sunken Chest">
-		Sunken Chest
+		胸部內陷
 	</string>
 	<string name="Sunken Eyes">
-		Sunken Eyes
+		眼睛深陷
 	</string>
 	<string name="Sweep Back">
-		Sweep Back
+		後垂擺
 	</string>
 	<string name="Sweep Forward">
-		Sweep Forward
+		前垂擺
 	</string>
 	<string name="Tall">
-		Tall
+		高
 	</string>
 	<string name="Taper Back">
-		Taper Back
+		後漸細
 	</string>
 	<string name="Taper Front">
-		Taper Front
+		前漸細
 	</string>
 	<string name="Thick Heels">
-		Thick Heels
+		粗腳跟
 	</string>
 	<string name="Thick Neck">
-		Thick Neck
+		粗頸
 	</string>
 	<string name="Thick Toe">
-		Thick Toe
+		粗腳趾
 	</string>
 	<string name="Thin">
-		Thin
+		瘦
 	</string>
 	<string name="Thin Eyebrows">
-		Thin Eyebrows
+		細眉
 	</string>
 	<string name="Thin Lips">
-		Thin Lips
+		細脣
 	</string>
 	<string name="Thin Nose">
-		Thin Nose
+		細鼻
 	</string>
 	<string name="Tight Chin">
-		Tight Chin
+		緊緻下巴
 	</string>
 	<string name="Tight Cuffs">
-		Tight Cuffs
+		緊緻袖口
 	</string>
 	<string name="Tight Pants">
-		Tight Pants
+		緊緻褲子
 	</string>
 	<string name="Tight Shirt">
-		Tight Shirt
+		緊緻襯衫
 	</string>
 	<string name="Tight Skirt">
-		Tight Skirt
+		緊緻裙子
 	</string>
 	<string name="Tight Sleeves">
-		Tight Sleeves
+		緊緻袖子
 	</string>
 	<string name="Toe Shape">
-		Toe Shape
+		腳趾形狀
 	</string>
 	<string name="Toe Thickness">
-		Toe Thickness
+		腳趾粗細
 	</string>
 	<string name="Torso Length">
-		Torso Length
+		軀幹長度
 	</string>
 	<string name="Torso Muscles">
-		Torso Muscles
+		軀幹肌肉
 	</string>
 	<string name="Torso Scrawny">
-		Torso Scrawny
+		軀幹削瘦
 	</string>
 	<string name="Unattached">
-		Unattached
+		未附著
 	</string>
 	<string name="Uncreased">
-		Uncreased
+		無皺痕
 	</string>
 	<string name="Underbite">
-		Underbite
+		戽斗
 	</string>
 	<string name="Unnatural">
-		Unnatural
+		不自然
 	</string>
 	<string name="Upper Bridge">
-		Upper Bridge
+		上鼻梁
 	</string>
 	<string name="Upper Cheeks">
-		Upper Cheeks
+		上臉頰
 	</string>
 	<string name="Upper Chin Cleft">
-		Upper Chin Cleft
+		上部顎裂
 	</string>
 	<string name="Upper Eyelid Fold">
-		Upper Eyelid Fold
+		上眼瞼皺褶
 	</string>
 	<string name="Upturned">
-		Upturned
+		嘴角上翹
 	</string>
 	<string name="Very Red">
-		Very Red
+		大紅
 	</string>
 	<string name="Waist Height">
-		Waist Height
+		腰高
 	</string>
 	<string name="Well-Fed">
-		Well-Fed
+		飽食的
 	</string>
 	<string name="White Hair">
-		White Hair
+		白髮
 	</string>
 	<string name="Wide">
-		Wide
+		寬
 	</string>
 	<string name="Wide Back">
-		Wide Back
+		後寬
 	</string>
 	<string name="Wide Front">
-		Wide Front
+		前寬
 	</string>
 	<string name="Wide Lips">
-		Wide Lips
+		寬脣
 	</string>
 	<string name="Wild">
-		Wild
+		狂野
 	</string>
 	<string name="Wrinkles">
-		Wrinkles
+		皺紋
 	</string>
 	<string name="LocationCtrlAddLandmarkTooltip">
 		添加到我的地標
@@ -3585,6 +3895,15 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="LocationCtrlGeneralIconTooltip">
 		一般普級地區
 	</string>
+	<string name="LocationCtrlSeeAVsTooltip">
+		這地段外的其他化身，看不見也聽不到位於地段裡的化身
+	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		地區重新產出之前，可移動物件可能無法正常運作。
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		這地區並未啟用動態尋徑。
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] 更新
 	</string>
@@ -3595,7 +3914,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		[APP_NAME] 安裝中...
 	</string>
 	<string name="UpdaterUpdatingDescriptive">
-		Your [APP_NAME] Viewer is being updated to the latest release.  This may take some time, so please be patient.
+		你的 [APP_NAME] Viewer 正在更新為最新發行版。  可能要等一會兒，請耐心稍候。
 	</string>
 	<string name="UpdaterProgressBarTextWithEllipses">
 		更新下載中...
@@ -3607,7 +3926,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		夏載更新失敗
 	</string>
 	<string name="UpdaterFailUpdateDescriptive">
-		An error occurred while updating [APP_NAME]. Please download the latest version from www.secondlife.com.
+		[APP_NAME] 更新時出錯。 請到 www.secondlife.com 下載最新版本。
 	</string>
 	<string name="UpdaterFailInstallTitle">
 		安裝更新失敗
@@ -3616,13 +3935,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		啟動瀏覽器失敗
 	</string>
 	<string name="ItemsComingInTooFastFrom">
-		[APP_NAME]: Items coming in too fast from [FROM_NAME], automatic preview disabled for [TIME] seconds
+		[APP_NAME]：來自 [FROM_NAME] 的項目速度過快，因此自動預覽暫停 [TIME] 秒
 	</string>
 	<string name="ItemsComingInTooFast">
-		[APP_NAME]: Items coming in too fast, automatic preview disabled for [TIME] seconds
+		[APP_NAME]：進來的項目速度過快，因此自動預覽暫停 [TIME] 秒
 	</string>
 	<string name="IM_logging_string">
-		-- Instant message logging enabled --
+		-- 已開啟及時訊息記錄 --
 	</string>
 	<string name="IM_typing_start_string">
 		[NAME] 正在輸入...
@@ -3631,43 +3950,55 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		（未命名）
 	</string>
 	<string name="IM_moderated_chat_label">
-		(Moderated: Voices off by default)
+		（有人主持：預設關閉語音）
 	</string>
 	<string name="IM_unavailable_text_label">
-		Text chat is not available for this call.
+		這次通話無法使用文字聊天。
 	</string>
 	<string name="IM_muted_text_label">
-		Your text chat has been disabled by a Group Moderator.
+		群組主持人已禁止你進行文字聊天。
 	</string>
 	<string name="IM_default_text_label">
-		點擊此處以傳送即時訊息。
+		點按此處以傳送即時訊息。
 	</string>
 	<string name="IM_to_label">
 		至
 	</string>
 	<string name="IM_moderator_label">
-		(Moderator)
+		（主持人）
 	</string>
 	<string name="Saved_message">
-		(Saved [LONG_TIMESTAMP])
+		（於 [LONG_TIMESTAMP] 儲存）
+	</string>
+	<string name="IM_unblock_only_groups_friends">
+		要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
+	</string>
+	<string name="OnlineStatus">
+		上線
+	</string>
+	<string name="OfflineStatus">
+		離線
 	</string>
 	<string name="answered_call">
-		Your call has been answered
+		你的通話已經接通
 	</string>
 	<string name="you_started_call">
-		You started a voice call
+		你發起了語音通話
 	</string>
 	<string name="you_joined_call">
-		You joined the voice call
+		你發起了語音通話
+	</string>
+	<string name="you_auto_rejected_call-im">
+		因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。
 	</string>
 	<string name="name_started_call">
-		[NAME] started a voice call
+		[NAME] 發起了語音通話
 	</string>
 	<string name="ringing-im">
 		加入語音通話...
 	</string>
 	<string name="connected-im">
-		Connected, click Leave Call to hang up
+		已接通，要掛斷請按「離開通話」
 	</string>
 	<string name="hang_up-im">
 		離開語音通話
@@ -3676,40 +4007,40 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		聯接中...
 	</string>
 	<string name="conference-title">
-		Ad-hoc Conference
+		多人聊天
 	</string>
 	<string name="conference-title-incoming">
-		Conference with [AGENT_NAME]
+		和 [AGENT_NAME] 多方通話
 	</string>
 	<string name="inventory_item_offered-im">
-		Inventory item offered
+		收納區物品已發送
 	</string>
 	<string name="share_alert">
-		Drag items from inventory here
+		將收納區物品拖曳到這裡
 	</string>
 	<string name="no_session_message">
 		（IM 會話不存在）
 	</string>
 	<string name="only_user_message">
-		You are the only user in this session.
+		這次會話只有你一人。
 	</string>
 	<string name="offline_message">
 		[NAME] 離線。
 	</string>
 	<string name="invite_message">
-		Click the [BUTTON NAME] button to accept/connect to this voice chat.
+		點按 [BUTTON NAME] 按鈕接受並連通到這個語音聊天。
 	</string>
 	<string name="muted_message">
-		You have blocked this Resident. Sending a message will automatically unblock them.
+		你已經封鎖這位居民。 發送訊息將會自動解除封鎖。
 	</string>
 	<string name="generic">
-		Error making request, please try again later.
+		送出請求時出錯，請稍候再試。
 	</string>
 	<string name="generic_request_error">
-		Error making request, please try again later.
+		送出請求時出錯，請稍候再試。
 	</string>
 	<string name="insufficient_perms_error">
-		You do not have sufficient permissions.
+		你權限不足。
 	</string>
 	<string name="session_does_not_exist_error">
 		此會話不再存在
@@ -3721,25 +4052,25 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		你並不具有這個能力。
 	</string>
 	<string name="not_a_mod_error">
-		You are not a session moderator.
+		你不具會話主持人身份。
 	</string>
 	<string name="muted">
-		A group moderator disabled your text chat.
+		某群組主持人禁止了你的文字聊天。
 	</string>
 	<string name="muted_error">
-		A group moderator disabled your text chat.
+		某群組主持人禁止了你的文字聊天。
 	</string>
 	<string name="add_session_event">
-		Unable to add users to chat session with [RECIPIENT].
+		無法新增使用者加入與 [RECIPIENT] 的聊天會話。
 	</string>
 	<string name="message">
-		Unable to send your message to the chat session with [RECIPIENT].
+		你的訊息無法傳送給與 [RECIPIENT] 的聊天會話。
 	</string>
 	<string name="message_session_event">
-		Unable to send your message to the chat session with [RECIPIENT].
+		你的訊息無法傳送給與 [RECIPIENT] 的聊天會話。
 	</string>
 	<string name="mute">
-		Error while moderating.
+		主持期間發生錯誤。
 	</string>
 	<string name="removed">
 		你已經由群組中被移除。
@@ -3748,49 +4079,64 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		你已經由群組中被移除。
 	</string>
 	<string name="close_on_no_ability">
-		You no longer have the ability to be in the chat session.
+		你已無法進入這個聊天會話。
 	</string>
 	<string name="unread_chat_single">
-		[SOURCES] has said something new
+		[SOURCES] 又說了一些話
 	</string>
 	<string name="unread_chat_multiple">
-		[SOURCES] have said something new
+		[SOURCES] 又說了一些話
 	</string>
 	<string name="session_initialization_timed_out_error">
-		The session initialization is timed out
+		會話初始化逾時，無法完成
+	</string>
+	<string name="Home position set.">
+		我的家位置已定。
 	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>
 	<string name="paid_you_ldollars">
-		[NAME] paid you L$[AMOUNT] [REASON].
+		[NAME] 支付你 L$[AMOUNT]（[REASON]）。
 	</string>
 	<string name="paid_you_ldollars_no_reason">
-		[NAME] paid you L$[AMOUNT].
+		[NAME] 支付你 L$[AMOUNT]。
 	</string>
 	<string name="you_paid_ldollars">
-		You paid [NAME] L$[AMOUNT] [REASON].
+		你支付 L$[AMOUNT] 給 [NAME]（[REASON]）。
 	</string>
 	<string name="you_paid_ldollars_no_info">
-		You paid L$[AMOUNT].
+		你支付了 L$[AMOUNT]。
 	</string>
 	<string name="you_paid_ldollars_no_reason">
-		You paid [NAME] L$[AMOUNT].
+		你支付 L$[AMOUNT] 給 [NAME]。
 	</string>
 	<string name="you_paid_ldollars_no_name">
-		You paid L$[AMOUNT] [REASON].
+		你支付了 L$[AMOUNT]（[REASON]）。
+	</string>
+	<string name="you_paid_failure_ldollars">
+		你支付 L$[AMOUNT] 給 [NAME] 時出錯：[REASON]。
+	</string>
+	<string name="you_paid_failure_ldollars_no_info">
+		你支付 L$[AMOUNT] 時出錯。
+	</string>
+	<string name="you_paid_failure_ldollars_no_reason">
+		你支付 L$[AMOUNT] 給 [NAME] 時出錯。
+	</string>
+	<string name="you_paid_failure_ldollars_no_name">
+		你支付 L$[AMOUNT] 時出錯：[REASON]。
 	</string>
 	<string name="for item">
-		for [ITEM]
+		購買 [ITEM]
 	</string>
 	<string name="for a parcel of land">
-		for a parcel of land
+		購買一土地地段
 	</string>
 	<string name="for a land access pass">
-		for a land access pass
+		購買土地出入通行權
 	</string>
 	<string name="for deeding land">
-		for deeding land
+		讓渡土地
 	</string>
 	<string name="to create a group">
 		以創造群組
@@ -3802,39 +4148,39 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		以上傳
 	</string>
 	<string name="to publish a classified ad">
-		to publish a classified ad
+		發布一則個人廣告
 	</string>
 	<string name="giving">
-		Giving L$ [AMOUNT]
+		捐贈 L$ [AMOUNT]
 	</string>
 	<string name="uploading_costs">
 		上傳花費 L$ [AMOUNT]
 	</string>
 	<string name="this_costs">
-		This costs L$ [AMOUNT]
+		本次花費 L$ [AMOUNT]
 	</string>
 	<string name="buying_selected_land">
-		Buying selected land for L$ [AMOUNT]
+		花費 L$ [AMOUNT] 購買所選土地
 	</string>
 	<string name="this_object_costs">
-		This object costs L$ [AMOUNT]
+		本物件價格 L$ [AMOUNT]
 	</string>
 	<string name="group_role_everyone">
 		任何人
 	</string>
 	<string name="group_role_officers">
-		Officers
+		職員
 	</string>
 	<string name="group_role_owners">
-		擁有者
+		所有人
 	</string>
 	<string name="group_member_status_online">
 		上線
 	</string>
 	<string name="uploading_abuse_report">
 		上傳中...
-  
-舉報濫用
+
+違規舉報
 	</string>
 	<string name="New Shape">
 		新體形
@@ -3861,7 +4207,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		新襪子
 	</string>
 	<string name="New Jacket">
-		新夾克
+		新外套
 	</string>
 	<string name="New Gloves">
 		新手套
@@ -3912,7 +4258,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		女性姿勢
 	</string>
 	<string name="Other Gestures">
-		其他姿勢
+		其他���勢
 	</string>
 	<string name="Speech Gestures">
 		演說姿勢
@@ -3921,91 +4267,172 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		一般姿勢
 	</string>
 	<string name="Male - Excuse me">
-		Male - Excuse me
+		男性 - Excuse me
 	</string>
 	<string name="Male - Get lost">
-		Male - Get lost
+		Male - 給我滾蛋！
 	</string>
 	<string name="Male - Blow kiss">
-		Male - Blow kiss
+		男性 - 飛吻
 	</string>
 	<string name="Male - Boo">
-		Male - Boo
+		男性 - 我噓你
 	</string>
 	<string name="Male - Bored">
-		Male - Bored
+		男性 - 無聊狀
 	</string>
 	<string name="Male - Hey">
-		Male - Hey
+		男性 - 嘿！
 	</string>
 	<string name="Male - Laugh">
-		Male - Laugh
+		男性 - 笑
 	</string>
 	<string name="Male - Repulsed">
-		Male - Repulsed
+		男性 - 作噁
 	</string>
 	<string name="Male - Shrug">
-		Male - Shrug
+		男性 - 聳聳肩
 	</string>
 	<string name="Male - Stick tougue out">
-		Male - Stick tougue out
+		男性 - 吐舌頭
 	</string>
 	<string name="Male - Wow">
-		Male - Wow
+		男性 - 哇塞
 	</string>
 	<string name="Female - Chuckle">
-		Female - Chuckle
+		女性 - 咯咯笑
 	</string>
 	<string name="Female - Cry">
-		Female - Cry
+		女性 - 哭
 	</string>
 	<string name="Female - Embarrassed">
-		Female - Embarrassed
+		女性 - 尷尬
 	</string>
 	<string name="Female - Excuse me">
-		Female - Excuse me
+		男性 - Excuse me
 	</string>
 	<string name="Female - Get lost">
-		Female - Get lost
+		女性 - 給我滾蛋！
 	</string>
 	<string name="Female - Blow kiss">
-		Female - Blow kiss
+		女性 - 飛吻
 	</string>
 	<string name="Female - Boo">
-		Female - Boo
+		女性 - 我噓你
 	</string>
 	<string name="Female - Bored">
-		Female - Bored
+		女性 - 無聊狀
 	</string>
 	<string name="Female - Hey">
-		Female - Hey
+		女性 - 嘿！
 	</string>
 	<string name="Female - Hey baby">
-		Female - Hey baby
+		女性 - 嘿，寶貝
 	</string>
 	<string name="Female - Laugh">
-		Female - Laugh
+		女性 - 笑
 	</string>
 	<string name="Female - Looking good">
-		Female - Looking good
+		女性 - 看我美不美
 	</string>
 	<string name="Female - Over here">
-		Female - Over here
+		女性 - 我在這兒
 	</string>
 	<string name="Female - Please">
-		Female - Please
+		女性 - 請
 	</string>
 	<string name="Female - Repulsed">
-		Female - Repulsed
+		女性 - 作噁
 	</string>
 	<string name="Female - Shrug">
-		Female - Shrug
+		女性 - 聳聳肩
 	</string>
 	<string name="Female - Stick tougue out">
-		Female - Stick tougue out
+		女性 - 吐舌頭
 	</string>
 	<string name="Female - Wow">
-		Female - Wow
+		女性 - 哇塞
+	</string>
+	<string name="/bow">
+		/彎腰點頭
+	</string>
+	<string name="/clap">
+		/拍手
+	</string>
+	<string name="/count">
+		/計數
+	</string>
+	<string name="/extinguish">
+		/熄菸
+	</string>
+	<string name="/kmb">
+		/給我一個吻
+	</string>
+	<string name="/muscle">
+		/肌肉
+	</string>
+	<string name="/no">
+		/不
+	</string>
+	<string name="/no!">
+		/不！
+	</string>
+	<string name="/paper">
+		/布
+	</string>
+	<string name="/pointme">
+		/指自己
+	</string>
+	<string name="/pointyou">
+		/指向你
+	</string>
+	<string name="/rock">
+		/石頭
+	</string>
+	<string name="/scissor">
+		/剪刀
+	</string>
+	<string name="/smoke">
+		/抽菸
+	</string>
+	<string name="/stretch">
+		/伸展
+	</string>
+	<string name="/whistle">
+		/吹口哨
+	</string>
+	<string name="/yes">
+		/是
+	</string>
+	<string name="/yes!">
+		/是！
+	</string>
+	<string name="afk">
+		暫時離開
+	</string>
+	<string name="dance1">
+		跳舞1
+	</string>
+	<string name="dance2">
+		跳舞2
+	</string>
+	<string name="dance3">
+		跳舞3
+	</string>
+	<string name="dance4">
+		跳舞4
+	</string>
+	<string name="dance5">
+		跳舞5
+	</string>
+	<string name="dance6">
+		跳舞6
+	</string>
+	<string name="dance7">
+		跳舞7
+	</string>
+	<string name="dance8">
+		跳舞8
 	</string>
 	<string name="AvatarBirthDateFormat">
 		[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]
@@ -4018,34 +4445,34 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
 	<string name="words_separator" value=","/>
 	<string name="server_is_down">
-		Despite our best efforts, something unexpected has gone wrong.
+		儘管我們努力避免，還是發生意料外的錯誤。
 
-	Please check status.secondlifegrid.net to see if there is a known problem with the service.  
-        If you continue to experience problems, please check your network and firewall setup.
+	請察訪 status.secondlifegrid.net 看是否發生了已知狀況。
+        如果文體繼續發生，請檢查你的網路和防火牆設定。
 	</string>
 	<string name="dateTimeWeekdaysNames">
-		Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
+		星期日:星期一:星期二:星期三:星期四:星期五:星期六
 	</string>
 	<string name="dateTimeWeekdaysShortNames">
-		Sun:Mon:Tue:Wed:Thu:Fri:Sat
+		星期日:星期一:星期二:星期三:星期四:星期五:星期六
 	</string>
 	<string name="dateTimeMonthNames">
-		January:February:March:April:May:June:July:August:September:October:November:December
+		一月:二月:三月:四月:五月:六月:七月:八月:九月:十月:十一月:十二月
 	</string>
 	<string name="dateTimeMonthShortNames">
-		Jan:Feb:Mar:Apr:May:Jun:Jul:Aug:Sep:Oct:Nov:Dec
+		一月:二月:三月:四月:五月:六月:七月:八月:九月:十月:十一月:十二月
 	</string>
 	<string name="dateTimeDayFormat">
 		[MDAY]
 	</string>
 	<string name="dateTimeAM">
-		AM
+		上午
 	</string>
 	<string name="dateTimePM">
-		PM
+		下午
 	</string>
 	<string name="LocalEstimateUSD">
-		US$ [AMOUNT]
+		$ [AMOUNT] 美元
 	</string>
 	<string name="Membership">
 		成員資格
@@ -4054,25 +4481,25 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		角色
 	</string>
 	<string name="Group Identity">
-		Group Identity
+		群組身份
 	</string>
 	<string name="Parcel Management">
 		地段管理
 	</string>
 	<string name="Parcel Identity">
-		Parcel Identity
+		地段名
 	</string>
 	<string name="Parcel Settings">
 		地段設定
 	</string>
 	<string name="Parcel Powers">
-		Parcel Powers
+		地段權利
 	</string>
 	<string name="Parcel Access">
-		Parcel Access
+		地段出入
 	</string>
 	<string name="Parcel Content">
-		Parcel Content
+		地段內容
 	</string>
 	<string name="Object Management">
 		物件管理
@@ -4090,7 +4517,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		刪除所選取的物品？
 	</string>
 	<string name="DeleteItem">
-		刪除所選取的物品？
+		刪除所選取的物���？
 	</string>
 	<string name="EmptyOutfitText">
 		沒有任何物品在這個裝扮內
@@ -4099,72 +4526,78 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		選擇一個編輯器使用 ExternalEditor 設定。
 	</string>
 	<string name="ExternalEditorNotFound">
-		Cannot find the external editor you specified.
-Try enclosing path to the editor with double quotes.
-(e.g. &quot;/path to my/editor&quot; &quot;%s&quot;)
+		找不到你指定的外部編輯器。
+請嘗試在編輯器路經前後加上英文雙括號。
+（例：&quot;/path to my/editor&quot; &quot;%s&quot;）
 	</string>
 	<string name="ExternalEditorCommandParseError">
-		Error parsing the external editor command.
+		解析外部編輯器指令時出錯。
 	</string>
 	<string name="ExternalEditorFailedToRun">
 		執行外部編輯器失敗。
 	</string>
+	<string name="TranslationFailed">
+		無法翻譯：[REASON]
+	</string>
+	<string name="TranslationResponseParseError">
+		無法剖析平移回應。
+	</string>
 	<string name="Esc">
-		Esc
+		Esc 鍵
 	</string>
 	<string name="Space">
-		Space
+		空間鍵
 	</string>
 	<string name="Enter">
-		Enter
+		Enter 鍵
 	</string>
 	<string name="Tab">
-		Tab
+		Tab 鍵
 	</string>
 	<string name="Ins">
-		Ins
+		Ins 鍵
 	</string>
 	<string name="Del">
-		Del
+		Del 鍵
 	</string>
 	<string name="Backsp">
-		Backsp
+		Backspace 鍵
 	</string>
 	<string name="Shift">
-		Shift
+		Shift 鍵
 	</string>
 	<string name="Ctrl">
-		Ctrl
+		Ctrl 鍵
 	</string>
 	<string name="Alt">
-		Alt
+		Alt 鍵
 	</string>
 	<string name="CapsLock">
-		CapsLock
+		CapsLock 鍵
 	</string>
 	<string name="Left">
-		Left
+		左移鍵
 	</string>
 	<string name="Right">
-		Right
+		右移鍵
 	</string>
 	<string name="Up">
-		Up
+		上移鍵
 	</string>
 	<string name="Down">
-		Down
+		下移鍵
 	</string>
 	<string name="Home">
-		Home
+		Home 鍵
 	</string>
 	<string name="End">
-		End
+		End 鍵
 	</string>
 	<string name="PgUp">
-		PgUp
+		PgUp 鍵
 	</string>
 	<string name="PgDn">
-		PgDn
+		PgDn 鍵
 	</string>
 	<string name="F1">
 		F1
@@ -4203,16 +4636,16 @@ Try enclosing path to the editor with double quotes.
 		F12
 	</string>
 	<string name="Add">
-		Add
+		添加
 	</string>
 	<string name="Subtract">
-		Subtract
+		減
 	</string>
 	<string name="Multiply">
-		Multiply
+		乘
 	</string>
 	<string name="Divide">
-		Divide
+		除
 	</string>
 	<string name="PAD_DIVIDE">
 		PAD_DIVIDE
@@ -4392,7 +4825,7 @@ Try enclosing path to the editor with double quotes.
 		M
 	</string>
 	<string name="N">
-		N
+		北
 	</string>
 	<string name="O">
 		O
@@ -4407,7 +4840,7 @@ Try enclosing path to the editor with double quotes.
 		R
 	</string>
 	<string name="S">
-		S
+		南
 	</string>
 	<string name="T">
 		T
@@ -4419,7 +4852,7 @@ Try enclosing path to the editor with double quotes.
 		V
 	</string>
 	<string name="W">
-		W
+		西
 	</string>
 	<string name="X">
 		X
@@ -4431,24 +4864,261 @@ Try enclosing path to the editor with double quotes.
 		Z
 	</string>
 	<string name="BeaconParticle">
-		Viewing particle beacons (blue)
+		檢視粒子效果的導引（藍色）
 	</string>
 	<string name="BeaconPhysical">
-		Viewing physical object beacons (green)
+		檢視具體物件的導引（綠色）
 	</string>
 	<string name="BeaconScripted">
-		Viewing scripted object beacons (red)
+		檢視腳本物件的導引（紅色）
 	</string>
 	<string name="BeaconScriptedTouch">
-		Viewing scripted object with touch function beacons (red)
+		檢視帶有觸摸函式腳本物件的導引（紅色）
 	</string>
 	<string name="BeaconSound">
-		Viewing sound beacons (yellow)
+		檢視聲音的導引（黃色）
 	</string>
 	<string name="BeaconMedia">
-		Viewing media beacons (white)
+		檢視媒體的導引（白色）
 	</string>
 	<string name="ParticleHiding">
-		Hiding Particles
+		隱藏粒子效果
+	</string>
+	<string name="Command_AboutLand_Label">
+		土地資料
+	</string>
+	<string name="Command_Appearance_Label">
+		編輯外觀
+	</string>
+	<string name="Command_Avatar_Label">
+		化身
+	</string>
+	<string name="Command_Build_Label">
+		建造
+	</string>
+	<string name="Command_Chat_Label">
+		聊天
+	</string>
+	<string name="Command_Conversations_Label">
+		交談
+	</string>
+	<string name="Command_Compass_Label">
+		羅盤
+	</string>
+	<string name="Command_Destinations_Label">
+		目的地
+	</string>
+	<string name="Command_Gestures_Label">
+		姿勢
+	</string>
+	<string name="Command_HowTo_Label">
+		簡易教學
+	</string>
+	<string name="Command_Inventory_Label">
+		收納區
+	</string>
+	<string name="Command_Map_Label">
+		地圖
+	</string>
+	<string name="Command_Marketplace_Label">
+		第二人生購物市集
+	</string>
+	<string name="Command_MiniMap_Label">
+		迷你地圖
+	</string>
+	<string name="Command_Move_Label">
+		行走 / 跑步 / 飛行
+	</string>
+	<string name="Command_Outbox_Label">
+		商家發件匣
+	</string>
+	<string name="Command_People_Label">
+		人群
+	</string>
+	<string name="Command_Picks_Label">
+		精選地點
+	</string>
+	<string name="Command_Places_Label">
+		地點
+	</string>
+	<string name="Command_Preferences_Label">
+		偏好設定
+	</string>
+	<string name="Command_Profile_Label">
+		檔案
+	</string>
+	<string name="Command_Search_Label">
+		搜尋
+	</string>
+	<string name="Command_Snapshot_Label">
+		快照
+	</string>
+	<string name="Command_Speak_Label">
+		說話
+	</string>
+	<string name="Command_View_Label">
+		攝影機控制
+	</string>
+	<string name="Command_Voice_Label">
+		語音設定
+	</string>
+	<string name="Command_AboutLand_Tooltip">
+		有關你所處土地的資訊
+	</string>
+	<string name="Command_Appearance_Tooltip">
+		改變化身
+	</string>
+	<string name="Command_Avatar_Tooltip">
+		選擇一個完整的化身
+	</string>
+	<string name="Command_Build_Tooltip">
+		建製物件和重塑地形
+	</string>
+	<string name="Command_Chat_Tooltip">
+		透過文字和附近人們聊天
+	</string>
+	<string name="Command_Conversations_Tooltip">
+		和所有人交談
+	</string>
+	<string name="Command_Compass_Tooltip">
+		指南針
+	</string>
+	<string name="Command_Destinations_Tooltip">
+		你可能感興趣的目的地
+	</string>
+	<string name="Command_Gestures_Tooltip">
+		你化身可用的姿勢
+	</string>
+	<string name="Command_HowTo_Tooltip">
+		如何完成常用的動作
+	</string>
+	<string name="Command_Inventory_Tooltip">
+		察看並使用你擁有的物件
+	</string>
+	<string name="Command_Map_Tooltip">
+		世界地圖
+	</string>
+	<string name="Command_Marketplace_Tooltip">
+		前往購物
+	</string>
+	<string name="Command_MiniMap_Tooltip">
+		顯示附近的人
+	</string>
+	<string name="Command_Move_Tooltip">
+		移動化身
+	</string>
+	<string name="Command_Outbox_Tooltip">
+		將物項轉移到第二人生購物市集待售
+	</string>
+	<string name="Command_People_Tooltip">
+		朋友、群組和附近的人
+	</string>
+	<string name="Command_Picks_Tooltip">
+		顯示在你的小檔案中的最愛地點
+	</string>
+	<string name="Command_Places_Tooltip">
+		你儲存的地點
+	</string>
+	<string name="Command_Preferences_Tooltip">
+		偏好設定
+	</string>
+	<string name="Command_Profile_Tooltip">
+		編輯或察看你的小檔案
+	</string>
+	<string name="Command_Search_Tooltip">
+		尋找地點、活動、其他人
+	</string>
+	<string name="Command_Snapshot_Tooltip">
+		拍一張照片
+	</string>
+	<string name="Command_Speak_Tooltip">
+		用麥克風和附近人們交談
+	</string>
+	<string name="Command_View_Tooltip">
+		調整攝影機角度
+	</string>
+	<string name="Command_Voice_Tooltip">
+		在虛擬世界裡通話和附近人群的音量控制
+	</string>
+	<string name="Toolbar_Bottom_Tooltip">
+		目前位在你的底部工具列
+	</string>
+	<string name="Toolbar_Left_Tooltip">
+		目前位在你的左工具列
+	</string>
+	<string name="Toolbar_Right_Tooltip">
+		目前位在你的右工具列
+	</string>
+	<string name="Retain%">
+		保留%
+	</string>
+	<string name="Detail">
+		細節
+	</string>
+	<string name="Better Detail">
+		更多細節
+	</string>
+	<string name="Surface">
+		表面
+	</string>
+	<string name="Solid">
+		固體
+	</string>
+	<string name="Wrap">
+		Wrap
+	</string>
+	<string name="Preview">
+		預覽
+	</string>
+	<string name="Normal">
+		正常
+	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		無
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		影響導航網面
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		角色
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		（多項）
+	</string>
+	<string name="snapshot_quality_very_low">
+		很低
+	</string>
+	<string name="snapshot_quality_low">
+		低
+	</string>
+	<string name="snapshot_quality_medium">
+		中
+	</string>
+	<string name="snapshot_quality_high">
+		高
+	</string>
+	<string name="snapshot_quality_very_high">
+		很高
+	</string>
+	<string name="TeleportMaturityExceeded">
+		此居民不得進入此地區。
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
+	<string name="logging_calls_disabled_log_empty">
+		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
+	</string>
+	<string name="loading_chat_logs">
+		載入中…
 	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/teleport_strings.xml b/indra/newview/skins/default/xui/zh/teleport_strings.xml
index bfdb107810..37080a8d0c 100644..100755
--- a/indra/newview/skins/default/xui/zh/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -2,15 +2,15 @@
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
-			Problem encountered processing your teleport request. You may need to log back in before you can teleport.
+			處理你瞬間傳送要求時發生問題。 如果想要瞬間傳送，你可能需要重新登入。
 如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 		</message>
 		<message name="invalid_region_handoff">
-			Problem encountered processing your region crossing. You may need to log back in before you can cross regions.
+			處理你跨越地區動作時發生問題。 如果想要跨越地區，你可能需要重新登入。
 如果你持續得到此訊息，請查閱 [SUPPORT_SITE]。
 		</message>
 		<message name="blocked_tport">
-			抱歉，目前瞬間傳送已被阻擋。請稍後再試。
+			抱歉，目前禁止瞬間傳送。 請稍後再試。
 如果你仍無法進行瞬間傳送，請登出後重新入來解決此一問題。
 		</message>
 		<message name="nolandmark_tport">
@@ -21,40 +21,43 @@
 請稍後再試。
 		</message>
 		<message name="NoHelpIslandTP">
-		您不能瞬间转移回“援助岛”。
-去“公共援助岛”重复您的教程。
+			你無法瞬間傳送回「新手導引島」。
+請到「大眾新手導引島」重新參加導引教學。
 		</message>
 		<message name="noaccess_tport">
 			抱歉，你並沒有權限進入要瞬間傳送的目的地。
 		</message>
 		<message name="missing_attach_tport">
-			Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
+			你的附件尚未抵達。 請稍候一會兒，或請登出後重新登入，再嘗試瞬間傳送。
 		</message>
 		<message name="too_many_uploads_tport">
-			The asset queue in this region is currently clogged so your teleport request will not be able to succeed in a timely manner. Please try again in a few minutes or go to a less busy area.
+			該地區的資產查詢目前太過擁塞，因此你的瞬間傳送動作可能無法即時發生。 請稍候再試，或請前往較不擁塞的地區。
 		</message>
 		<message name="expired_tport">
-			Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
+			抱歉，系統無法即時完成為你瞬間傳送。 請稍待幾分鐘再試。
 		</message>
 		<message name="expired_region_handoff">
-			Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes.
+			抱歉，系統無法即時讓你跨越地區。 請稍待幾分鐘再試。
 		</message>
 		<message name="no_host">
-			Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
+			找不到瞬間傳送的目的地。 目的地可能暫時不可用，或已不存在。 請稍待幾分鐘再試。
 		</message>
 		<message name="no_inventory_host">
 			收納區功能目前無法使用。
 		</message>
+		<message name="MustGetAgeRegion">
+			你必須年滿 18 歲才可進入這地區。
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
-			Sending to destination.
+			送往目的地。
 		</message>
 		<message name="redirecting">
 			重新導向至不同位置。
 		</message>
 		<message name="relaying">
-			Relaying to destination.
+			接繼送往目的地。
 		</message>
 		<message name="sending_home">
 			送出家位置的要求。
@@ -80,5 +83,8 @@
 		<message name="requesting">
 			瞬間傳送要求中...
 		</message>
+		<message name="pending">
+			等待瞬間傳送…
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/paths.xml b/indra/newview/skins/paths.xml
deleted file mode 100644
index 3c0da041c7..0000000000
--- a/indra/newview/skins/paths.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<paths> 
-	<directory>
-    <subdir>xui</subdir>
-    <subdir>en</subdir>
-  </directory>
-	<directory>
-    <subdir>xui</subdir>
-    <subdir>[LANGUAGE]</subdir>
-  </directory>
-</paths>
\ No newline at end of file