diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index b5d8ac44bc..165d47c931 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1835,7 +1835,7 @@ Prøv venligst om lidt igen.
Der er ingen regler for dette estate. Land på dette estate sælges af estate ejeren, ikke af Linden Lab. Kontakt venligst estate ejeren for detaljer om salg.
-
+
diff --git a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
index c924716523..cc14ce640d 100644
--- a/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/de/floater_delete_env_preset.xml
@@ -4,7 +4,7 @@
Wasser-Voreinstellung löschen
- Hilmmel-Voreinstellung löschen
+ Himmel-Voreinstellung löschen
Tageszyklus löschen
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index e1c9ad0e5c..5cfec6446b 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1882,7 +1882,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
Für diesen Grundbesitz liegt kein Vertrag vor. Das Land auf diesem Grundbesitz wird vom Grundbesitzer und nicht von Linden Lab verkauft. Für Informationen zum Verkauf setzen Sie sich bitte mit dem Grundbesitzer in Verbindung.
-
+
diff --git a/indra/newview/skins/default/xui/en/floater_build_options.xml b/indra/newview/skins/default/xui/en/floater_build_options.xml
index c247a12e7a..afb7917043 100644
--- a/indra/newview/skins/default/xui/en/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/en/floater_build_options.xml
@@ -37,7 +37,7 @@
layout="topleft"
left="10"
tool_tip="Grid opacity"
- name="grid_opacity_label"
+ name="grid_mode_label"
top_pad="30"
width="123">
Mode
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 ab81a86720..22cc058e46 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_land.xml
@@ -208,7 +208,7 @@ supports [AMOUNT2] objects
name="region_name_text"
top_delta="0"
use_ellipses="true"
- width="155">
+ width="150">
(unknown)
+ use_ellipses="true"
+ width="170">
(unknown)
+ use_ellipses="true"
+ width="170">
(unknown)
+ use_ellipses="true"
+ width="170">
(unknown)
@@ -163,7 +163,7 @@
height="10"
layout="topleft"
left_delta="0"
- name="Cache location"
+ name="choose_model_file_label"
width="320">
Choose model file to upload
@@ -199,7 +199,7 @@
height="10"
layout="topleft"
left="10"
- name="Cache location"
+ name="support_collada_text"
width="320">
Second Life supports COLLADA (.dae) files
@@ -221,6 +221,7 @@
width="130"
height="14"
left_delta="0"
+ name="dimensions_label"
text_color="White"
word_wrap="true">
Dimensions (meters):
@@ -287,7 +288,7 @@
We have optimized the model for performance. Adjust it further if you wish.
@@ -322,11 +323,12 @@
left="15"
height="270"
width="505"
- name="content"
+ name="optimize_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
- Performance
- Faster rendering
+ Performance
+ Faster rendering
Less detail
Lower prim weight
- Accuracy
- Slower rendering
+ Accuracy
+ Slower rendering
More detail
Higher prim weight
@@ -424,21 +426,24 @@ Higher prim weight
top="130"
width="290" />
'
'
top_pad="15"
width="150">
-
+
Geometry preview
-
+
High detail
-
+
Medium detail
-
+
Low detail
-
+
Lowest detail
@@ -497,7 +502,7 @@ Higher prim weight
height="50"
font="SansSerifSmall"
layout="topleft"
- name="description"
+ name="physics_hint"
word_wrap="true"
left_delta="5">
We will create a shape for the outer hull of the model. Adjust the shape's detail level as needed for the intended purpose of your model.
@@ -531,16 +536,16 @@ Higher prim weight
left="15"
height="270"
width="505"
- name="content"
+ name="physics_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
- Performance
- Faster rendering
+ Performance
+ Faster rendering
Less detail
Lower prim weight
- Accuracy
- Slower rendering
+ Accuracy
+ Slower rendering
More detail
Higher prim weight
@@ -558,15 +563,15 @@ Higher prim weight
show_text="false"
top="25"
width="22" />
- Examples:
+ Examples:
Moving objects
Flying objects
Vehicles
- Examples:
+ Examples:
Small static objects
Less detailed objects
Simple furniture
- Examples:
+ Examples:
Static objects
Detailed objects
Buildings
@@ -592,7 +597,7 @@ Buildings
visible="false"
width="150">
-
+
Physics preview
-
+
High detail
-
+
Medium detail
-
+
Low detail
-
+
Lowest detail
@@ -635,7 +640,7 @@ Buildings
left="15"
height="310"
width="505"
- name="content"
+ name="review_content_panel"
bg_opaque_color="DkGray2"
background_visible="true"
background_opaque="true">
@@ -706,7 +711,7 @@ Buildings
[DESC]:
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index 114b3a72e0..6d90f654d1 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -14,5 +14,5 @@
title=""
initial_mime_type="text/html"
width="780"
+ tab_stop="true"
filename="floater_web_content.xml"/>
- tab_stop="true"
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 9bf9cc6c77..2c754cd8d0 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -25,6 +25,46 @@
(New!)
+
+
+ Arena
+ Beast
+ Buff
+ Buzz
+ Camille
+ Creepy
+ CreepyBot
+ Cyber
+ DeepBot
+ Demon
+ Flirty
+ Foxy
+ Halloween_2010_Bonus
+ Helium
+ Husky
+ Intercom
+ Macho
+ Micro
+ Mini
+ Nano
+ Nightmare
+ PopBot
+ Rachel
+ Radio
+ Robot
+ Roxanne
+ Sabrina
+ Samantha
+ Sexy
+ Shorty
+ Sneaky
+ Stallion
+ Sultry
+ Thunder
+ Vixen
+ WhinyBot
+
+
Non esiste alcun regolamento per questa proprietà. Il terreno di questa proprietà è messo in vendita dal proprietario, non dalla Linden Lab. Contatta il proprietario del terreno per i dettagli della vendita.
-
+
diff --git a/indra/newview/skins/default/xui/nl/strings.xml b/indra/newview/skins/default/xui/nl/strings.xml
index e9db237e82..ca6b8eb521 100644
--- a/indra/newview/skins/default/xui/nl/strings.xml
+++ b/indra/newview/skins/default/xui/nl/strings.xml
@@ -1300,9 +1300,7 @@
There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.
-
- Laatst bewerkt:
-
+
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index e93da48dc0..6a8309cca5 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -1695,7 +1695,7 @@
Brak umowy dla tego majątku. Każda posiadłość w tym majątku została sprzedana przez właściciela majątku nie Linden Lab. Skontaktuj się z właścicielem majątku w celu uzuskania szczegółów sprzedaży.
-
+
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 3b3b7041d7..73b954d79d 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1810,7 +1810,7 @@ Titulares de contas gratuitas não poderão acessar o Second Life para acomodar
Não foi definido um contrato para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda.
-
+
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 28b8cce5b2..53f997017d 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -1728,7 +1728,7 @@
There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.
-
+