Merge 3.6.11 for RC-ability

59 files changed, 210 insertions, 177 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 94c187e21a..bb891996c9 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -153,6 +153,8 @@ with the same filename but different name
   <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" />
@@ -163,6 +165,7 @@ 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" />
 
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/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/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 815bde456e..9be129bbf6 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/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index 72200a07ad..e494b2b755 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_setup.xml b/indra/newview/skins/default/xui/da/panel_preferences_setup.xml
index 479e98817e..7be9a9d555 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/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index 5f5c34a5cf..6634a4bd90 100755
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -466,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/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index 1215efb7f9..28c89868bd 100755
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -41,8 +41,8 @@
          auto_resize="false"
          user_resize="true"        
          name="conversations_layout_panel"
-         min_dim="38"
-         expanded_min_dim="136">
+         min_dim="43"
+         expanded_min_dim="140">
             <layout_stack
              animate="false" 
              follows="left|top|right"
@@ -100,7 +100,7 @@
                 <layout_panel
                  auto_resize="false"
                  name="conversations_pane_buttons_collapsed"
-                 width="31">
+                 width="35">
                     <button
                      follows="right|top"
                      height="25"
@@ -110,10 +110,10 @@
                      image_unselected="Toolbar_Middle_Off"
                      layout="topleft"
                      top="1"
-                     left="0"
+                     left="4"
                      name="expand_collapse_btn"
                      tool_tip="Collapse/Expand this list"
-                     width="31" />
+                     width="35" />
                 </layout_panel>
             </layout_stack>
             <panel
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 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_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d635b8ee93..e5e2bd4c11 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1305,18 +1305,18 @@
      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">
+           label="Quickstart"
+           name="Quickstart">
             <menu_item_call.on_click
-             function="ShowHelp"
-             parameter="f1_help" />
+            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"
@@ -1326,20 +1326,12 @@
              parameter="hud" />
         </menu_item_call>-->
 		<menu_item_separator/>
-		
-		<menu_item_call
-             label="User’s guide"
-             name="User’s guide">
-             <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="Knowledge Base"
              name="Knowledge Base">
              <menu_item_call.on_click
                  function="Advanced.ShowURL"
-                 parameter="http://community.secondlife.com/t5/tkb/communitypage"/>
+            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"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index eb71fdcf2c..35f2e7b31e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3481,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"
@@ -3494,7 +3494,7 @@ Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
  name="DownloadBackgroundDialog"
  type="alertmodal">
 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"
