diff options
Diffstat (limited to 'indra/newview/skins')
4 files changed, 50 insertions, 112 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index a55201fd53..d03231a3fa 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] -Voice Server Version: [VOICE_VERSION] +Vivox Version: [VIVOX_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 c42b846dbb..e8ba8c683d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1384,18 +1384,6 @@ 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] @@ -2429,57 +2417,6 @@ 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 539c5f785c..01adc00e1a 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -48,31 +48,50 @@ auto_resize="false" follows="left|bottom" name="login" layout="topleft" -width="850" -min_width="850" +width="695" +min_width="695" user_resize="false" height="80"> <text follows="left|bottom" font="SansSerifSmall" height="16" -name="username_text" +name="first_name_text" top="20" left="20" width="150"> -Username: +First name: </text> <line_editor follows="left|bottom" height="22" -label="Username" +label="First" left_delta="0" max_length="31" -name="username_edit" +name="first_name_edit" select_on_focus="true" -tool_tip="[SECOND_LIFE] Username" +tool_tip="[SECOND_LIFE] First Name" top_pad="0" -width="150" /> + 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" /> <text follows="left|bottom" font="SansSerifSmall" @@ -80,7 +99,7 @@ height="15" left_pad="8" name="password_text" top="20" - width="135"> + width="150"> Password: </text> <line_editor @@ -100,14 +119,26 @@ label="Remember password" top_pad="3" name="remember_check" width="135" /> +<button + follows="left|bottom" + height="23" + image_unselected="PushButton_On" + image_selected="PushButton_On_Selected" + label="Log In" + label_color="White" + layout="topleft" + left_pad="10" + name="connect_btn" + top="35" + width="90" /> <text follows="left|bottom" font="SansSerifSmall" height="15" - left_pad="10" + left_pad="18" name="start_location_text" top="20" - width="250"> + width="130"> Start at: </text> <combo_box @@ -118,7 +149,7 @@ control_name="LoginLocation" max_chars="128" top_pad="0" name="start_location_combo" - width="250"> + width="135"> <combo_box.item label="My last location" name="MyLastLocation" @@ -131,37 +162,16 @@ name="MyHome" label="<Type region name>" name="Typeregionname" value="" /> </combo_box> -<button - height="23" - image_unselected="PushButton_On" - image_selected="PushButton_On_Selected" - label="Log In" - label_color="White" - layout="topleft" - left_pad="10" - name="connect_btn" - top="35" - width="90" /> - <text - follows="left|bottom" - font="SansSerifSmall" - height="15" - left_pad="10" - name="start_location_text" -top="20" - width="150"> - Grid Name: - </text> <combo_box -follows="left|bottom" allow_text_entry="true" font="SansSerifSmall" -height="23" + follows="left|right|bottom" + height="23" +layout="topleft" +top_pad="2" name="server_combo" -top_pad="0" -width="150" -max_chars="255" -visible="false" /> +width="135" + visible="false" /> </layout_panel> <layout_panel follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 9ac4ef9b37..0c73b8d769 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -46,15 +46,6 @@ <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> |