diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
7 files changed, 34 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml index b5a5ff5342..9c0af7d9ba 100644 --- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml +++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml @@ -199,7 +199,7 @@ height="10" layout="topleft" left="10" - name="Cache location" + name="Model types" width="320"> Second Life supports COLLADA (.dae) files </text> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7b64c1d066..3ed8c30ca8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2665,9 +2665,18 @@ Display settings have been set to safe levels because you have specified the -sa <notification icon="alertmodal.tga" - name="DisplaySetToRecommended" + name="DisplaySetToRecommendedGPUChange" type="alertmodal"> -Display settings have been set to recommended levels based on your system configuration. +Display settings have been set to recommended levels because your graphics card changed +from '[LAST_GPU]' +to '[THIS_GPU]' + </notification> + + <notification + icon="alertmodal.tga" + name="DisplaySetToRecommendedFeatureChange" + type="alertmodal"> +Display settings have been set to recommended levels because of a change to the rendering subsystem. </notification> <notification diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index eff674c628..d4da55e32e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -272,6 +272,7 @@ top="0" width="313"> <text_editor + font="Monospace" enabled="false" type="string" follows="all" 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 ea09286592..52be805260 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -307,7 +307,7 @@ name="Ukrainian" value="uk" /> <combo_box.item - label="中文 (简体) (Chinese)" + label="中文 (正體) (Chinese)" name="Chinese" value="zh" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index 9c718fdb87..0a1c0872e9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -67,11 +67,6 @@ value="it" /> <combo_box.item enabled="true" - label="Nederlands (Dutch) - Beta" - name="Dutch" - value="nl" /> - <combo_box.item - enabled="true" label="Polski (Polish) - Beta" name="Polish" value="pl" /> @@ -82,9 +77,24 @@ value="pt" /> <combo_box.item enabled="true" + label="Русский (Russian) - Beta" + name="Russian" + value="ru" /> + <combo_box.item + enabled="true" + label="Türkçe (Turkish) - Beta" + name="Turkish" + value="tr" /> + <combo_box.item + enabled="true" label="日本語 (Japanese) - Beta" name="(Japanese)" value="ja" /> + <combo_box.item + enabled="true" + label="正體 (Traditional Chinese) - Beta" + name="Traditional Chinese" + value="zh" /> </combo_box> <text font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index b321e0162e..3239c4e531 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -38,20 +38,20 @@ left="-370" width="160" top="1" - follows="right|top" + follows="right|top" name="balance_bg"> <text halign="center" font="SansSerifSmall" follows="all" height="18" - left="0" + left="0" name="balance" tool_tip="Click to refresh your L$ balance" v_pad="4" top="0" - wrap="false" - value="L$20" + wrap="false" + value="L$20" width="40" /> <button halign="center" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5e5bc0bde0..084b8f3074 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3709,7 +3709,7 @@ Try enclosing path to the editor with double quotes. <string name="Toolbar_Left_Tooltip" >currently in your left toolbar</string> <string name="Toolbar_Right_Tooltip" >currently in your right toolbar</string> - <!-- Mesh UI terms --> + <!-- Mesh UI terms --> <string name="Retain%">Retain%</string> <string name="Detail">Detail</string> <string name="Better Detail">Better Detail</string> |