diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 118 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 44 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 78 |
3 files changed, 132 insertions, 108 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 5fbd9248c1..224c1b4b48 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -1,12 +1,28 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <commands> + <command name="aboutland" + available_in_toybox="true" + icon="Command_AboutLand_Icon" + label_ref="Command_AboutLand_Label" + tooltip_ref="Command_AboutLand_Tooltip" + function="Floater.ToolbarToggle" + parameter="about_land" + /> + <command name="appearance" + available_in_toybox="true" + icon="Command_Appearance_Icon" + label_ref="Command_Appearance_Label" + tooltip_ref="Command_Appearance_Tooltip" + function="Floater.ToolbarToggle" + parameter="appearance" + /> <command name="avatar" available_in_toybox="true" icon="Command_Avatar_Icon" label_ref="Command_Avatar_Label" tooltip_ref="Command_Avatar_Tooltip" function="Floater.ToolbarToggle" - parameter="avatar" + parameter="avatar_picker" /> <command name="build" available_in_toybox="true" @@ -22,7 +38,7 @@ label_ref="Command_Chat_Label" tooltip_ref="Command_Chat_Tooltip" function="Floater.ToolbarToggle" - parameter="chat" + parameter="chat_bar" /> <command name="compass" available_in_toybox="false" @@ -32,6 +48,14 @@ function="Floater.ToolbarToggle" parameter="compass" /> + <command name="destinations" + available_in_toybox="true" + icon="Command_Destinations_Icon" + label_ref="Command_Destinations_Label" + tooltip_ref="Command_Destinations_Tooltip" + function="Floater.ToolbarToggle" + parameter="destinations" + /> <command name="gestures" available_in_toybox="true" icon="Command_Gestures_Icon" @@ -46,15 +70,15 @@ label_ref="Command_HowTo_Label" tooltip_ref="Command_HowTo_Tooltip" function="Floater.ToolbarToggle" - parameter="howto" + parameter="floater_help_browser" /> - <command name="landmarks" + <command name="inventory" available_in_toybox="true" - icon="Command_Landmarks_Icon" - label_ref="Command_Landmarks_Label" - tooltip_ref="Command_Landmarks_Tooltip" + icon="Command_Inventory_Icon" + label_ref="Command_Inventory_Label" + tooltip_ref="Command_Inventory_Tooltip" function="Floater.ToolbarToggle" - parameter="landmarks" + parameter="inventory" /> <command name="map" available_in_toybox="true" @@ -62,7 +86,15 @@ label_ref="Command_Map_Label" tooltip_ref="Command_Map_Tooltip" function="Floater.ToolbarToggle" - parameter="map" + parameter="world_map" + /> + <command name="marketplace" + available_in_toybox="true" + icon="Command_Marketplace_Icon" + label_ref="Command_Marketplace_Label" + tooltip_ref="Command_Marketplace_Tooltip" + function="Floater.ToolbarToggle" + parameter="marketplace" /> <command name="minimap" available_in_toybox="true" @@ -70,7 +102,7 @@ label_ref="Command_MiniMap_Label" tooltip_ref="Command_MiniMap_Tooltip" function="Floater.ToolbarToggle" - parameter="minimap" + parameter="mini_map" /> <command name="move" available_in_toybox="true" @@ -78,23 +110,7 @@ label_ref="Command_Move_Label" tooltip_ref="Command_Move_Tooltip" function="Floater.ToolbarToggle" - parameter="move" - /> - <command name="myland" - available_in_toybox="true" - icon="Command_MyLand_Icon" - label_ref="Command_MyLand_Label" - tooltip_ref="Command_MyLand_Tooltip" - function="Floater.ToolbarToggle" - parameter="myland" - /> - <command name="mystuff" - available_in_toybox="true" - icon="Command_MyStuff_Icon" - label_ref="Command_MyStuff_Label" - tooltip_ref="Command_MyStuff_Tooltip" - function="Floater.ToolbarToggle" - parameter="mystuff" + parameter="moveview" /> <command name="people" available_in_toybox="true" @@ -112,29 +128,29 @@ function="Floater.ToolbarToggle" parameter="places" /> - <command name="search" + <command name="preferences" available_in_toybox="true" - icon="Command_Search_Icon" - label_ref="Command_Search_Label" - tooltip_ref="Command_Search_Tooltip" + icon="Command_Preferences_Icon" + label_ref="Command_Preferences_Label" + tooltip_ref="Command_Preferences_Tooltip" function="Floater.ToolbarToggle" - parameter="search" + parameter="preferences" /> - <command name="settings" + <command name="profile" available_in_toybox="true" - icon="Command_Settings_Icon" - label_ref="Command_Settings_Label" - tooltip_ref="Command_Settings_Tooltip" + icon="Command_Profile_Icon" + label_ref="Command_Profile_Label" + tooltip_ref="Command_Profile_Tooltip" function="Floater.ToolbarToggle" - parameter="settings" + parameter="profile" /> - <command name="shop" + <command name="search" available_in_toybox="true" - icon="Command_Shop_Icon" - label_ref="Command_Shop_Label" - tooltip_ref="Command_Shop_Tooltip" + icon="Command_Search_Icon" + label_ref="Command_Search_Label" + tooltip_ref="Command_Search_Tooltip" function="Floater.ToolbarToggle" - parameter="shop" + parameter="search" /> <command name="snapshot" available_in_toybox="true" @@ -152,20 +168,20 @@ function="Floater.ToolbarToggle" parameter="speak" /> - <command name="upload" - available_in_toybox="true" - icon="Command_Upload_Icon" - label_ref="Command_Upload_Label" - tooltip_ref="Command_Upload_Tooltip" - function="Floater.ToolbarToggle" - parameter="upload" - /> <command name="view" available_in_toybox="true" icon="Command_View_Icon" label_ref="Command_View_Label" tooltip_ref="Command_View_Tooltip" function="Floater.ToolbarToggle" - parameter="view" + parameter="camera" + /> + <command name="voice" + available_in_toybox="true" + icon="Command_Voice_Icon" + label_ref="Command_Voice_Label" + tooltip_ref="Command_Voice_Tooltip" + function="Floater.ToolbarToggle" + parameter="voice_controls" /> </commands> diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index be68c2873e..57ce7fe57a 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -125,27 +125,29 @@ with the same filename but different name <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> <texture name="Check_Mark" file_name="icons/check_mark" preload="true" /> - <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Build_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Chat_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Compass_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Gestures_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_HowTo_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Map_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MiniMap_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Move_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MyLand_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MyStuff_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_People_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Search_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Settings_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Shop_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Snapshot_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Speak_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Upload_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_View_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_AboutLand_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Appearance_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Build_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Chat_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Compass_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Destinations_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Gestures_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_HowTo_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Inventory_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Map_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Marketplace_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_MiniMap_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Move_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_People_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Preferences_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Profile_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Search_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Snapshot_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Speak_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_View_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Voice_Icon" file_name="icons/SL_Logo.png" preload="true" /> <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index feea555fdc..158e1c711d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -16,16 +16,16 @@ <string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupLoading">Loading [APP_NAME]...</string> <string name="StartupClearingCache">Clearing cache...</string> - <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingTextureCache">Initializing texture cache...</string> <string name="StartupInitializingVFS">Initializing VFS...</string> - <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string> + <string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string> <!-- progress --> <string name="ProgressRestoring">Restoring...</string> - <string name="ProgressChangingResolution">Changing Resolution...</string> + <string name="ProgressChangingResolution">Changing resolution...</string> <!-- Legacy strings, almost never used --> - <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> + <string name="Fullbright">Fullbright (legacy)</string> <!-- used in the Build > materials dropdown--> <!-- Login --> <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> @@ -38,8 +38,8 @@ <string name="LoginInitializingMultimedia">Initializing multimedia...</string> <string name="LoginInitializingFonts">Loading fonts...</string> <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string> - <string name="LoginProcessingResponse">Processing Response...</string> - <string name="LoginInitializingWorld">Initializing World...</string> + <string name="LoginProcessingResponse">Processing response...</string> + <string name="LoginInitializingWorld">Initializing world...</string> <string name="LoginDecodingImages">Decoding images...</string> <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> @@ -56,7 +56,7 @@ <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string> <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</string> - <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string> <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> @@ -3652,47 +3652,53 @@ Try enclosing path to the editor with double quotes. <string name="ParticleHiding">Hiding Particles</string> <!-- commands --> + + <string name="Command_AboutLand_Label">About land</string> + <string name="Command_Appearance_Label">Appearance</string> <string name="Command_Avatar_Label">Avatar</string> - <string name="Command_Avatar_Tooltip">Change the appearance of your avatar</string> <string name="Command_Build_Label">Build</string> - <string name="Command_Build_Tooltip">Building, reshaping terrain</string> <string name="Command_Chat_Label">Chat</string> - <string name="Command_Chat_Tooltip">Chat with people nearby</string> <string name="Command_Compass_Label">Compass</string> - <string name="Command_Compass_Tooltip"></string> + <string name="Command_Destinations_Label">Destinations</string> <string name="Command_Gestures_Label">Gestures</string> - <string name="Command_Gestures_Tooltip"></string> - <string name="Command_HowTo_Label">How To</string> - <string name="Command_HowTo_Tooltip"></string> - <string name="Command_Landmarks_Label">Landmarks</string> - <string name="Command_Landmarks_Tooltip"></string> + <string name="Command_HowTo_Label">How to</string> + <string name="Command_Inventory_Label">Inventory</string> <string name="Command_Map_Label">Map</string> - <string name="Command_Map_Tooltip"></string> - <string name="Command_MiniMap_Label">Mini Map</string> - <string name="Command_MiniMap_Tooltip"></string> + <string name="Command_Marketplace_Label">Marketplace</string> + <string name="Command_MiniMap_Label">Mini-map</string> <string name="Command_Move_Label">Move</string> - <string name="Command_Move_Tooltip"></string> - <string name="Command_MyLand_Label">My Land</string> - <string name="Command_MyLand_Tooltip">Information about the land you're visiting</string> - <string name="Command_MyStuff_Label">My Stuff</string> - <string name="Command_MyStuff_Tooltip">View and use your belongings</string> <string name="Command_People_Label">People</string> - <string name="Command_People_Tooltip"></string> <string name="Command_Places_Label">Places</string> - <string name="Command_Places_Tooltip">Destination guide</string> + <string name="Command_Preferences_Label">Preferences</string> + <string name="Command_Profile_Label">Profile</string> <string name="Command_Search_Label">Search</string> - <string name="Command_Search_Tooltip">Find...</string> - <string name="Command_Settings_Label">Settings</string> - <string name="Command_Settings_Tooltip">Preferences</string> - <string name="Command_Shop_Label">Shop</string> - <string name="Command_Shop_Tooltip"></string> <string name="Command_Snapshot_Label">Snapshot</string> - <string name="Command_Snapshot_Tooltip">Take a picture</string> <string name="Command_Speak_Label">Speak</string> - <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> - <string name="Command_Upload_Label">Upload</string> - <string name="Command_Upload_Tooltip"></string> <string name="Command_View_Label">View</string> - <string name="Command_View_Tooltip">Changing your view of the world</string> + <string name="Command_Voice_Label">Nearby voice</string> + + <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string> + <string name="Command_Appearance_Tooltip">Change your avatar</string> + <string name="Command_Avatar_Tooltip">Choose a complete avatar</string> + <string name="Command_Build_Tooltip">Building objects and reshaping them</string> + <string name="Command_Chat_Tooltip">Chat with people nearby using text</string> + <string name="Command_Compass_Tooltip">Compass</string> + <string name="Command_Destinations_Tooltip">Destinations of interest</string> + <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> + <string name="Command_HowTo_Tooltip">How to do common tasks</string> + <string name="Command_Inventory_Tooltip">View and use your belongings</string> + <string name="Command_Map_Tooltip">Map of the world</string> + <string name="Command_Marketplace_Tooltip">Go shopping</string> + <string name="Command_MiniMap_Tooltip">Show nearby people</string> + <string name="Command_Move_Tooltip">Moving your avatar</string> + <string name="Command_People_Tooltip">Friends, groups, and nearby people</string> + <string name="Command_Places_Tooltip">Places you've saved</string> + <string name="Command_Preferences_Tooltip">Preferences</string> + <string name="Command_Profile_Tooltip">Edit or view your profile</string> + <string name="Command_Search_Tooltip">Find places, events, people</string> + <string name="Command_Snapshot_Tooltip">Take a picture</string> + <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> + <string name="Command_View_Tooltip">Changing camera angle</string> + <string name="Command_Voice_Tooltip">People nearby with voice capability</string> </strings> |