diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
25 files changed, 285 insertions, 219 deletions
diff --git a/indra/newview/skins/default/xui/de/floater_postcard.xml b/indra/newview/skins/default/xui/de/floater_postcard.xml index 91e0bb8133..49dcd4af51 100644 --- a/indra/newview/skins/default/xui/de/floater_postcard.xml +++ b/indra/newview/skins/default/xui/de/floater_postcard.xml @@ -1,42 +1,36 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Postcard" title="FOTO EMAILEN"> - <text name="to_label"> - E-Mail des Empfängers: - </text> - <line_editor left_delta="145" name="to_form" width="125"/> - <text name="from_label"> - Ihre E-Mail: - </text> - <line_editor left_delta="145" name="from_form" width="125"/> - <text name="name_label"> - Ihr Name: - </text> - <line_editor left_delta="145" name="name_form" width="125"/> - <text name="subject_label"> - Betreff: - </text> - <line_editor label="Betreff hier eingeben." left_delta="145" name="subject_form" width="125"/> - <text name="msg_label"> - Nachricht: - </text> - <text_editor name="msg_form"> - Nachricht hier eingeben. - </text_editor> - <check_box label="Im Web veröffentlichen" name="allow_publish_check" tool_tip="Veröffentlicht diese Postkarte im Web."/> - <check_box label="Ab-18-Inhalt" name="mature_check" tool_tip="Diese Postkarte enthält nicht jugendfreie Inhalte."/> - <button label="?" name="publish_help_btn"/> - <text name="fine_print" bottom_delta="21" height="140"> - Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus. - </text> - <button label="Abbrechen" name="cancel_btn"/> - <button label="Senden" name="send_btn"/> - <text name="default_subject"> - Postkarte aus [SECOND_LIFE]. - </text> - <text name="default_message"> - Sehen Sie hier! - </text> - <string name="upload_message"> - Wird gesendet... - </string> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="FOTO EMAILEN">
+ <text name="to_label">
+ E-Mail des Empfängers:
+ </text>
+ <text name="from_label">
+ Ihre E-Mail:
+ </text>
+ <text name="name_label">
+ Ihr Name:
+ </text>
+ <text name="subject_label">
+ Betreff:
+ </text>
+ <line_editor label="Betreff hier eingeben." name="subject_form"/>
+ <text name="msg_label">
+ Nachricht:
+ </text>
+ <text_editor name="msg_form">
+ Nachricht hier eingeben.
+ </text_editor>
+ <text name="fine_print">
+ Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
+ </text>
+ <button label="Abbrechen" name="cancel_btn"/>
+ <button label="Senden" name="send_btn"/>
+ <text name="default_subject">
+ Postkarte aus [SECOND_LIFE].
+ </text>
+ <text name="default_message">
+ Sehen Sie hier!
+ </text>
+ <string name="upload_message">
+ Wird gesendet...
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml index b56f150394..e21bed6bb5 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml @@ -11,7 +11,7 @@ <check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/> <check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/> <check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/> - <check_box label="Meine Lieblingslandmarken bei Anmeldung anzeigen (im Dropdown-Menü „Hier anfangen“)" name="favorites_on_login_check"/> + <check_box label="Meine Lieblingslandmarken bei Anmeldung anzeigen (im Dropdown-Menü „Hier anfangen“)" name="favorites_on_login_check" top_pad="15"/> <text name="Logs:"> Chatprotokolle: </text> diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml index 49deb9b025..9f6eac198b 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml @@ -299,7 +299,7 @@ Re-enter amount to see the latest exchange rate. type="string" font="SansSerifHuge" left="165" - width="170" + width="360" height="25" top="25" name="info_cannot_buy"> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index e8d5c97bbf..81046e99a0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2348,6 +2348,16 @@ function="Advanced.ToggleInfoDisplay" parameter="raycast" /> </menu_item_check> + <menu_item_check + label="Sculpt" + name="Sculpt"> + <menu_item_check.on_check + function="Advanced.CheckInfoDisplay" + parameter="sculpt" /> + <menu_item_check.on_click + function="Advanced.ToggleInfoDisplay" + parameter="sculpt" /> + </menu_item_check> </menu> <menu create_jump_keys="true" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9200e8506e..5e7bd605d2 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7331,8 +7331,6 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' notext="Don't Quit"/> </notification> - </global> - <global name="UnsupportedGLRequirements"> You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system. diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index cdc462109c..ea09286592 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -180,14 +180,14 @@ increment="1" initial_value="23" label="Nearby chat toasts life time:" - label_width="190" + label_width="285" layout="topleft" left="45" max_val="60" min_val="1" name="nearby_toasts_lifetime" top_pad="10" - width="230" /> + width="325" /> <spinner control_name="NearbyToastFadingTime" decimal_digits="0" @@ -196,14 +196,14 @@ increment="1" initial_value="3" label="Nearby chat toasts fading time:" - label_width="190" + label_width="285" layout="topleft" left_delta="0" max_val="60" min_val="0" name="nearby_toasts_fadingtime" top_pad="3" - width="230" /> + width="325" /> <check_box control_name="TranslateChat" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index c6d1e38ee7..2b22f0d6e3 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -47,7 +47,7 @@ height="12" name="font_colors" top_pad="20" - width="120" + width="170" > Chat font colors: </text> @@ -306,7 +306,7 @@ height="12" name="bubble_chat" top_pad="20" - width="450" + width="495" > Name tag background color (also affects Bubble Chat): </text> @@ -351,7 +351,7 @@ height="12" name="floater_opacity" top_pad="15" - width="120" + width="200" > Floater Opacity: </text> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 9ecab1a356..cefd1a5516 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -204,8 +204,7 @@ name="LocalLights" top_pad="1" width="256" /> - width="256" /> - <check_box + <check_box control_name="VertexShaderEnable" height="16" initial_value="true" @@ -724,7 +723,7 @@ follows="left|top" height="12" layout="topleft" - left="358" + left="388" left_pad="-30" name="TerrainDetailText" top="250" @@ -736,7 +735,7 @@ draw_border="false" height="38" layout="topleft" - left_delta="0" + left_delta="10" name="TerrainDetailRadio" top_pad="5" width="70"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 04412bdb9c..1a8aae7f91 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -195,7 +195,7 @@ left="0" name="radio_teleport" top_delta="20" - width="100" /> + width="110" /> <radio_item height="16" label="Auto-pilot" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index e374c89f21..91fe6f544c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -341,7 +341,7 @@ layout="topleft" left="25" name="voice_chat_settings" - width="180" + width="200" top_pad="7"> Voice Chat Settings </text> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 93b1c806e6..339f14eacb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -58,6 +58,83 @@ <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> + <string name="LoginFailedViewerNotPermitted"> +The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: +http://secondlife.com/download + +For more information, see our FAQ below: +http://secondlife.com/viewer-access-faq</string> + <string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string> + <string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string> + <string name="LoginFailedAlreadyLoggedIn">This agent is already logged in. +</string> + <string name="LoginFailedAuthenticationFailed">Sorry! We couldn't log you in. +Please check to make sure you entered the right + * Username (like bobsmith12 or steller.sunshine) + * Password +Also, please make sure your Caps Lock key is off.</string> + <string name="LoginFailedPasswordChanged">As a security precaution your password has been changed. +Please go to your account page at http://secondlife.com/password +and answer the security question to reset your password. +We are very sorry for the inconvenience.</string> + <string name="LoginFailedPasswordReset">We made some changes to our system and you will need to reset your password. +Please go to your account page at http://secondlife.com/password +and answer the security question to reset your password. +We are very sorry for the inconvenience.</string> + <string name="LoginFailedEmployeesOnly">Second Life is temporarily closed for maintenance. +Logins are currently restricted to employees only. +Check www.secondlife.com/status for updates.</string> + <string name="LoginFailedPremiumOnly">Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience. + +People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life.</string> + <string name="LoginFailedComputerProhibited">Second Life cannot be accessed from this computer. +If you feel this is an error, please contact +support@secondlife.com.</string> + <string name="LoginFailedAcountSuspended">Your account is not accessible until +[TIME] Pacific Time.</string> + <string name="LoginFailedAccountDisabled">We are unable to complete your request at this time. +Please contact Second Life support for assistance at http://secondlife.com/support. +If you are unable to change your password, please call (866) 476-9763.</string> + <string name="LoginFailedTransformError">Data inconsistency found during login. +Please contact support@secondlife.com.</string> + <string name="LoginFailedAccountMaintenance">Your account is undergoing minor maintenance. +Your account is not accessible until +[TIME] Pacific Time. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string> + <string name="LoginFailedPendingLogout">The system is logging you out right now. +Your Account will not be available until +[TIME] Pacific Time.</string> + <string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string> + <string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string> + <string name="LoginFailedRestrictedHours">Your account can only access Second Life +between [START] and [END] Pacific Time. +Please come back during those hours. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedIncorrectParameters">Incorrect parameters. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric. +If you feel this is an error, please contact support@secondlife.com.</string> + <string name="LogoutFailedRegionGoingOffline">Region is going offline. +Please try logging in again in a minute.</string> + <string name="LogoutFailedAgentNotInRegion">Agent not in region. +Please try logging in again in a minute.</string> + <string name="LogoutFailedPendingLogin">The region was logging in another session. +Please try logging in again in a minute.</string> + <string name="LogoutFailedLoggingOut">The region was logging out the previous session. +Please try logging in again in a minute.</string> + <string name="LogoutFailedStillLoggingOut">The region is still logging out the previous session. +Please try logging in again in a minute.</string> + <string name="LogoutSucceeded">Region has logged out last session. +Please try logging in again in a minute.</string> + <string name="LogoutFailedLogoutBegun">Region has begun the logout process. +Please try logging in again in a minute.</string> + <string name="LoginFailedLoggingOutSession">The system has begun logging out your last session. +Please try logging in again in a minute.</string> + + <!-- Disconnection --> <string name="AgentLostConnection">This region may be experiencing trouble. Please check your connection to the Internet.</string> <string name="SavingSettings">Saving your settings...</string> diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml index 3df0f92842..c3f4310103 100644 --- a/indra/newview/skins/default/xui/es/floater_about_land.xml +++ b/indra/newview/skins/default/xui/es/floater_about_land.xml @@ -82,7 +82,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s Calificación: </text> <text name="ContentRatingText"> - 'Adult' + Adulto </text> <text name="Owner:"> Propietario: @@ -187,7 +187,7 @@ Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver s Calificación: </text> <text name="region_maturity_text"> - 'Adult' + Adulto </text> <text name="resellable_lbl"> Revender: @@ -288,16 +288,16 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. Esta opción no esta activada porque usted no puede modificar las opciones de la parcela. </panel.string> <panel.string name="mature_check_mature"> - Contenido 'Mature' + Contenido Moderado </panel.string> <panel.string name="mature_check_adult"> - Contenido 'Adult' + Contenido Adulto </panel.string> <panel.string name="mature_check_mature_tooltip"> - La información o el contenido de su parcela se considera 'Mature'. + La información o el contenido de su parcela se considera Moderado. </panel.string> <panel.string name="mature_check_adult_tooltip"> - La información o el contenido de su parcela se considera 'Adult'. + La información o el contenido de su parcela se considera Adulto. </panel.string> <panel.string name="landing_point_none"> (ninguno) @@ -337,7 +337,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. <combo_box name="land category with adult"> <combo_box.item label="Cualquier categoría" name="item0"/> <combo_box.item label="Localización Linden" name="item1"/> - <combo_box.item label="'Adult'" name="item2"/> + <combo_box.item label="Adulto" name="item2"/> <combo_box.item label="Arte y Cultura" name="item3"/> <combo_box.item label="Negocios" name="item4"/> <combo_box.item label="Educativo" name="item5"/> @@ -365,7 +365,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda. <combo_box.item label="Terreno en alquiler" name="item13"/> <combo_box.item label="Otra" name="item12"/> </combo_box> - <check_box label="Contenido 'Mature'" name="MatureCheck" tool_tip=""/> + <check_box label="Contenido Moderado" name="MatureCheck" tool_tip=""/> <text name="Snapshot:"> Foto: </text> diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml index df94486c0e..b5b9805fe2 100644 --- a/indra/newview/skins/default/xui/es/floater_postcard.xml +++ b/indra/newview/skins/default/xui/es/floater_postcard.xml @@ -1,29 +1,25 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Postcard" title="FOTO POR CORREO"> <text name="to_label"> - Correo electrónico - del destinatario: - </text> - <line_editor bottom_delta="-20" name="to_form"/> - <text bottom_delta="-12" name="from_label"> - Su correo - electrónico: - </text> - <line_editor bottom_delta="-20" name="from_form"/> + Correo del destinatario: + </text> + <text name="from_label"> + Su correo: + </text> <text name="name_label"> Su nombre: - </text> + </text> <text name="subject_label"> Asunto: </text> <line_editor label="Escriba aquí el asunto." name="subject_form"/> - <text bottom_delta="-18" name="msg_label"> + <text name="msg_label"> Mensaje: </text> <text_editor name="msg_form"> Escriba aquí el mensaje. </text_editor> - <text bottom_delta="-21" name="fine_print"> + <text name="fine_print"> Si su destinatario se registra en [SECOND_LIFE], usted conseguirá un bono de referido. </text> diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml index 760429e73d..dc5d430375 100644 --- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml @@ -67,8 +67,8 @@ <combo_box.item label="Acoso > Abuso verbal" name="Harassment__Verbal_abuse"/> <combo_box.item label="Indecencia > En general, contenido o conducta ofensivos" name="Indecency__Broadly_offensive_content_or_conduct"/> <combo_box.item label="Indecencia > Nombre inapropiado del avatar" name="Indecency__Inappropriate_avatar_name"/> - <combo_box.item label="Indecencia > Contenido o conducta inapropiada en una región 'PG'" name="Indecency__Mature_content_in_PG_region"/> - <combo_box.item label="Indecencia > Contenido o conducta inapropiada en una región 'Mature'" name="Indecency__Inappropriate_content_in_Mature_region"/> + <combo_box.item label="Indecencia > Contenido o conducta inapropiada en una región General" name="Indecency__Mature_content_in_PG_region"/> + <combo_box.item label="Indecencia > Contenido o conducta inapropiada en una región Moderado" name="Indecency__Inappropriate_content_in_Mature_region"/> <combo_box.item label="Infracción de la propiedad intelectual > Eliminación de contenidos" name="Intellectual_property_infringement_Content_Removal"/> <combo_box.item label="Infracción de la propiedad intelectual > CopyBot o Exploit (programa malicioso) de permisos" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> <combo_box.item label="Intolerancia" name="Intolerance"/> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 91a03023a1..ce9273ab50 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1761,11 +1761,11 @@ Puedes pulsar 'Cambiar las Preferencias' para incrementar las preferen <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/> </notification> <notification name="SetClassifiedMature"> - ¿Este anuncio tiene contenido 'Moderado'? + ¿Este anuncio tiene contenido moderado? <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No" yestext="Sí"/> </notification> <notification name="SetGroupMature"> - ¿Este grupo tiene contenido 'Moderado'? + ¿Este grupo tiene contenido moderado? <usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No" yestext="Sí"/> </notification> <notification label="Confirmar el reinicio" name="ConfirmRestart"> @@ -2244,7 +2244,7 @@ Inténtalo seleccionando un trozo más pequeño de terreno. Se han excluido algunos términos de tu búsqueda debido a restricciones en el contenido, según se especifica en las Normas de la Comunidad. </notification> <notification name="NoContentToSearch"> - Por favor, elige al menos un tipo de contenido a buscar ('PG', 'Mature', o 'Adult'). + Por favor, elige al menos un tipo de contenido a buscar (General, Moderado o Adulto;). </notification> <notification name="SystemMessage"> [MESSAGE] diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml index a0f7433d7d..b00c300c85 100644 --- a/indra/newview/skins/default/xui/es/panel_group_general.xml +++ b/indra/newview/skins/default/xui/es/panel_group_general.xml @@ -46,12 +46,12 @@ Deja el cursor sobre las opciones para ver más ayuda. <check_box label="Cualquiera puede entrar" name="open_enrollement" tool_tip="Configura si se permite la entrada de nuevos miembros sin ser invitados."/> <check_box label="Cuota de entrada" name="check_enrollment_fee" tool_tip="Configura si hay que pagar una cuota para entrar al grupo"/> <spinner label="L$" left_delta="130" name="spin_enrollment_fee" tool_tip="Si la opción Cuota de entrada está marcada, los nuevos miembros han de pagar esta cuota para entrar al grupo." width="60"/> - <combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si la información de su grupo es 'mature'." width="150"> + <combo_box bottom_delta="-38" name="group_mature_check" tool_tip="Establece si la información de su grupo es moderado." width="150"> <combo_item name="select_mature"> - Selecciona el nivel de calificación - </combo_item> - <combo_box.item label="Contenido 'Mature'" name="mature"/> - <combo_box.item label="Contenido 'PG'" name="pg"/> + <combo_box.item label="Contenido moderado" name="mature"/> + <combo_box.item label="Contenido general" name="pg"/> </combo_box> <check_box initial_value="true" label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Permite que la gente vea este grupo en los resultados de la búsqueda"/> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index 790c7be581..e725e4a05a 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -24,9 +24,9 @@ </text> <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item label="'PG', 'Mature' y 'Adult'" name="Desired_Adult"/> - <combo_box.item label="'PG' y 'Mature'" name="Desired_Mature"/> - <combo_box.item label="'PG'" name="Desired_PG"/> + <combo_box.item label="General, Moderado y Adulto" name="Desired_Adult"/> + <combo_box.item label="General y Moderado" name="Desired_Mature"/> + <combo_box.item label="General" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> Localización inicial: diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index adc0862cf1..c162130af6 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml @@ -11,7 +11,7 @@ <check_box label="Sólo saben si estoy conectado mis amigos y grupos" name="online_visibility"/> <check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/> <check_box label="Desconectar el micrófono cuando finalicen las llamadas" name="auto_disengage_mic_check"/> - <check_box label="Mostrar mis Hitos favoritos al Inicio de sesión (menú desplegable "Empezar en")" name="favorites_on_login_check"/> + <check_box label="Mostrar mis Hitos favoritos al Inicio de sesión (menú desplegable "Empezar en")" name="favorites_on_login_check" top_pad="15"/> <text name="Logs:"> Registros de chat: </text> diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml index 06f4fffacf..2beacda235 100644 --- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml @@ -52,7 +52,7 @@ del estado. Calificación: </text> <text name="region_maturity_text"> - 'Adult' + Adulto </text> <text name="resellable_lbl"> Revender: diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 5a913c4c9d..27ca0e3bbb 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -724,13 +724,13 @@ Controlar su cámara </string> <string name="SIM_ACCESS_PG"> - 'PG' + General </string> <string name="SIM_ACCESS_MATURE"> - 'Mature' + Moderado </string> <string name="SIM_ACCESS_ADULT"> - 'Adult' + Adulto </string> <string name="SIM_ACCESS_DOWN"> Desconectado @@ -1916,7 +1916,7 @@ Se esperaba .wav, .tga, .bmp, .jpg, .jpeg, o .bvh Localización Linden </string> <string name="Adult"> - 'Adult' + Adulto </string> <string name="Arts&Culture"> Arte y Cultura diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml index a33c0344f7..bef41bb1ba 100644 --- a/indra/newview/skins/default/xui/fr/floater_about_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml @@ -411,11 +411,11 @@ texture : <text name="replace_texture_help"> Les objets avec cette texture affichent le film ou la page web quand vous cliquez sur la flèche Jouer. Sélectionnez l'image miniature pour choisir une texture différente. </text> - <check_box label="Échelle automatique" left="97" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais vous n'aurez à faire aucune autre mise à l'échelle ou alignement."/> - <text left="102" name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105"> + <check_box label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais vous n'aurez à faire aucune autre mise à l'échelle ou alignement."/> + <text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."> Taille : </text> - <spinner left_delta="89" name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/> + <spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/> <spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/> <text name="pixels"> pixels diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml index a4b0675fe4..948a3b973d 100644 --- a/indra/newview/skins/default/xui/fr/floater_postcard.xml +++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml @@ -1,43 +1,36 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Postcard" title="ENVOYER LA PHOTO PAR E-MAIL"> - <text name="to_label" width="135"> - E-mail du destinataire : - </text> - <line_editor left="143" name="to_form" width="130" left_delta="146"/> - <text name="from_label"> - Votre e-mail : - </text> - <line_editor left="143" name="from_form" width="130" left_delta="146"/> - <text name="name_label"> - Votre nom : - </text> - <line_editor left="143" name="name_form" width="130" left_delta="146"/> - <text name="subject_label"> - Objet : - </text> - <line_editor left="143" name="subject_form" width="130" left_delta="146"/> - <line_editor label="Saisir ici votre objet" name="subject_form"/> - <text name="msg_label"> - Message : - </text> - <check_box label="Publier sur le web" name="allow_publish_check" tool_tip="Publiez cette carte postale sur le web."/> - <check_box label="Contenu adulte" name="mature_check" tool_tip="Cette carte postale est à caractère adulte."/> - <button label="?" name="publish_help_btn"/> - <text_editor name="msg_form"> - Saisir ici votre message - </text_editor> - <text name="fine_print"> - Si le destinataire s'inscrit sur [SECOND_LIFE], vous recevrez un bonus. - </text> - <button label="Annuler" name="cancel_btn"/> - <button label="Envoyer" name="send_btn"/> - <string name="default_subject"> - Carte postale de [SECOND_LIFE]. - </string> - <string name="default_message"> - Ouvrez-moi ! - </string> - <string name="upload_message"> - Envoi en cours... - </string> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="ENVOYER LA PHOTO PAR E-MAIL">
+ <text name="to_label">
+ E-mail du destinataire :
+ </text>
+ <text name="from_label">
+ Votre e-mail :
+ </text>
+ <text name="name_label">
+ Votre nom :
+ </text>
+ <text name="subject_label">
+ Objet :
+ </text>
+ <line_editor label="Saisir ici votre objet" name="subject_form"/>
+ <text name="msg_label">
+ Message :
+ </text>
+ <text_editor name="msg_form">
+ Saisir ici votre message
+ </text_editor>
+ <text name="fine_print">
+ Si le destinataire s'inscrit sur [SECOND_LIFE], vous recevrez un bonus.
+ </text>
+ <button label="Annuler" name="cancel_btn"/>
+ <button label="Envoyer" name="send_btn"/>
+ <string name="default_subject">
+ Carte postale de [SECOND_LIFE].
+ </string>
+ <string name="default_message">
+ Ouvrez-moi !
+ </string>
+ <string name="upload_message">
+ Envoi en cours...
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index a2f9b4176e..5af2fed142 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml @@ -9,7 +9,7 @@ </text> <check_box label="Pokaż mój profil w wynikach wyszukiwarki" name="online_searchresults"/> <check_box label="Mój status online jest dostępny tylko dla znajomych i grup do których należę" name="online_visibility"/> - <check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check"/> + <check_box label="Możliwość wysyłania wiadomości prywatnej (IM) oraz rozmowy głosowej tylko dla znajomych i grup do których należę" name="voice_call_friends_only_check" top_pad="15"/> <check_box label="Wyłącz mikrofon po zakończeniu rozmowy głosowej" name="auto_disengage_mic_check"/> <check_box label="Pokaż moje ulubione landmarki przy logowaniu (w rozwijanym menu 'Rozpocznij w')" name="favorites_on_login_check"/> <text name="Logs:"> diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml index 3582923ed0..362a553d64 100644 --- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml @@ -10,7 +10,7 @@ Prévia da imagem como: </text> - <combo_box label="Tipo de Roupas" left="100" name="clothing_type_combo" width="186"> + <combo_box label="Tipo de Roupas" name="clothing_type_combo"> <item label="Imagem" name="Image" value="Imagem"/> <item label="Cabelo" name="Hair" value="Cabelo"/> <item label="Cabeça de mulher" name="FemaleHead" value="Cabeça de mulher"/> diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml index 80bdbb0fb4..b134dfeefa 100644 --- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml @@ -1,75 +1,74 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="gesture_preview"> - <floater.string name="step_anim"> - Executar animação: - </floater.string> - <floater.string name="step_sound"> - Executar som: - </floater.string> - <floater.string name="step_chat"> - Executar bate-papo: - </floater.string> - <floater.string name="step_wait"> - Pausa - </floater.string> - <floater.string name="stop_txt"> - Parar - </floater.string> - <floater.string name="preview_txt"> - Prévia - </floater.string> - <floater.string name="none_text"> - -- Nenhum -- - </floater.string> - <floater.string name="Title"> - Gesto: [NAME] - </floater.string> - <text name="desc_label"> - Descrição: - </text> - <text name="trigger_label"> - Gatilho: - </text> - <text name="replace_text" tool_tip="Substituir a(s) palavra(s) de gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"> - Trocar por: - </text> - <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"/> - <text name="key_label"> - Atalho: - </text> - <combo_box label="Nenhum" left="116" name="modifier_combo" width="76"/> - <combo_box label="Nenhum" left_delta="80" name="key_combo" width="76"/> - <text name="library_label"> - Biblioteca: - </text> - <scroll_list name="library_list" width="84"> - <scroll_list.rows name="action_animation" value="Animação"/> - <scroll_list.rows name="action_sound" value="Som"/> - <scroll_list.rows name="action_chat" value="Bate-papo"/> - <scroll_list.rows name="action_wait" value="Espere"/> - </scroll_list> - <button label="Incluir" left="118" name="add_btn" width="87"/> - <text name="steps_label"> - Passos: - </text> - <scroll_list left="226" name="step_list" width="205"/> - <button label="P/ cima" left_delta="-13" name="up_btn" width="114"/> - <button label="P/ baixo" name="down_btn" width="114"/> - <button label="Remover" left_delta="13" name="delete_btn" width="84"/> - <text name="options_text"> - (opções) - </text> - <radio_group name="animation_trigger_type"> - <radio_item label="Iniciar" name="start"/> - <radio_item label="Parar" name="stop"/> - </radio_group> - <check_box bottom_delta="34" label="até que as animações estejam concluídas" name="wait_anim_check"/> - <check_box bottom_delta="-30" label="segundos:" name="wait_time_check"/> - <line_editor left_delta="130" name="wait_time_editor"/> - <text name="help_label"> - Se não incluir uma pausa, todas as etapas ocorrem ao mesmo tempo. - </text> - <check_box label="Ativar" name="active_check" tool_tip="Gestos podem ser ativados escrevendo suas frases de gatilho no chat ou teclando o atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/> - <button label="Prévia" name="preview_btn"/> - <button label="Salvar" name="save_btn"/> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gesture_preview">
+ <floater.string name="step_anim">
+ Executar animação:
+ </floater.string>
+ <floater.string name="step_sound">
+ Executar som:
+ </floater.string>
+ <floater.string name="step_chat">
+ Executar bate-papo:
+ </floater.string>
+ <floater.string name="step_wait">
+ Pausa
+ </floater.string>
+ <floater.string name="stop_txt">
+ Parar
+ </floater.string>
+ <floater.string name="preview_txt">
+ Prévia
+ </floater.string>
+ <floater.string name="none_text">
+ -- Nenhum --
+ </floater.string>
+ <floater.string name="Title">
+ Gesto: [NAME]
+ </floater.string>
+ <text name="desc_label">
+ Descrição:
+ </text>
+ <text name="trigger_label">
+ Gatilho:
+ </text>
+ <text name="replace_text" tool_tip="Substituir a(s) palavra(s) de gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!">
+ Trocar por:
+ </text>
+ <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituído por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"/>
+ <text name="key_label">
+ Atalho:
+ </text>
+ <combo_box label="Nenhum" name="modifier_combo" width="68"/>
+ <combo_box label="Nenhum" name="key_combo" width="48"/>
+ <text name="library_label">
+ Biblioteca:
+ </text>
+ <scroll_list name="library_list">
+ <scroll_list.rows name="action_animation" value="Animação"/>
+ <scroll_list.rows name="action_sound" value="Som"/>
+ <scroll_list.rows name="action_chat" value="Bate-papo"/>
+ <scroll_list.rows name="action_wait" value="Espere"/>
+ </scroll_list>
+ <button label="Incluir" name="add_btn"/>
+ <text name="steps_label">
+ Passos:
+ </text>
+ <button label="P/ cima" name="up_btn" />
+ <button label="P/ baixo" name="down_btn"/>
+ <button label="Remover" name="delete_btn"/>
+ <text name="options_text">
+ (opções)
+ </text>
+ <radio_group name="animation_trigger_type">
+ <radio_item label="Iniciar" name="start"/>
+ <radio_item label="Parar" name="stop"/>
+ </radio_group>
+ <check_box label="até que as animações estejam concluídas" name="wait_anim_check"/>
+ <check_box label="segundos:" name="wait_time_check"/>
+ <line_editor name="wait_time_editor"/>
+ <text name="help_label">
+ Se não incluir uma pausa, todas as etapas ocorrem ao mesmo tempo.
+ </text>
+ <check_box label="Ativar" name="active_check" tool_tip="Gestos podem ser ativados escrevendo suas frases de gatilho no chat ou teclando o atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
+ <button label="Prévia" name="preview_btn"/>
+ <button label="Salvar" name="save_btn"/>
+</floater>
|