diff options
26 files changed, 34 insertions, 106 deletions
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index 9490f94a42..ed23a9a706 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature og Adult"/> <combo_box.item name="Desired_Mature" label="PG and Mature"/> - <combo_box.item name="Desired_PG" label="PG only"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - PG only + PG </text> <text name="start_location_textbox"> Start lokation: diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index 7039f8fd6c..5d0799cab9 100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Estate" name="Estate"> +<panel label="Estate" name="Estate"> <text name="estate_help_text"> Ændringer i dette afsnit vil påvirke alle regioner i dette estate. @@ -70,6 +68,4 @@ regioner i dette estate. <button label="?" name="ban_resident_help" /> <button label="Fjern..." name="remove_banned_avatar_btn" /> <button label="Tilføj..." name="add_banned_avatar_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_region_texture.xml b/indra/newview/skins/default/xui/da/panel_region_texture.xml index a7477d3a65..65c4743da0 100644 --- a/indra/newview/skins/default/xui/da/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/da/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Terræn textures" name="Textures"> +<panel label="Terræn textures" name="Textures"> <text name="region_text_lbl"> Region: </text> @@ -56,6 +54,4 @@ og HØJ værdien er MIMIMUM højde for texture nummer 4. </text> <button label="Gem" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index bfd4148895..8d9ebe423b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature und Adult"/> <combo_box.item name="Desired_Mature" label="PG und Mature"/> - <combo_box.item name="Desired_PG" label="Nur PG"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - Nur PG + PG </text> <text name="start_location_textbox"> Startposition: diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml index 790555296d..ddc5941da6 100644 --- a/indra/newview/skins/default/xui/de/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Grundstück" name="Estate"> +<panel label="Grundstück" name="Estate"> <text name="estate_help_text"> Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus. @@ -76,6 +74,4 @@ auf alle Regionen auf dem Grundstück aus. <button label="Entfernen..." name="remove_banned_avatar_btn" /> <button label="Nachricht an Grundstück senden..." name="message_estate_btn" /> <button label="Benutzer von Grundstück werfen..." name="kick_user_from_estate_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml index 456feb0371..df936ff643 100644 --- a/indra/newview/skins/default/xui/de/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/de/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Bodentexturen" name="Textures"> +<panel label="Bodentexturen" name="Textures"> <text name="region_text_lbl"> Region: </text> @@ -56,6 +54,4 @@ und der OBERE WERT die MINIMALE Höhe von Textur 4. </text> <button label="Übernehmen" name="apply_btn" /> - </panel> - </scroll_container> </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 2f2aab5448..2b813a18bf 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="'PG', 'Mature' y 'Adult'"/> <combo_box.item name="Desired_Mature" label="'PG' y 'Mature'"/> - <combo_box.item name="Desired_PG" label="sólo 'PG'"/> + <combo_box.item name="Desired_PG" label="'PG'"/> </combo_box> <text name="maturity_desired_textbox"> - sólo 'PG' + 'PG' </text> <text name="start_location_textbox"> Posición inicial: diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml index 653dc32a24..f16ec89cb0 100644 --- a/indra/newview/skins/default/xui/es/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Estado" name="Estate"> +<panel label="Estado" name="Estate"> <text name="estate_help_text"> Los cambios en las configuraciones de esta pestaña afectarán a todas las regiones del estado. @@ -68,6 +66,4 @@ pestaña afectarán a todas las regiones del estado. <button label="?" name="ban_resident_help" right="476"/> <button label="Quitar..." name="remove_banned_avatar_btn"/> <button label="Añadir..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml index 879fb87be2..5540358f97 100644 --- a/indra/newview/skins/default/xui/es/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Texturas del terreno" name="Textures"> +<panel label="Texturas del terreno" name="Textures"> <text name="region_text_lbl"> Región: </text> @@ -56,6 +54,4 @@ y el valor ALTA es la altura MÍNIMA de la textura #4. </text> <button label="Aplicar" name="apply_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index f3a1a0c0e2..1ed3cafbc3 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -34,10 +34,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature et Adult"/> <combo_box.item name="Desired_Mature" label="PG et Mature"/> - <combo_box.item name="Desired_PG" label="PG uniquement"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - PG uniquement + PG </text> <text name="start_location_textbox"> Lieu de départ : diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml index b592d29711..425f273790 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Domaine" name="Estate"> +<panel label="Domaine" name="Estate"> <text name="estate_help_text" bottom="-34"> Les changements apportés aux paramètres de cet onglet auront des répercussions sur @@ -77,6 +75,4 @@ toutes les régions du domaine. <button label="Supprimer..." name="remove_banned_avatar_btn"/> <button label="Envoyer un message au domaine..." name="message_estate_btn"/> <button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml index da800dc6bd..d312646788 100644 --- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Textures du sol" name="Textures"> +<panel label="Textures du sol" name="Textures"> <text name="region_text_lbl"> Région : </text> @@ -71,6 +69,4 @@ et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4. </text> <button label="Appliquer" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index 4c6a7d8eb3..e6cd6e67b2 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature e Adult"/> <combo_box.item name="Desired_Mature" label="PG e Mature"/> - <combo_box.item name="Desired_PG" label="solo PG"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - solo PG + PG </text> <text name="start_location_textbox"> Punto di partenza: diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml index 345e8c532c..5b95b7378b 100644 --- a/indra/newview/skins/default/xui/it/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Proprietà immobiliari" name="Estate"> +<panel label="Proprietà immobiliari" name="Estate"> <text name="estate_help_text"> I cambiamenti alle impostazioni in questa finestra avranno effetto su tutte le regioni della proprietà. @@ -68,6 +66,4 @@ avranno effetto su tutte le regioni della proprietà. <button label="?" name="ban_resident_help"/> <button label="Rimuovi..." name="remove_banned_avatar_btn"/> <button label="Aggiungi..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml index 976a93abb8..254700e9f1 100644 --- a/indra/newview/skins/default/xui/it/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/it/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Texture del terreno" name="Textures"> +<panel label="Texture del terreno" name="Textures"> <text name="region_text_lbl"> Regione: </text> @@ -56,6 +54,4 @@ Texture #1, e il valore più ALTO all'altezza MINIMA della Texture #4. </text> <button label="Applica" name="apply_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index 6c3ad93d4f..584fcd6164 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG、Mature、Adult"/> <combo_box.item name="Desired_Mature" label="PGとMature"/> - <combo_box.item name="Desired_PG" label="PG限定"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - PG限定 + PG </text> <text name="start_location_textbox"> ログイン位置： diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml index ce4f3c19b2..186820f00a 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="不動産" name="Estate"> +<panel label="不動産" name="Estate"> <text name="estate_help_text"> このタブの設定を変更するとこの不動産内 の全ての地域に影響を与えます。 @@ -77,6 +75,4 @@ <button label="メッセージを不動産へ送信..." name="message_estate_btn" /> <button label="土地からユーザーを追い出す..." name="kick_user_from_estate_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml index 19326c82b6..6527f0fbe6 100644 --- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/ja/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="地面テクスチャー" name="Textures"> +<panel label="地面テクスチャー" name="Textures"> <text name="region_text_lbl"> 地域： </text> @@ -56,6 +54,4 @@ そして「高」の値はテクスチャー#4の高さの下限となります。 </text> <button label="適用" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/nl/panel_region_estate.xml b/indra/newview/skins/default/xui/nl/panel_region_estate.xml index 3a8096ce5f..7a5fa801d9 100644 --- a/indra/newview/skins/default/xui/nl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/nl/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Estate" name="Estate"> +<panel label="Estate" name="Estate"> <text name="estate_help_text"> Wijzigingen van instellingen op dit tabblad zullen alle regio's in de estate beïnvloeden. @@ -69,6 +67,4 @@ zullen alle regio's in de estate beïnvloeden. <button label="?" name="ban_resident_help"/> <button label="Verwijderen..." name="remove_banned_avatar_btn"/> <button label="Toevoegen..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/nl/panel_region_texture.xml b/indra/newview/skins/default/xui/nl/panel_region_texture.xml index da40926ce2..ff10e20b7c 100644 --- a/indra/newview/skins/default/xui/nl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/nl/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Grond texturen" name="Textures"> +<panel label="Grond texturen" name="Textures"> <text name="region_text_lbl"> Regio: </text> @@ -56,6 +54,4 @@ en de HIGH waarde is de MINIMUM hoogte van textuur #4. </text> <button label="Toepassen" name="apply_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml index a7654ef2ff..97b4975f29 100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml @@ -34,10 +34,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="'PG', 'Mature' oraz 'Adult'"/> <combo_box.item name="Desired_Mature" label="'PG' i 'Mature'"/> - <combo_box.item name="Desired_PG" label="tylko 'PG'"/> + <combo_box.item name="Desired_PG" label="'PG'"/> </combo_box> <text name="maturity_desired_textbox"> - tylko 'PG' + 'PG' </text> <text name="start_location_textbox"> Miejsce Startu: diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml index 4447de517b..4275f3f647 100755 --- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Majątek" name="Estate"> +<panel label="Majątek" name="Estate"> <text name="estate_help_text"> Zmiany ustawień na tej zakładce odnoszą się do wszystkich Regionów w tym Majątku. @@ -73,6 +71,4 @@ do wszystkich Regionów w tym Majątku. <name_list name="banned_avatar_name_list"/> <button label="Usuń..." name="remove_banned_avatar_btn"/> <button label="Dodaj..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_texture.xml b/indra/newview/skins/default/xui/pl/panel_region_texture.xml index ac43f0b2cc..d24579fc75 100755 --- a/indra/newview/skins/default/xui/pl/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Tekstury Gruntu" name="Textures"> +<panel label="Tekstury Gruntu" name="Textures"> <text name="region_text_lbl"> Region: </text> @@ -56,6 +54,4 @@ a wartość GÓRA to MINIMALNY poziom dla tekstury #4. </text> <button label="Zastosuj" name="apply_btn" /> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index e50713c0c8..8bde39545c 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -33,10 +33,10 @@ <combo_box name="maturity_desired_combobox"> <combo_box.item name="Desired_Adult" label="PG, Mature e Adult"/> <combo_box.item name="Desired_Mature" label="PG e Mature"/> - <combo_box.item name="Desired_PG" label="apenas PG"/> + <combo_box.item name="Desired_PG" label="PG"/> </combo_box> <text name="maturity_desired_textbox"> - apenas PG + PG </text> <text name="start_location_textbox"> Posição Inicial: diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml index e62ba85763..f43402be15 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel name="EstateWrapper"> - <scroll_container name="container1"> - <panel label="Propriedade" name="Estate"> +<panel label="Propriedade" name="Estate"> <text name="estate_help_text"> Mudanças nas definições nesta guia irão afetar todas as regiões desta propriedade. @@ -68,6 +66,4 @@ todas as regiões desta propriedade. <button label="?" name="ban_resident_help"/> <button label="Remover..." name="remove_banned_avatar_btn"/> <button label="Adicionar..." name="add_banned_avatar_btn"/> - </panel> - </scroll_container> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml index 2fdba79807..4787b59a8d 100644 --- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml +++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="TextureWrapper"> - <scroll_container name="container1"> - <panel label="Texturas de Chão" name="Textures"> +<panel label="Texturas de Chão" name="Textures"> <text name="region_text_lbl"> Região: </text> @@ -56,6 +54,4 @@ e o valor Alto é a altura Mínima da Textura #4. </text> <button label="Aplicar" name="apply_btn" /> - </panel> - </scroll_container> </panel> |