diff options
| author | eli <none@none> | 2011-10-20 18:13:40 -0700 |
|---|---|---|
| committer | eli <none@none> | 2011-10-20 18:13:40 -0700 |
| commit | b85be31eca5e480e06364ab54a0db630798011a2 (patch) | |
| tree | d4bf550382f9f1739b5cfb6c026873f55615114a /indra | |
| parent | 6082349a2151c66c8bd602d57eb7921521a94271 (diff) | |
sync with viewer-development
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/installers/windows/lang_ru.nsi | bin | 7540 -> 7542 bytes | |||
| -rw-r--r-- | indra/newview/installers/windows/lang_tr.nsi | bin | 7540 -> 7542 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_land_money.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi Binary files differindex af288c0bfb..23a0252200 100644 --- a/indra/newview/installers/windows/lang_ru.nsi +++ b/indra/newview/installers/windows/lang_ru.nsi diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi Binary files differindex a4efc95475..e5468c6e9d 100644 --- a/indra/newview/installers/windows/lang_tr.nsi +++ b/indra/newview/installers/windows/lang_tr.nsi diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f510b3c5ba..6720d8131e 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/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 78e10d207c..db7c07f2f8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2269,7 +2269,7 @@ Returns a string with the requested data about the region <string name="NextStipendDay" value="The next stipend day is " /> <string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string> <string name="GroupIndividualShare" value=" Group Individual Share" /> - <string name="GroupColumn" value=" Group" /> + <string name="GroupColumn" value=" Group" /> <string name="Balance">Balance</string> <string name="Credits">Credits</string> <string name="Debits">Debits</string> |