diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-05-25 14:44:52 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-05-25 14:44:52 -0600 |
| commit | fede6c44938160ae56cd78a4c69a6bb8e48f0064 (patch) | |
| tree | f7093e50f15f14a9ae56da2dee4f88bf7b9baad5 | |
| parent | 8c97ed86ff725b9fea444ac00b4a33e76920e737 (diff) | |
| parent | 8d5a9f9d2d905734c030ce0c778ce3a95c53b6b2 (diff) | |
Merge
32 files changed, 129 insertions, 127 deletions
@@ -113,6 +113,8 @@ bb1075286b3b147b1dae2e3d6b2d56f04ff03f35 2.6.6-beta1 5e349dbe9cc84ea5795af8aeb6d473a0af9d4953 2.6.8-start 11d5d8080e67c3955914caf98f2eb116af30e55a 2.6.9-start 11d5d8080e67c3955914caf98f2eb116af30e55a 2.6.9-start +beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1 +beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1 e67da2c6e3125966dd49eef98b36317afac1fcfe 2.6.9-start beafa8a9bd1d1b670b7523d865204dc4a4b38eef DRTVWR-55_2.6.8-beta1 beafa8a9bd1d1b670b7523d865204dc4a4b38eef 2.6.8-beta1 diff --git a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml index 278fe0eeea..1b64888271 100644 --- a/indra/newview/skins/default/xui/da/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/da/panel_media_settings_security.xml @@ -2,7 +2,8 @@ <panel label="Sikkerhed" name="Media Settings Security"> <check_box initial_value="false" label="Tillad kun adgang til angivne URL mønstre" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - Angivelser som hjemmesiden fejler imod er markeret: + Angivelser som hjemmesiden fejler imod er +markeret: </text> <button label="Tilføj" name="whitelist_add"/> <button label="Slet" name="whitelist_del"/> diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml index 5369155cf9..ca4ee8981b 100644 --- a/indra/newview/skins/default/xui/de/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml @@ -127,41 +127,41 @@ unterstützt [AMOUNT2] Objekte <text name="region_name_label"> Region: </text> - <text left="680" left_delta="140" name="region_name_text"> + <text name="region_name_text"> (unbekannt) </text> <text name="region_type_label"> Typ: </text> - <text left="680" left_delta="140" name="region_type_text"> + <text name="region_type_text"> (unbekannt) </text> <text name="estate_name_label"> Grundbesitz: </text> - <text left="680" left_delta="140" name="estate_name_text"> + <text name="estate_name_text"> (unbekannt) </text> - <text name="estate_owner_label" right="600" width="200"> + <text name="estate_owner_label"> Grundbesitzer: </text> - <text left="680" left_delta="140" name="estate_owner_text"> + <text name="estate_owner_text"> (unbekannt) </text> - <text left="410" name="resellable_changeable_label"> + <text name="resellable_changeable_label"> Gekauftes Land in dieser Region: </text> - <text left="410" name="resellable_clause"> + <text name="resellable_clause"> Wiederverkauf möglich oder nicht möglich. </text> - <text left="410" name="changeable_clause"> + <text name="changeable_clause"> Darft oder darf nicht zusammengelegt/unterteilt werden. </text> - <text left="410" name="covenant_text"> + <text name="covenant_text"> Sie müssen dem Grundbesitzvertrag zustimmen: </text> - <text left="470" name="covenant_timestamp_text"/> - <text_editor left="470" name="covenant_editor"> + <text name="covenant_timestamp_text"/> + <text_editor name="covenant_editor"> Wird geladen... </text_editor> <check_box label="Ich stimme dem obigen Vertrag zu." name="agree_covenant"/> @@ -191,7 +191,7 @@ Objekte im Verkauf eingeschlossen <text name="error_message"> Irgendetwas stimmt nicht. </text> - <button label="Gehe zu Website" name="error_web" top_delta="136"/> + <button label="Gehe zu Website" name="error_web" /> <text name="account_action"> Macht Sie zum Premium-Mitglied. </text> @@ -203,9 +203,8 @@ Objekte im Verkauf eingeschlossen <combo_box.item label="7,50 US$/Monat, vierteljährliche Abrechnung" name="US$7.50/month,billedquarterly"/> <combo_box.item label="6,00 US$/Monat, jährliche Abrechnung" name="US$6.00/month,billedannually"/> </combo_box> - <text height="36" name="land_use_action" top="270"> - Erhöhen Sie Ihre monatlichen Landnutzungsgebühren -auf 40 US$/month. + <text name="land_use_action"> + Erhöhen Sie Ihre monatlichen Landnutzungsgebühren auf 40 US$/month. </text> <text name="land_use_reason"> Sie besitzen 1309 m² Land. diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml index 8f67fae464..646138eaad 100644 --- a/indra/newview/skins/default/xui/de/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml @@ -5,16 +5,16 @@ <text name="info_parcel_label"> Parzelle: </text> - <text bottom_delta="-5" height="16" name="info_parcel" left="70"> + <text name="info_parcel"> PARZELLENNAME </text> <text name="info_size_label"> Größe: </text> - <text bottom_delta="-21" height="32" name="info_size" left="70"> + <text name="info_size"> [AREA] m². </text> - <text bottom_delta="-57" height="28" name="info_action"> + <text name="info_action"> Zum Verkauf dieser Parzelle: </text> <text name="price_label"> @@ -32,13 +32,13 @@ <text name="price_per_m"> ([PER_METER] L$ pro m²) </text> - <text bottom_delta="38" left="72" name="sell_to_label" right="-20"> + <text name="sell_to_label"> 2. Land verkaufen an: </text> - <text bottom_delta="-16" height="16" left="72" name="sell_to_text" right="-10"> + <text name="sell_to_text"> Offener Verkauf oder Verkauf an bestimmte Person? </text> - <combo_box bottom_delta="-32" height="16" left="72" name="sell_to" width="140"> + <combo_box name="sell_to"> <combo_box.item label="-- Auswählen --" name="--selectone--"/> <combo_box.item label="An jeden" name="Anyone"/> <combo_box.item label="An bestimmte Person:" name="Specificuser:"/> @@ -50,15 +50,15 @@ <text name="sell_objects_text"> Die transferierbaren Landeigentümer-Objekte auf der Parzelle wechseln den Eigentümer. </text> - <radio_group bottom_delta="-58" name="sell_objects"> + <radio_group name="sell_objects"> <radio_item label="Nein, Objekte behalten" name="no"/> <radio_item label="Ja, Objekte mit Land verkaufen" name="yes"/> </radio_group> - <button label="Objekte anzeigen" name="show_objects" width="116"/> + <button label="Objekte anzeigen" name="show_objects"/> <text name="nag_message_label"> ACHTUNG: Verkäufe sind endgültig. </text> - <button label="Zum Verkauf freigeben" name="sell_btn" width="180"/> + <button label="Zum Verkauf freigeben" name="sell_btn"/> <button label="Abbrechen" name="cancel_btn"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml index dad550227e..d2055a53db 100644 --- a/indra/newview/skins/default/xui/de/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml @@ -39,21 +39,18 @@ <text name="id_text"> Objekt-ID: </text> - <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="id_editor" text_readonly_color="white" width="244"/> - <button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen" name="show_beacon_btn" right="-10" width="110"/> + <button label="Beacon anzeigen" name="show_beacon_btn"/> <text name="obj_name_text"> Objektname: - </text> - <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="object_name_editor" text_readonly_color="white" width="244"/> - <button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_object_btn" right="-10" width="110"/> + </text> + <button label="Filter" name="filter_object_btn"/> <text name="owner_name_text"> Eigentümer: - </text> - <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true" follows="left|bottom|right" font="SansSerifSmall" height="20" left="106" name="owner_name_editor" text_readonly_color="white" width="218"/> - <button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_owner_btn" right="-10" width="110"/> - <button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren" name="refresh_btn" right="-10" width="110"/> - <button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben" left="10" name="return_selected_btn" width="134"/> - <button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/> - <button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren" left="10" name="disable_selected_btn" width="134"/> - <button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren" left="150" name="disable_all_btn" width="134"/> + </text> + <button label="Filter" name="filter_owner_btn"/> + <button label="Aktualisieren" name="refresh_btn"/> + <button label="Auswahl zurückgeben" name="return_selected_btn" width="134"/> + <button label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/> + <button label="Auswahl deaktivieren" name="disable_selected_btn" width="134"/> + <button label="Alle deaktivieren" left="150" name="disable_all_btn" width="134"/> </floater> diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml index 097a60a444..bb0dd9c75d 100644 --- a/indra/newview/skins/default/xui/de/floater_water.xml +++ b/indra/newview/skins/default/xui/de/floater_water.xml @@ -3,9 +3,10 @@ <floater.string name="WLDefaultWaterNames"> Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez </floater.string> - <text name="KeyFramePresetsText" width="116"> + <text name="KeyFramePresetsText" width="110"> Voreinstellungen: </text> + <combo_box left_delta="110" name="WaterPresetsCombo"/> <button label="Neu" label_selected="Neu" name="WaterNewPreset"/> <button label="Speichern" label_selected="Speichern" name="WaterSavePreset"/> <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset"/> diff --git a/indra/newview/skins/default/xui/en/floater_buy_land.xml b/indra/newview/skins/default/xui/en/floater_buy_land.xml index d5d4565ca1..ab81a86720 100644 --- a/indra/newview/skins/default/xui/en/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml @@ -204,7 +204,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="region_name_text" top_delta="0" use_ellipses="true" @@ -237,7 +237,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="region_type_text" top_delta="0" width="175"> @@ -262,7 +262,7 @@ supports [AMOUNT2] objects follows="left|top" height="14" layout="topleft" - left_delta="110" + left_delta="125" name="estate_name_text" top_delta="0" width="175"> @@ -276,8 +276,8 @@ supports [AMOUNT2] objects layout="topleft" left="440" name="estate_owner_label" - right="550" - width="100" + right="565" + width="120" word_wrap="true"> Estate Owner: </text> @@ -287,7 +287,7 @@ supports [AMOUNT2] objects follows="left|top" height="20" layout="topleft" - left_delta="110" + left_delta="125" name="estate_owner_text" top_delta="0" width="175"> diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index 619669d28a..38b305db7e 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -41,14 +41,14 @@ follows="top|left" left="16" name="info_parcel_label" - width="48"> + width="70"> Parcel: </text> <text top_delta="0" follows="top|left" height="16" - left="56" + left="78" name="info_parcel" right="-20"> PARCEL NAME @@ -57,14 +57,14 @@ follows="top|left" left="16" name="info_size_label" - width="48"> + width="70"> Size: </text> <text follows="top|left" top_delta="0" height="32" - left="56" + left="78" name="info_size" right="-20"> [AREA] m² @@ -164,14 +164,14 @@ left_delta="0" name="sell_to_agent" top_pad="4" - width="170" /> + width="150" /> <button height="20" label="Select" left_pad="5" name="sell_to_select_agent" top_delta="0" - width="60" /> + width="90" /> <text follows="top|left" font="SansSerif" @@ -199,20 +199,20 @@ <radio_item bottom="40" height="0" - left="10" + left="2" name="none" visible="false" /> <radio_item top_pad="10" - height="16" + height="18" label="No, keep ownership of objects" - left="10" + left="2" name="no" /> <radio_item top_pad="10" height="16" label="Yes, sell objects with land" - left="10" + left="2" name="yes" /> </radio_group> <button @@ -221,7 +221,7 @@ name="show_objects" left="70" top_pad="10" - width="110" /> + width="140" /> <text bottom_delta="30" follows="top|left" @@ -229,7 +229,7 @@ height="16" left="16" name="nag_message_label" - right="-20"> + right="-5"> REMEMBER: All sales are final. </text> <button @@ -239,15 +239,15 @@ left_delta="0" name="sell_btn" top_pad="10" - width="130" /> + width="185" /> <button follows="bottom|left" height="20" label="Cancel" - left_pad="30" + left_pad="5" name="cancel_btn" top_delta="0" - width="90" /> + width="85" /> </panel> </scroll_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index e413228ddc..ec190ab656 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -100,7 +100,7 @@ right="-5" name="upload_btn" top_delta="0" - width="100" /> + width="110" /> <flyout_button follows="left|top" height="23" @@ -147,7 +147,7 @@ right="-5" left_pad="5" name="discard_btn" - width="100" /> + width="110" /> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index b06c6dc215..4dfdcd15c7 100644 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -105,7 +105,7 @@ left_delta="0" name="id_text" top_pad="10" - width="100"> + width="107"> Object ID: </text> <line_editor @@ -116,7 +116,7 @@ left_pad="3" name="id_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" @@ -138,7 +138,7 @@ left="10" top_pad="5" name="obj_name_text" - width="100"> + width="107"> Object name: </text> <line_editor @@ -148,7 +148,7 @@ left_pad="3" name="object_name_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" @@ -170,7 +170,7 @@ left="10" top_pad="5" name="owner_name_text" - width="100"> + width="107"> Owner: </text> <line_editor @@ -180,7 +180,7 @@ left_pad="3" name="owner_name_editor" top_delta="-3" - width="575" /> + width="568" /> <button follows="bottom|right" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index 38e8b9844f..cdf14572fe 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -196,7 +196,7 @@ initial_val="256" label="" label_width="0" - left_delta="40" + left_delta="68" max_val="2048" min_val="0" mouse_opaque="true" diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml index 74243a4d06..9d33b69de9 100644 --- a/indra/newview/skins/default/xui/es/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml @@ -129,25 +129,25 @@ para cubrir esta parcela. <text name="region_name_label"> Región: </text> - <text left="565" name="region_name_text"> + <text name="region_name_text"> (desconocida) </text> <text name="region_type_label"> Tipo: </text> - <text left="565" name="region_type_text"> + <text name="region_type_text"> (desconocido) </text> <text name="estate_name_label"> Estado: </text> - <text left="565" name="estate_name_text"> + <text name="estate_name_text"> (desconocido) </text> - <text name="estate_owner_label" right="565" width="115"> + <text name="estate_owner_label"> Propietario del estado: </text> - <text left="565" name="estate_owner_text"> + <text name="estate_owner_text"> (desconocido) </text> <text name="resellable_changeable_label"> diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml index efedb5d689..d883683945 100644 --- a/indra/newview/skins/default/xui/es/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml @@ -54,8 +54,8 @@ <radio_item label="No, mantener la propiedad de los objetos" name="no"/> <radio_item label="Sí, vender los objetos con el terreno" name="yes"/> </radio_group> - <button label="Mostrar los objetos" name="show_objects" width="120"/> - <text name="nag_message_label"> + <button label="Mostrar los objetos" name="show_objects"/> + <text name="nag_message_label" font="SansSerifSmallBold" left="10"> RECUERDA: todas las ventas son definitivas. </text> <button label="Poner en venta el terreno" name="sell_btn"/> diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml index 7c2522e8a9..033633bd22 100644 --- a/indra/newview/skins/default/xui/es/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml @@ -39,19 +39,16 @@ <text name="id_text"> ID del objeto: </text> - <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/> - <button label="Mostrar la baliza" name="show_beacon_btn" width="115"/> + <button label="Mostrar la baliza" name="show_beacon_btn"/> <text name="obj_name_text"> Nombre del objeto: </text> - <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/> - <button label="Filtro" name="filter_object_btn" width="115"/> - <text name="owner_name_text" width="130"> + <button label="Filtro" name="filter_object_btn"/> + <text name="owner_name_text"> Propietario: </text> - <line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/> - <button label="Filtro" name="filter_owner_btn" width="115"/> - <button label="Actualizar" name="refresh_btn" width="115"/> + <button label="Filtro" name="filter_owner_btn"/> + <button label="Actualizar" name="refresh_btn"/> <button label="Devolver lo seleccionado" name="return_selected_btn" width="170"/> <button label="Devolver todo" left="190" name="return_all_btn"/> <button label="Desactivar lo seleccionado" name="disable_selected_btn" width="170"/> diff --git a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml index c72f562a68..a1a3ec86cf 100644 --- a/indra/newview/skins/default/xui/es/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/es/panel_media_settings_security.xml @@ -2,7 +2,8 @@ <panel label="Seguridad" name="Media Settings Security"> <check_box initial_value="false" label="Permitir el acceso sólo a los patrones de URL especificados" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - Están marcadas las entradas que la página web no admite: + Están marcadas las entradas que la página web no +admite: </text> <button label="Añadir" name="whitelist_add"/> <button label="Borrar" name="whitelist_del"/> diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml index b5ffc8f9c7..b835cc6d87 100644 --- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml @@ -5,13 +5,13 @@ <text name="info_parcel_label"> Parcelle : </text> - <text name="info_parcel" left="70"> + <text name="info_parcel"> NOM DE LA PARCELLE </text> <text name="info_size_label"> Taille : </text> - <text name="info_size" left="70"> + <text name="info_size"> [AREA] m² </text> <text bottom_delta="-60" name="info_action"> @@ -38,27 +38,27 @@ <text name="sell_to_text"> Vendez votre terrain à n'importe qui ou uniquement à un acheteur spécifique. </text> - <combo_box bottom_delta="-32" name="sell_to"> + <combo_box name="sell_to"> <combo_box.item label="- Sélectionnez -" name="--selectone--"/> <combo_box.item label="Tout le monde" name="Anyone"/> <combo_box.item label="Personne spécifique :" name="Specificuser:"/> </combo_box> - <button label="Sélectionner" name="sell_to_select_agent" width="100"/> + <button label="Sélectionner" name="sell_to_select_agent"/> <text name="sell_objects_label"> 3. Vendre les objets avec ce terrain ? </text> <text name="sell_objects_text"> Les objets transférables se trouvant sur la parcelle changeront de propriétaire. </text> - <radio_group bottom_delta="-54" name="sell_objects" right="430"> + <radio_group name="sell_objects"> <radio_item label="Non, rester le propriétaire des objets" name="no"/> <radio_item label="Oui, vendre les objets avec le terrain" name="yes"/> </radio_group> - <button label="Afficher les objets" name="show_objects" right="420" width="120"/> - <text bottom_delta="-30" name="nag_message_label"> + <button label="Afficher les objets" name="show_objects"/> + <text name="nag_message_label" font="SansSerif"> Rappel : Toutes les ventes sont définitives. </text> - <button label="Indiquer le terrain à vendre" name="sell_btn" width="165"/> + <button label="Indiquer le terrain à vendre" name="sell_btn"/> <button label="Annuler" name="cancel_btn"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/it/floater_buy_land.xml b/indra/newview/skins/default/xui/it/floater_buy_land.xml index f3b30f7048..3940c43a3d 100644 --- a/indra/newview/skins/default/xui/it/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_land.xml @@ -142,10 +142,10 @@ consente [AMOUNT2] oggetti <text name="estate_name_text"> (sconosciuto) </text> - <text name="estate_owner_label" right="575" width="120"> + <text name="estate_owner_label"> Proprietario della regione: </text> - <text left="580" name="estate_owner_text" width="155"> + <text name="estate_owner_text"> (sconosciuto) </text> <text name="resellable_changeable_label"> diff --git a/indra/newview/skins/default/xui/it/floater_sell_land.xml b/indra/newview/skins/default/xui/it/floater_sell_land.xml index 0f8d24ebbd..106ae0373c 100644 --- a/indra/newview/skins/default/xui/it/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/it/floater_sell_land.xml @@ -55,7 +55,7 @@ <radio_item label="Si, vendi gli oggetti con la terra" name="yes"/> </radio_group> <button label="Mostra oggetti" name="show_objects"/> - <text name="nag_message_label"> + <text name="nag_message_label" font="SansSerifSmallBold" left="9"> RICORDA: Tutte le vendite sono definitive. </text> <button label="Imposta terreno come in vendita" name="sell_btn"/> diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml index 939c5e83a0..7d062db23b 100644 --- a/indra/newview/skins/default/xui/it/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml @@ -39,13 +39,13 @@ <text name="id_text"> ID oggetto: </text> - <line_editor font="SansSerifSmall" left="90" name="id_editor" width="280"/> - <button label="Mostra segnali luminosi" name="show_beacon_btn" width="150"/> + <line_editor font="SansSerifSmall" name="id_editor"/> + <button label="Mostra segnali luminosi" name="show_beacon_btn"/> <text name="obj_name_text"> Nome dell'oggetto: </text> - <line_editor font="SansSerifSmall" left="90" name="object_name_editor" width="280"/> - <button label="Filtro" name="filter_object_btn" width="150"/> + <line_editor font="SansSerifSmall" name="object_name_editor"/> + <button label="Filtro" name="filter_object_btn"/> <text name="owner_name_text"> Proprietario: </text> diff --git a/indra/newview/skins/default/xui/it/floater_water.xml b/indra/newview/skins/default/xui/it/floater_water.xml index c6ab646fbf..b25f0a6266 100644 --- a/indra/newview/skins/default/xui/it/floater_water.xml +++ b/indra/newview/skins/default/xui/it/floater_water.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Water Floater" title="EDITOR AVANZATO DELL'ACQUA"> - <text name="KeyFramePresetsText" width="224"> + <text name="KeyFramePresetsText" width="245"> Impostazioni predeterminate dell'acqua: </text> - <combo_box left_delta="230" name="WaterPresetsCombo" width="150"/> + <combo_box left_delta="245" name="WaterPresetsCombo" width="150"/> <button label="Nuovo" label_selected="Nuovo" name="WaterNewPreset"/> <button label="Salva" label_selected="Salva" name="WaterSavePreset"/> <button label="Cancella" label_selected="Cancella" name="WaterDeletePreset"/> diff --git a/indra/newview/skins/default/xui/it/floater_windlight_options.xml b/indra/newview/skins/default/xui/it/floater_windlight_options.xml index 1f6f0fab58..6828d05be0 100644 --- a/indra/newview/skins/default/xui/it/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/it/floater_windlight_options.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="WindLight floater" title="EDITOR AVANZATO DEL CIELO"> - <text name="KeyFramePresetsText"> + <text name="KeyFramePresetsText" width="105"> Cieli predefiniti: </text> + <combo_box left_delta="105" name="WLPresetsCombo"/> <button label="Nuovo" label_selected="Nuovo" name="WLNewPreset"/> <button label="Salva" label_selected="Salva" left_delta="72" name="WLSavePreset"/> <button label="Elimina" label_selected="Elimina" left_delta="72" name="WLDeletePreset"/> diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml index 5ed7b23679..f11b2415ee 100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_general.xml @@ -22,7 +22,7 @@ <text name="media_setting_note"> Nota: I residenti possono annullare questa impostazione </text> - <check_box initial_value="false" label="Messa in scala automatica dell'elemento multimediale sulla faccia dell'oggetto" name="auto_scale"/> + <check_box initial_value="false" label="Messa in scala automatica dell'elemento multimediale sulla faccia dell'oggetto" name="auto_scale"/> <text name="size_label"> Dimensioni: </text> diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml index f543ebbbe3..4e22d865fe 100644 --- a/indra/newview/skins/default/xui/nl/floater_about.xml +++ b/indra/newview/skins/default/xui/nl/floater_about.xml @@ -8,7 +8,7 @@ Gemaakt met [COMPILER] versie [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - U bent op [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] gelegen op [HOSTNAME] ([HOSTIP]) + U bent op [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] gelegen op <nolink>[HOSTNAME]</nolink> ([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml index da3142b54e..7e95c4942f 100644 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml @@ -2,7 +2,8 @@ <panel label="Ochrona" name="Media Settings Security"> <check_box initial_value="false" label="Dostęp dozwolony tylko dla wybranych URL" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - Wejścia na stronę WWW, które się nie powiodły są zaznaczone: + Wejścia na stronę WWW, które się nie powiodły są +zaznaczone: </text> <button label="Dodaj" name="whitelist_add"/> <button label="Usuń" name="whitelist_del"/> diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index ac365f1702..a9da2a18af 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -7,7 +7,7 @@ Construído com [COMPILER] versão [COMPILER_VERSION] </floater.string> <floater.string name="AboutPosition"> - Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em [HOSTNAME]</nolink>([HOSTIP]) + Você está em [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] em [REGION] localizado em <nolink>[HOSTNAME]</nolink>([HOSTIP]) [SERVER_VERSION] [[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] </floater.string> diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml index 71a1483dde..666e185819 100644 --- a/indra/newview/skins/default/xui/pt/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="OPÇÕES DE GRADE"> - <spinner label="Unidade da grade (metros)" label_width="122" name="GridResolution" width="180"/> - <spinner label="Ext. da Grade (metros)" label_width="122" name="GridDrawSize" width="180"/> + <spinner label="Unidade da grade (metros)" name="GridResolution"/> + <spinner label="Ext. da Grade (metros)" name="GridDrawSize"/> <check_box label="Encaixar em sub-unidades" name="GridSubUnit"/> <check_box label="Ver corte transversal" name="GridCrossSection"/> <text name="grid_opacity_label" tool_tip="Opacidade da grade"> Opacidade: </text> - <slider label="Opacidade da grade" name="GridOpacity" width="220"/> + <slider label="Opacidade da grade" name="GridOpacity"/> </floater> diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml index 5c5ee3b7a0..258c95cc7d 100644 --- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml @@ -127,25 +127,25 @@ contribuídas para cobrir este lote antes da aquisição se completar. <text name="region_name_label"> Região: </text> - <text left="560" name="region_name_text"> + <text name="region_name_text"> (desconhecido) </text> <text name="region_type_label"> Tipo: </text> - <text left="560" name="region_type_text"> + <text name="region_type_text"> (desconhecido) </text> <text name="estate_name_label"> Propriedade: </text> - <text left="560" name="estate_name_text"> + <text name="estate_name_text"> (desconhecido) </text> - <text name="estate_owner_label" right="565" width="105"> + <text name="estate_owner_label"> Dono da propriedade: </text> - <text left="560" name="estate_owner_text"> + <text name="estate_owner_text"> (desconhecido) </text> <text name="resellable_changeable_label"> @@ -160,11 +160,11 @@ contribuídas para cobrir este lote antes da aquisição se completar. <text name="covenant_text"> Você deve concordar com o Corretor da Propriedade: </text> - <text left="470" name="covenant_timestamp_text"/> + <text name="covenant_timestamp_text"/> <text_editor name="covenant_editor"> Carregando... </text_editor> - <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/> + <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant" left="-330"/> <text name="info_parcel_label"> Lote: </text> diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml index e6d4dc7ed6..014ae0845e 100644 --- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml @@ -55,8 +55,9 @@ <radio_item label="Sim, vender o terreno com os objetos" name="yes"/> </radio_group> <button label="Mostrar objetos" name="show_objects"/> - <text name="nag_message_label"> - LEMBRE-SE: Qualquer transação de compra e venda é irreversível. + <text name="nag_message_label" font="SansSerifSmallBold"> + LEMBRE-SE: Qualquer transação de compra +e venda é irreversível. </text> <button label="Colocar terreno à venda" name="sell_btn"/> <button label="Cancelar" name="cancel_btn"/> diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml index dc3bf73818..c3d5820616 100644 --- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml @@ -39,14 +39,14 @@ <text name="id_text"> ID do Objeto: </text> - <line_editor font="SansSerifSmall" left="140" name="id_editor" width="280"/> + <line_editor font="SansSerifSmall" name="id_editor"/> <button label="Mostrar Avisos" name="show_beacon_btn"/> <text name="obj_name_text"> Nome do objeto: </text> - <line_editor font="SansSerifSmall" left="140" name="object_name_editor" width="280"/> + <line_editor font="SansSerifSmall" name="object_name_editor"/> <button label="Filtro" name="filter_object_btn"/> - <text name="owner_name_text" width="130"> + <text name="owner_name_text"> Proprietário: </text> <line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/> diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml index b4613e0890..b2a06f4ff2 100644 --- a/indra/newview/skins/default/xui/pt/floater_water.xml +++ b/indra/newview/skins/default/xui/pt/floater_water.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Water Floater" title="EDITOR DE ÁGUA AVANÇADO"> - <text name="KeyFramePresetsText" width="154"> + <text name="KeyFramePresetsText" width="175"> Pré-configurações da Água: </text> - <combo_box left_delta="160" name="WaterPresetsCombo" width="150"/> + <combo_box left_delta="175" name="WaterPresetsCombo" width="150"/> <button label="Novo" label_selected="Novo" name="WaterNewPreset"/> <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/> <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/> diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml index 22632a4ef8..ec459bbb26 100644 --- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="WindLight floater" title="EDITOR DE CÉU AVANÇADO"> - <text name="KeyFramePresetsText" width="130"> + <text name="KeyFramePresetsText" width="140"> Pré-definições de Céu: </text> - <combo_box left_delta="130" name="WLPresetsCombo"/> + <combo_box left_delta="140" name="WLPresetsCombo"/> <button label="Novo" label_selected="Novo" name="WLNewPreset"/> <button label="Salvar" label_selected="Salvar" left_delta="72" name="WLSavePreset"/> <button label="Deletar" label_selected="Deletar" left_delta="72" name="WLDeletePreset"/> diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml index 646969946c..e38c44d8fe 100644 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_security.xml @@ -2,7 +2,8 @@ <panel label="Segurança" name="Media Settings Security"> <check_box initial_value="false" label="Acesso permitido a URLs com padrão específico" name="whitelist_enable"/> <text name="home_url_fails_some_items_in_whitelist"> - URLs com falha de acesso na página inicial são indicados com um: + URLs com falha de acesso na página inicial são +indicados com um: </text> <button label="Adicionar" name="whitelist_add"/> <button label="Excluir" name="whitelist_del"/> |