Merge with head of viewer-release

18 files changed, 77 insertions, 155 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index cc2680627e..1f10d966d5 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -245,7 +245,7 @@ with the same filename but different name
   <texture name="Icon_Dock_Foreground" file_name="windows/Icon_Dock_Foreground.png" preload="true" />
   <texture name="Icon_Dock_Press" file_name="windows/Icon_Dock_Press.png" preload="true" />
 
-  <texture name="Icon_For_Sale" file_name="icons/Icon_For_sale.png" preload="false" />
+  <texture name="Icon_For_Sale" file_name="icons/Icon_For_Sale.png" preload="false" />
 
   <texture name="Icon_Gear_Background" file_name="windows/Icon_Gear_Background.png" preload="false" />
   <texture name="Icon_Gear_Foreground" file_name="windows/Icon_Gear_Foreground.png" preload="false" />
@@ -346,8 +346,8 @@ with the same filename but different name
   <texture name="ModelImport_Status_Warning" file_name="lag_status_warning.tga" preload="false"/>
   <texture name="ModelImport_Status_Error" file_name="red_x.png" preload="false"/>
   
-  <texture name="MouseLook_View_Off" file_name="bottomtray/MouseLook_view_off.png" preload="false" />
-  <texture name="MouseLook_View_On" file_name="bottomtray/MouseLook_view_on.png" preload="false" />
+  <texture name="MouseLook_View_Off" file_name="bottomtray/Mouselook_View_Off.png" preload="false" />
+  <texture name="MouseLook_View_On" file_name="bottomtray/Mouselook_View_On.png" preload="false" />
 
   <texture name="Move_Fly_Off" file_name="bottomtray/Move_Fly_Off.png" preload="false" />
   <texture name="Move_Run_Off" file_name="bottomtray/Move_Run_Off.png" preload="false" />
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..6d48180707 100755
--- a/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Lokationer, billeder, web, søge historik)
 	</text>
-	<check_box label="Vis dig selv i søgeresultater" name="online_searchresults"/>
+	<check_box label="Vis min profil info i søgeresultater" name="online_searchresults"/>
 	<check_box label="Kun venner og grupper ved jeg er online" name="online_visibility"/>
 	<check_box label="Kun venner og grupper kan sende besked til mig" name="voice_call_friends_only_check"/>
 	<check_box label="Slå mikrofon fra når opkald slutter" name="auto_disengage_mic_check"/>
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..afde50b981 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Standorte, Bilder, Web, Suchverlauf)
 	</text>
-	<check_box label="In Suchergebnissen anzeigen" name="online_searchresults"/>
+	<check_box label="Zeigen Sie mein Profil Informationen in Suchergebnisse" name="online_searchresults"/>
 	<check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/>
 	<check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/>
 	<check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/>
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 9561f67941..c50c8c02fe 100755
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -203,47 +203,15 @@
         <combo_box.item
          label="Age &gt; Age play"
          name="Age__Age_play"
-         value="31" />
+         value="31" />       
         <combo_box.item
-         label="Age &gt; Adult Resident on Teen Second Life"
-         name="Age__Adult_resident_on_Teen_Second_Life"
-         value="32" />
-        <combo_box.item
-         label="Age &gt; Underage Resident outside of Teen Second Life"
-         name="Age__Underage_resident_outside_of_Teen_Second_Life"
-         value="33" />
-        <combo_box.item
-         label="Assault &gt; Combat sandbox / unsafe area"
-         name="Assault__Combat_sandbox___unsafe_area"
-         value="34" />
-        <combo_box.item
-         label="Assault &gt; Safe area"
+         label="Assault &gt; Shooting, pushing, or shoving another Resident in a Safe Area"
          name="Assault__Safe_area"
-         value="35" />
-        <combo_box.item
-         label="Assault &gt; Weapons testing sandbox"
-         name="Assault__Weapons_testing_sandbox"
-         value="36" />
-        <combo_box.item
-         label="Commerce &gt; Failure to deliver product or service"
-         name="Commerce__Failure_to_deliver_product_or_service"
-         value="38" />
+         value="35" />        
         <combo_box.item
          label="Disclosure &gt; Real world information"
          name="Disclosure__Real_world_information"
-         value="39" />
-        <combo_box.item
-         label="Disclosure &gt; Remotely monitoring chat"
-         name="Disclosure__Remotely_monitoring chat"
-         value="40" />
-        <combo_box.item
-         label="Disclosure &gt; Second Life information/chat/IMs"
-         name="Disclosure__Second_Life_information_chat_IMs"
-         value="41" />
-        <combo_box.item
-         label="Disturbing the peace &gt; Unfair use of region resources"
-         name="Disturbing_the_peace__Unfair_use_of_region_resources"
-         value="42" />
+         value="39" />     
         <combo_box.item
          label="Disturbing the peace &gt; Excessive scripted objects"
          name="Disturbing_the_peace__Excessive_scripted_objects"
