diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-15 07:08:22 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-15 07:08:22 +0300 |
| commit | 740159f004b2d9ef4111b8db25ed7f1d56ddb254 (patch) | |
| tree | fce4bfe9dd7ea278a83bcb9f6c94b835f48ed3a8 /indra/newview/skins/default | |
| parent | c00065a205fa166410cedbfe31ce74f2198911a6 (diff) | |
| parent | 2540868bf38b39da4c94714f507941386e72da7c (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/mime_types.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index c27fac6731..8d8d546b24 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -130,7 +130,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </scheme> <scheme name="libvlc"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 09c18f4bfc..23379ff777 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2502,11 +2502,13 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f <string name="av_render_anyone">You may not be rendered by anyone around you.</string> <!-- HUD complexity rendering messages, see llavatarrendernotifier. --> - <string name="hud_render_memory_warning">Your HUD uses a lot of texture memory</string> - <string name="hud_render_cost_warning">Your HUD contains a lot of expensive objects and textures</string> - <string name="hud_render_heavy_textures_warning">Your HUD contains a lot of large textures</string> - <string name="hud_render_cramped_warning">Your HUD contains too many objects</string> - <string name="hud_render_textures_warning">Your HUD contains too many textures</string> + <string name="hud_description_total">Your HUD</string> + <string name="hud_name_with_joint">[OBJ_NAME] (worn on [JNT_NAME])</string> + <string name="hud_render_memory_warning">[HUD_DETAILS] uses a lot of texture memory</string> + <string name="hud_render_cost_warning">[HUD_DETAILS] contains a lot of expensive objects and textures</string> + <string name="hud_render_heavy_textures_warning">[HUD_DETAILS] contains a lot of large textures</string> + <string name="hud_render_cramped_warning">[HUD_DETAILS] contains too many objects</string> + <string name="hud_render_textures_warning">[HUD_DETAILS] contains too many textures</string> <!-- AgeYearsA = singular, AgeYearsB = plural, |