@@ -6038,8 +6038,8 @@ Please select at least one type of content to search (General, Moderate, or Adul
 [MESSAGE]
   </notification>
 
-  <notification
-   icon="notify.tga"
+ <notification
+  icon="notify.tga"
   name="FacebookConnect"
   type="notifytip">
 [MESSAGE]
@@ -6337,7 +6337,7 @@ 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>
     The region you're trying to visit contains content exceeding your current preferences.  You can change your preferences using Me &gt; Preferences &gt; General.
@@ -6345,6 +6345,15 @@ You can only claim public land in the Region you&apos;re in.
 
   <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"
 	type="notify">
@@ -6887,7 +6896,7 @@ This will add a bookmark in your inventory so you can quickly IM this Resident.
    priority="high"
    sound="UISndAlert"
    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>
 
@@ -6897,7 +6906,7 @@ If you stay in this region you will be logged out.
    priority="high"
    sound="UISndAlert"
    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>
 
@@ -8780,11 +8789,11 @@ You are no longer allowed here and have [EJECT_TIME] seconds to leave.
 
   <notification
    icon="alertmodal.tga"
-   name="NoEnterServerFull"
+   name="NoEnterRegionMaybeFull"
    type="notify">
    <tag>fail</tag>
-You can't enter this region because 
-the server is full.
+You can't enter region "[NAME]".
+It may be full or restarting soon.
   </notification>
 
   <notification
@@ -9550,6 +9559,14 @@ Not enough script resources available to attach object!
 
   <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>
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
index a054e71e34..4372cf69bf 100755
--- a/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_conversation_list_item.xml
@@ -11,7 +11,7 @@
      height="20"
      default_icon_name="Generic_Person"
      layout="topleft"
-     left="5"
+     left="9"
      top="2"
      visible="false"
      width="20" />
@@ -20,7 +20,7 @@
      height="20"
      default_icon_name="Generic_Group"
      layout="topleft"
-     left="5"
+     left="9"
      top="2"
      visible="false"
      width="20" />
@@ -29,9 +29,9 @@
      height="20"
      image_name="Nearby_chat_icon"
      layout="topleft"
-     left="5"
+     left="10"
      name="nearby_chat_icon"
-     top="2"
+     top="3"
      visible="false"
      width="20"/>
     <layout_stack
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 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_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index dc0e4a5947..3caf2b3d7e 100755
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -66,7 +66,8 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
      tab_position="top"
      top="0"
      halign="center"
-     right="-5">
+     right="-5"
+     use_highlighting_on_hover="true">
 
 <!-- ================================= NEARBY tab =========================== -->
 
@@ -500,7 +501,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
             <text
                 type="string"
                 length="1"
-                follows="all"
+                follows="left|top|right"
                 height="14"
                 layout="topleft"
                 right="-10"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8ac95beddb..7e79d297ef 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -456,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>
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 61ec046649..4ea1aa6efb 100755
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -150,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/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index 20acea57ea..9559be214a 100755
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -25,19 +25,25 @@ label_pad_left - padding to the left of tab button labels
                tab_bottom_image_selected="Toolbar_Left_Selected"
                tab_left_image_unselected="SegmentedBtn_Left_Disabled"
                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_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_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/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
index c351db5eae..c2327c96c4 100755
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -28,7 +28,7 @@
 	<text name="tc label">
 		Activar S3TC:
 	</text>
-	<check_box initial_value="verdadero" 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."/>
+	<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_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 15462c3726..32baa5bb7d 100755
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -443,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/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 9362f76708..a9eab74e2b 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="Modelo de iluminación avanzado" 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_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index f7eaa03d63..508bfbcd32 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>
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 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_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
index 7199905a1c..b820880e60 100644
--- a/indra/newview/skins/default/xui/es/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
@@ -112,5 +112,5 @@
 	<spinner label="Grados de rotación" name="shinyRot"/>
 	<spinner label="Desplazamiento horizontal" name="shinyOffsetU"/>
 	<spinner label="Desplazamiento vertical" name="shinyOffsetV"/>
-	<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."/>
+	<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/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 098f8fc713..bb146556ba 100755
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -28,7 +28,7 @@
 	<text name="tc label">
 		Activer S3TC :
 	</text>
-	<check_box initial_value="vraie" 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."/>
+	<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_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index bcc3423862..421e14d51b 100755
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -463,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/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index dd59035dd4..468f284ccb 100755
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -470,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/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index e7483b1ba5..2978c48db6 100755
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -25,7 +25,7 @@
 		<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."/>
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 4c190197b4..fcc9661d03 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>
diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
index 4e515563ac..36ad2980cb 100644
--- a/indra/newview/skins/default/xui/it/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
@@ -112,5 +112,5 @@
 	<spinner label="Gradi di rotazione" name="shinyRot"/>
 	<spinner label="Spostamento orizzontale" name="shinyOffsetU"/>
 	<spinner label="Spostamento verticale" name="shinyOffsetV"/>
-	<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."/>
+	<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/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 4bd6439ad2..5511433ae3 100755
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -469,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/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 9e6fed8387..69d5c23f9c 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/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index f2beef091a..4cd271a141 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_setup.xml b/indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
index fa0a5981a8..b663e18227 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/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 8c245c582e..66c14cdecf 100755
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -463,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/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 37e8838bf4..756e345cb8 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="Modelo avançado de luzes" 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_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 887d0cfe98..1279e74e21 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>
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 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/ru/floater_auction.xml b/indra/newview/skins/default/xui/ru/floater_auction.xml
index d84dc2e941..105c75c919 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_bulk_perms.xml b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
index 31fc1c5ed3..304bf97dc1 100755
--- a/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bulk_perms.xml
@@ -39,7 +39,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" tool_tip="Следующий владелец может отдать или перепродать объект"/>
+	<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"/>
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 43f8c36473..d7da112a27 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,7 @@
 	<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>
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 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_perm_prefs.xml b/indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
index a704b87bd1..626f3c9321 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_preferences_proxy.xml b/indra/newview/skins/default/xui/ru/floater_preferences_proxy.xml
index 4eecfedf17..13cff2bcbe 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_settings_debug.xml b/indra/newview/skins/default/xui/ru/floater_settings_debug.xml
index 7db014ef53..db78d11e90 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_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index a9a21e7d4a..c9e117362f 100755
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -19,10 +19,10 @@
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
-	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
+	<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"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
index c312f73428..35921d147f 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"/>
@@ -465,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_world_map.xml b/indra/newview/skins/default/xui/ru/floater_world_map.xml
index ef8dfe22ae..7d2acfd9a0 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/panel_group_general.xml b/indra/newview/skins/default/xui/ru/panel_group_general.xml
index 4d7e1c9fff..ba38dbf89e 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_media_settings_general.xml b/indra/newview/skins/default/xui/ru/panel_media_settings_general.xml
index 6dc435db20..d52397832c 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 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 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_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index c7a850f78a..62617caed3 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>
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 029e72e137..c93955fcdc 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_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index e9c0c7de10..1741397a84 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>
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 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_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
index 60717a3d1d..1abf729487 100644
--- a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -112,5 +112,5 @@
 	<spinner label="Поворот, градусы" name="shinyRot"/>
 	<spinner label="Смещение по горизонтали" name="shinyOffsetU"/>
 	<spinner label="Смещение по вертикали" name="shinyOffsetV"/>
-	<check_box initial_value="ложь" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
+	<check_box initial_value="false" label="Согласование" name="checkbox planar align" tool_tip="Согласование текстур на всех выбранных гранях по последней выбранной грани. Должно быть выбрано наложение по плоскостям."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
index 4bf0372a8a..39a3569efa 100755
--- a/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -465,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/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index 33c9ebeaf0..7e6c972f40 100755
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -465,16 +465,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/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index 0fcc49b203..ab4d9a881d 100755
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -15,7 +15,7 @@
 		網頁：
 	</text>
 	<radio_group name="use_external_browser">
-		<radio_item label="使用我的網頁瀏覽器（例如 IE, Firefox, Safari）" name="external" tool_tip="使用系統預設的瀏覽器瀏覽幫助，開啟網頁。全螢幕模式下不建議這麼做。" value="1"/>
+		<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"/>