@@ -255,51 +223,15 @@
         <combo_box.item
          label="Disturbing the peace &gt; Repetitive spam"
          name="Disturbing_the_peace__Repetitive_spam"
-         value="45" />
-        <combo_box.item
-         label="Disturbing the peace &gt; Unwanted advert spam"
-         name="Disturbing_the_peace__Unwanted_advert_spam"
-         value="46" />
-        <combo_box.item
-         label="Fraud &gt; L$"
-         name="Fraud__L$"
-         value="47" />
-        <combo_box.item
-         label="Fraud &gt; Land"
-         name="Fraud__Land"
-         value="48" />
-        <combo_box.item
-         label="Fraud &gt; Pyramid scheme or chain letter"
-         name="Fraud__Pyramid_scheme_or_chain_letter"
-         value="49" />
+         value="45" />        
         <combo_box.item
-         label="Fraud &gt; US$"
+         label="Fraud &gt; L$ or USD $"
          name="Fraud__US$"
-         value="50" />
+         value="50" />       
         <combo_box.item
-         label="Harassment &gt; Advert farms / visual spam"
-         name="Harassment__Advert_farms___visual_spam"
-         value="51" />
-        <combo_box.item
-         label="Harassment &gt; Defaming individuals or groups"
-         name="Harassment__Defaming_individuals_or_groups"
-         value="52" />
-        <combo_box.item
-         label="Harassment &gt; Impeding movement"
-         name="Harassment__Impeding_movement"
-         value="53" />
-        <combo_box.item
-         label="Harassment &gt; Sexual harassment"
-         name="Harassment__Sexual_harassment"
-         value="54" />
-        <combo_box.item
-         label="Harassment &gt; Solicting/inciting others to violate ToS"
+         label="Harassment &gt; Targeted behavior intended to disrupt"
          name="Harassment__Solicting_inciting_others_to_violate_ToS"
-         value="55" />
-        <combo_box.item
-         label="Harassment &gt; Verbal abuse"
-         name="Harassment__Verbal_abuse"
-         value="56" />
+         value="55" />       
         <combo_box.item
          label="Indecency &gt; Broadly offensive content or conduct"
          name="Indecency__Broadly_offensive_content_or_conduct"
@@ -309,49 +241,21 @@
          name="Indecency__Inappropriate_avatar_name"
          value="59" />
         <combo_box.item
-         label="Indecency &gt; Inappropriate content or conduct in a PG region"
+         label="Indecency &gt; Inappropriate content or conduct for Region Rating"
          name="Indecency__Mature_content_in_PG_region"
-         value="60" />
-        <combo_box.item
-         label="Indecency &gt; Inappropriate content or conduct in a Moderate region"
-         name="Indecency__Inappropriate_content_in_Mature_region"
-         value="69" />
-        <combo_box.item
-         label="Intellectual property infringement &gt; Content Removal"
-         name="Intellectual_property_infringement_Content_Removal"
-         value="66" />
-        <combo_box.item
-         label="Intellectual property infringement &gt; CopyBot or Permissions Exploit"
-         name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"
-         value="37" />
+         value="60" />       
         <combo_box.item
          label="Intolerance"
          name="Intolerance"
-         value="61" />
-        <combo_box.item
-         label="Land &gt; Abuse of sandbox resources"
-         name="Land__Abuse_of_sandbox_resources"
-         value="62" />
+         value="61" />        
         <combo_box.item
-         label="Land &gt; Encroachment &gt; Objects/textures"
+         label="Land &gt; Encroachment &gt; Objects or textures"
          name="Land__Encroachment__Objects_textures"
-         value="63" />
+         value="63" />        
         <combo_box.item
-         label="Land &gt; Encroachment &gt; Particles"
-         name="Land__Encroachment__Particles"
-         value="64" />
-        <combo_box.item
-         label="Land &gt; Encroachment &gt; Trees/plants"
-         name="Land__Encroachment__Trees_plants"
-         value="65" />
-        <combo_box.item
-         label="Wagering/gambling"
+         label="Wagering or Gambling"
          name="Wagering_gambling"
-         value="67" />
-        <combo_box.item
-         label="Other"
-         name="Other"
-         value="68" />
+         value="67" />       
     </combo_box>
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 8b9733df17..3c28233875 100755
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -150,7 +150,7 @@
 	     parameter="Land" />
 	</button>
     <text
