diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-11-15 11:19:57 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-15 11:19:57 -0800 |
commit | 52bc69c0bee59631d63680ed19a89d3a116d954b (patch) | |
tree | 6bd34e384eec519eedc40e10aa345d701bc44584 /indra/newview/skins | |
parent | 76caf0238cb98c1abf69d56e122c71a1208b0d72 (diff) | |
parent | a787e1bb7aad25f9488de7d93298b58820c948d5 (diff) |
Merge from viewer-experience
Diffstat (limited to 'indra/newview/skins')
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a7078ce2e1..4aeea8823e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -122,7 +122,7 @@ layout="topleft" left_delta="0" name="external" - value="1" + value="true" top="0" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen." width="480" /> diff --git a/indra/newview/skins/default/xui/ru/floater_destinations.xml b/indra/newview/skins/default/xui/ru/floater_destinations.xml index e769812beb..bb068c8125 100644 --- a/indra/newview/skins/default/xui/ru/floater_destinations.xml +++ b/indra/newview/skins/default/xui/ru/floater_destinations.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Destinations" title="МЕСТА"/> +<floater name="Destinations" title="ПУНКТЫ"/> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index df657b39c6..89a2c2543d 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -4794,7 +4794,7 @@ support@secondlife.com. Компас </string> <string name="Command_Destinations_Label"> - Места + Пункты </string> <string name="Command_Gestures_Label"> Жесты |