diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
4 files changed, 90 insertions, 28 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index a6a4c79da4..b5be03346e 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -49,7 +49,7 @@ libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] Qt Webkit Version: [QT_WEBKIT_VERSION] -Vivox Version: [VIVOX_VERSION] +Voice Server Version: [VOICE_VERSION] </floater.string> <floater.string name="none"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4479a3dd4d..000755e546 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -735,6 +735,14 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? <notification icon="alertmodal.tga" + name="InvalidCredentialFormat" + type="alertmodal"> +You need to enter both the First and Last name of your avatar into the Username field, then login again. + </notification> + + + <notification + icon="alertmodal.tga" name="AddClassified" type="alertmodal"> Classified ads appear in the 'Classified' section of the Search directory and on [http://secondlife.com/community/classifieds secondlife.com] for one week. @@ -1384,6 +1392,18 @@ Unable to encode file: [FILE] <notification icon="alertmodal.tga" + name="CorruptedProtectedDataStore" + type="alertmodal"> + We are unable to read your protected data so it is being reset. + This may happen when you change network setup. + + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="CorruptResourceFile" type="alertmodal"> Corrupt resource file: [FILE] @@ -2417,6 +2437,57 @@ Please choose the male or female avatar. You can change your mind later. notext="Female" yestext="Male"/> </notification> + <notification icon="alertmodal.tga" + name="CantTeleportToGrid" + type="alertmodal"> +Could not teleport to [SLURL] as it's on a different grid ([GRID]) than the current grid ([CURRENT_GRID]). Please close your viewer and try again. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" + name="GeneralCertificateError" + type="alertmodal"> +Could not connect to the server. +[REASON] + +SubjectName: [SUBJECT_NAME_STRING] +IssuerName: [ISSUER_NAME_STRING] +Valid From: [VALID_FROM] +Valid To: [VALID_TO] +MD5 Fingerprint: [SHA1_DIGEST] +SHA1 Fingerprint: [MD5_DIGEST] +Key Usage: [KEYUSAGE] +Extended Key Usage: [EXTENDEDKEYUSAGE] +Subject Key Identifier: [SUBJECTKEYIDENTIFIER] + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification icon="alertmodal.tga" + name="TrustCertificateError" + type="alertmodal"> +The certification authority for this server is not known. + +Certificate Information: +SubjectName: [SUBJECT_NAME_STRING] +IssuerName: [ISSUER_NAME_STRING] +Valid From: [VALID_FROM] +Valid To: [VALID_TO] +MD5 Fingerprint: [SHA1_DIGEST] +SHA1 Fingerprint: [MD5_DIGEST] +Key Usage: [KEYUSAGE] +Extended Key Usage: [EXTENDEDKEYUSAGE] +Subject Key Identifier: [SUBJECTKEYIDENTIFIER] + +Would you like to trust this authority? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Trust"/> + </notification> <notification icon="alertmodal.tga" diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a725548e61..982ff0fbac 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -56,42 +56,23 @@ height="80"> follows="left|bottom" font="SansSerifSmall" height="16" -name="first_name_text" +name="username_text" top="20" left="20" width="150"> -First name: +Username: </text> <line_editor follows="left|bottom" height="22" -label="First" +label="Username" left_delta="0" max_length="31" -name="first_name_edit" +name="username_edit" select_on_focus="true" -tool_tip="[SECOND_LIFE] First Name" +tool_tip="[SECOND_LIFE] Username" top_pad="0" - width="135" /> - <text - follows="left|bottom" - font="SansSerifSmall" - height="16" - left_pad="8" - name="last_name_text" - top="20" - width="150"> - Last name: </text> -<line_editor -follows="left|bottom" -height="22" -label="Last" -max_length="31" -name="last_name_edit" -select_on_focus="true" -tool_tip="[SECOND_LIFE] Last Name" - top_pad="0" - width="135" /> +width="150" /> <text follows="left|bottom" font="SansSerifSmall" @@ -104,6 +85,7 @@ top="20" </text> <line_editor follows="left|bottom" +handle_edit_keys_directly="true" height="22" max_length="16" name="password_edit" @@ -201,7 +183,7 @@ height="16" name="forgot_password_text" top_pad="12" right="-10" - width="215"> + width="180"> Forgot your name or password? </text> <text @@ -213,7 +195,7 @@ height="16" name="login_help" top_pad="2" right="-10" - width="220"> + width="180"> Need help logging in? </text> <!-- <text follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f544449d02..6d80b17ac6 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -46,6 +46,15 @@ <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string> <string name="LoginConnectingToRegion">Connecting to region...</string> <string name="LoginDownloadingClothing">Downloading clothing...</string> + <string name="InvalidCertificate">The server returned an invalid or corrupt certificate. Please contact the Grid administrator.</string> + <string name="CertInvalidHostname">An invalid hostname was used to access the server, please check your SLURL or Grid hostname.</string> + <string name="CertExpired">The certificate returned by the Grid appears to be expired. Please check your system clock, or contact your Grid administr\ +ator.</string> + <string name="CertKeyUsage">The certificate returned by the server could not be used for SSL. Please contact your Grid administrator.</string> + <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 administrat +or.</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> |