-     height="30"
+     height="20"
      word_wrap="true"
      use_ellipses="true"
      type="string"
@@ -294,24 +294,14 @@
     <check_box
      control_name="ScaleUniform"
      height="19"
-     label=""
+     label="Stretch Both Sides"
      layout="topleft"
      left="143"
      name="checkbox uniform"
      top="48"
-     width="20" />
-    <text
-     height="19"
-     label="Stretch Both Sides"
-     left_delta="20"
-     name="checkbox uniform label"
-     top_delta="2"
-     width="120"
-     layout="topleft"
-     follows="top|left"
-     wrap="true">
-     	Stretch Both Sides
-    </text>
+     label_text.wrap="true"
+     label_text.width="100"
+     width="134" />
     <check_box
      control_name="ScaleStretchTextures"
      height="19"
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 52ab7da515..5c98a98d3d 100755
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -130,17 +130,24 @@
           function="Object.ReportAbuse" />
       <menu_item_call.on_enable
           function="Object.EnableReportAbuse" />
-    </menu_item_call>
+    </menu_item_call>   
     <menu_item_call
-        enabled="false"
-        label="Block"
-        name="Object Mute">
-      <menu_item_call.on_click
+   		  label="Block"        
+          name="Object Mute">
+        <menu_item_call.on_click
           function="Object.Mute" />
-      <menu_item_call.on_enable
+        <menu_item_call.on_visible
           function="Object.EnableMute" />
     </menu_item_call>
     <menu_item_call
+          label="Unblock"   
+          name="Object Unmute">
+        <menu_item_call.on_click
+          function="Object.Mute" />
+        <menu_item_call.on_visible
+          function="Object.EnableUnmute" />
+    </menu_item_call>
+    <menu_item_call
         enabled="false"
         label="Return"
         name="Return...">
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..30239d6d01 100755
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -220,7 +220,7 @@
             <layout_stack
              border_size="0"
              clip="false"
-             follows="left|top|right"
+             follows="left|top"
              height="50"
              layout="topleft"
              mouse_opaque="false"
@@ -251,10 +251,10 @@
                 </layout_panel>
                 <layout_panel
                  follows="left|right"
-                 height="60"
+                 height="50"
                  layout="topleft"
                  min_height="50"
-                 min_width="60"
+                 min_width="50"
                  mouse_opaque="false"
                  name="for_sale_panel"
                  top="0"
@@ -264,7 +264,7 @@
                      height="50"
                      image_name="ForSale_Badge"
                      layout="topleft"
-                     left="10"
+                     left="0"
                      name="icon_for_sale"
                      top="0"
                      width="50" />
@@ -762,11 +762,19 @@
                          top_pad="5"
                          value="Rating:"
                          width="80" />
+                        <icon
+                         follows="top|left"
+                         height="16"
+                         image_name="Parcel_PG_Dark"
+                         layout="topleft"
+                         left_pad="0"
+                         name="estate_rating_icon"
+                         width="18" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="0"
+                         left_pad="10"
                          name="estate_rating"
                          top_delta="0"
                          width="187" />
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 05a63ea725..323da2be38 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -47,7 +47,7 @@
   <check_box
       height="16"
       enabled="false"
-      label="Show me in Search results"
+      label="Show my profile info in Search results"
       layout="topleft"
       left="30"
       name="online_searchresults"
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..26cac06648 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
@@ -47,7 +47,20 @@
      text_color="White"
      top="4"
      value="..."
-     width="330" />
+     width="290" />
+    <text
+     follows="right"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     right="-20"
+     parse_urls="false"
+     use_ellipses="true"
+     name="timestamp"
+     text_color="White"
+     top="4"
+     value="..."
+     width="45" />
     <button
      follows="right"
      height="20"
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..fe312e3587 100755
--- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Localizaciones, imágenes, web, historial de búsqueda)
 	</text>
-	<check_box label="Mostrarme en los resultados de la búsqueda" name="online_searchresults"/>
+	<check_box label="Mostrarme información de perfil en los resultados de la búsqueda" name="online_searchresults"/>
 	<check_box label="Sólo saben si estoy conectado mis amigos y grupos" name="online_visibility"/>
 	<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
 	<check_box label="Desconectar el micrófono cuando finalicen las llamadas" name="auto_disengage_mic_check"/>
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..a89676d119 100755
--- a/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_privacy.xml
@@ -7,13 +7,13 @@
 	<text name="cache_size_label_l">
 		(endroits, images, web, historique des recherches)
 	</text>
