summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--[-rwxr-xr-x]indra/newview/skins/default/xui/en/strings.xml29
1 files changed, 22 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4eb6e2462d..b19c6756bc 100755..100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -22,10 +22,11 @@
<!-- about dialog/support string-->
<string name="AboutHeader">
-[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL])
+[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([CHANNEL])
[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
</string>
- <string name="AboutCompiler">Built with [COMPILER] version [COMPILER_VERSION]</string>
+ <string name="BuildConfig">Build Configuration [BUILD_CONFIG]</string>
+
<string name="AboutPosition">
You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
@@ -47,15 +48,16 @@ Graphics Card: [GRAPHICS_CARD]
<string name="AboutLibs">
OpenGL Version: [OPENGL_VERSION]
-libcurl Version: [LIBCURL_VERSION]
J2C Decoder Version: [J2C_VERSION]
Audio Driver Version: [AUDIO_DRIVER_VERSION]
-Qt Webkit Version: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF Version: [LLCEFLIB_VERSION]
Voice Server Version: [VOICE_VERSION]
</string>
<string name="AboutTraffic">Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)</string>
+ <string name="AboutTime">[month, datetime, slt] [day, datetime, slt] [year, datetime, slt] [hour, datetime, slt]:[min, datetime, slt]:[second,datetime,slt]</string>
<string name="ErrorFetchingServerReleaseNotesURL">Error fetching server release notes URL.</string>
-
+ <string name="BuildConfiguration">Build Configuration</string>
+
<!-- progress -->
<string name="ProgressRestoring">Restoring...</string>
<string name="ProgressChangingResolution">Changing resolution...</string>
@@ -2490,6 +2492,13 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<string name="DaysOld">[AGEDAYS] old</string>
<string name="TodayOld">Joined today</string>
+ <!-- Avatar complexity rendering messages, see llavatarrendernotifier. -->
+ <string name="av_render_everyone_now">Everyone can see you now.</string>
+ <string name="av_render_not_everyone">You may not be rendered by everyone around you.</string>
+ <string name="av_render_over_half">You may not be rendered by over half of those around you.</string>
+ <string name="av_render_most_of">You may not be rendered by most of those around you.</string>
+ <string name="av_render_anyone">You may not be rendered by anyone around you.</string>
+
<!-- AgeYearsA = singular,
AgeYearsB = plural,
AgeYearsC = plural for non-English languages like Russian
@@ -3530,6 +3539,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_unblock_only_groups_friends">To see this message, you must uncheck &apos;Only friends and groups can call or IM me&apos; in Preferences/Privacy.</string>
<string name="OnlineStatus">Online</string>
<string name="OfflineStatus">Offline</string>
+ <string name="not_online_msg">User not online - message will be stored and delivered later.</string>
+ <string name="not_online_inventory">User not online - inventory has been saved.</string>
<!-- voice calls -->
<string name="answered_call">Your call has been answered</string>
@@ -4121,14 +4132,18 @@ Try enclosing path to the editor with double quotes.
Loading...
</string>
+ <!-- Presets graphic/camera -->
+ <string name="preset_combo_label">-Empty list-</string>
+ <string name="Default">Default</string>
+ <string name="none_paren_cap">(None)</string>
+ <string name="no_limit">No Limit</string>
+
<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
The physics shape contains triangles which are too small. Try simplifying the physics model.
</string>
-
<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
The physics shape contains bad confirmation data. Try to correct the physics model.
</string>
-
<string name="Mav_Details_MAV_UNKNOWN_VERSION">
The physics shape does not have correct version. Set the correct version for the physics model.
</string>