-	<check_box label="M&apos;afficher dans les résultats de recherche" name="online_searchresults"/>
+	<check_box label="Afficher mon profil d&apos;infos dans les résultats de recherche" name="online_searchresults"/>
 	<check_box label="Seuls mes amis et groupes voient quand je suis en ligne" name="online_visibility"/>
 	<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
 	<check_box label="Fermer le micro à la fin d&apos;un appel" name="auto_disengage_mic_check"/>
 	<check_box label="Afficher mes repères favoris à la connexion (liste déroulante Lieu de départ)" name="favorites_on_login_check"/>
 	<text name="Logs:">
-		Journaux de chat :
+		Journaux de chat :
 	</text>
 	<check_box label="Sauvegarder les chats près de moi sur mon ordinateur" name="log_nearby_chat"/>
 	<check_box label="Sauvegarder les IM sur mon ordinateur" name="log_instant_messages"/>
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..241ed8f162 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Luoghi, immagini, web, cronologia ricerche)
 	</text>
-	<check_box label="Mostrami nei risultati della ricerca" name="online_searchresults"/>
+	<check_box label="Mostra il mio profilo info nei risultati di ricerca" name="online_searchresults"/>
 	<check_box label="Solo amici e gruppi mi vedono online" name="online_visibility"/>
 	<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
 	<check_box label="Spegnere il microfono alla chiusura delle chiamate" name="auto_disengage_mic_check"/>
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..3787f390e4 100755
--- a/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		（位置、画像、web、検索履歴）
 	</text>
-	<check_box label="検索結果に表示" name="online_searchresults"/>
+	<check_box label="検索結果に自分のプロフィール情報を表示する" name="online_searchresults"/>
 	<check_box label="私のオンライン状態を確認できるのは、フレンドとグループだけ" name="online_visibility"/>
 	<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
 	<check_box label="コールが終了したら自動的にマイクのスイッチを切る" name="auto_disengage_mic_check"/>
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..30b64bc977 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Miejsca, obrazy, przeglądarka internetowa, wyszukiwarka historii)
 	</text>
-	<check_box label="Pokaż mój profil w wynikach wyszukiwarki" name="online_searchresults"/>
+	<check_box label="Pokaż mój informacje profilu w wynikach wyszukiwania" name="online_searchresults"/>
 	<check_box label="Mój status online jest dostępny tylko dla znajomych i grup do których należę" name="online_visibility"/>
 	<check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla &#10;znajomych i grup do których należę" name="voice_call_friends_only_check" top_pad="15"/>
 	<check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/>
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..8ca05c948a 100755
--- a/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Locações, imagens, web, histórico de busca)
 	</text>
-	<check_box label="Mostrar nos resultados de busca" name="online_searchresults"/>
+	<check_box label="Mostrar meu perfil info em resultados de busca" name="online_searchresults"/>
 	<check_box label="Apenas amigos e grupos sabem que estou online" name="online_visibility"/>
 	<check_box label="Apenas amigos e grupos podem me chamar ou enviar MI" name="voice_call_friends_only_check"/>
 	<check_box label="Desligar o microfone quando terminar chamadas" name="auto_disengage_mic_check"/>
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..ed6bed439c 100755
--- a/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Места, картинки, страницы, журнал поиска)
 	</text>
-	<check_box label="Показывать меня в результатах поиска" name="online_searchresults"/>
+	<check_box label="Показывать информацию моего профиля в результатах поиска" name="online_searchresults"/>
 	<check_box label="Только друзья и группы видят, когда я на связи" name="online_visibility"/>
 	<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
 	<check_box label="Отключать микрофон по окончании разговора" name="auto_disengage_mic_check"/>
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..285670a6ac 100755
--- a/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		(Konumlar, görüntüler, web, arama geçmişi)
 	</text>
-	<check_box label="Arama sonuçlarında beni göster" name="online_searchresults"/>
+	<check_box label="Arama sonuçlarında profil bilgilerini göster" name="online_searchresults"/>
 	<check_box label="Çevrimiçi olduğumu sadece arkadaşlar ve gruplar bilsin" name="online_visibility"/>
 	<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
 	<check_box label="Aramaları sonlandırırken mikrofonu kapat" name="auto_disengage_mic_check"/>
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..d768cacb94 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_privacy.xml
@@ -7,7 +7,7 @@
 	<text name="cache_size_label_l">
 		（位置、圖像、網頁、搜尋的歷史紀錄）
 	</text>
-	<check_box label="將我顯示在搜尋的結果中" name="online_searchresults"/>
+	<check_box label="顯示在搜索結果我的個人資料信息" name="online_searchresults"/>
 	<check_box label="只有我的朋友和群組知道我上線" name="online_visibility"/>
 	<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
 	<check_box label="當通話結束時關閉麥克風" name="auto_disengage_mic_check"/>