diff options
| author | James Cook <james@lindenlab.com> | 2009-08-28 16:51:34 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-08-28 16:51:34 +0000 |
| commit | eda3831041a176ae11116bd0c33077d121dc62e2 (patch) | |
| tree | de4f3e33490cd7f18853296bc06be8c211bb0a47 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 9e2cb2f4a00a6acc48738f9df788ad5adfc7d62a (diff) | |
skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
CHANGES:
minor layout change: "start location" and "remember password" weren't on the same horizontal line.
DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off
I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization.
forgot to check this in earlier...fixes off-by-one crash when editing a script
DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...' VIEWER-SIDE text change. This does not change the actual message coming from the server
EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james
DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james
EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james
EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed
EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed
Changes to notifications.xml text to fit Style Guide and some renamed menu items
EXT-147 Ongoing revisions to new gestures layout.
DEV-35097 catch more instances of 'SLURL' and make them 'SLurl'
Removed Info Displays and Buy Currency Test from top menus.
Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots.
De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow.
Commented about use of childSetCommitCallback(). De-inlined LocalizedString paramblock constructor.
eliminated memory leak
I18N: more things are missing a name= parameter, breaks localization.
EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights.
fix for llmessage_test crash in Windows Release builds
DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too
DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code
potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules
DEV-36809 Click target for slider handles is too small -- reviewed by steve
EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard
DEV-35938 Horizontal scroll thumb too high -- to be reviewed
EXT-386 clean up warnings - initCommitCallback...
Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp. Reviewed with Leyla.
Login menu > Debug > Avatar Inspector shows test avatar inspector. Also added to main menu > Debug > XUI > Avatar Inspector. Changed text/layout of dummy inspector. Not reviewed.
Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 216627879e..98c9ec868a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1041,7 +1041,7 @@ Do you wish to visit [_URL] for more information? type="alertmodal"> Your system contains a graphics card that is unknown to [APP_NAME] at this time. This is often the case with new hardware that hasn't been tested yet with [APP_NAME]. [APP_NAME] will most likely run properly, but you may need to adjust your graphics settings to something more appropriate. -(Edit menu > Preferences > Graphics). +(Me > Preferences > Graphics). <form name="form"> <ignore name="ignore" text="My graphics card could not be identified"/> @@ -1680,7 +1680,7 @@ No Group selected. type="alertmodal"> Unable to deed land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1762,7 +1762,7 @@ Parcels you own appear in green. Unable to abandon land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1836,7 +1836,7 @@ Divide land? Unable to divide land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1846,7 +1846,7 @@ Please use Tools -> Report Bug to report this. Unable to join land: Cannot find the region this land is in. -Please use Tools -> Report Bug to report this. +Please use Help > Report Bug to report this. </notification> <notification @@ -1963,8 +1963,7 @@ Unable to save '[NAME]' to wearable file. You will need to free up so Unable to save [NAME] to central asset store. This is usually a temporary failure. Please customize and save the wearable again in a few minutes. -If this problem persists, please click on the 'Tools > Report Bug' pull down menu -and provide details about your network setup. +If this problem persists, please click on Help > Report Bug and provide details about your network setup. </notification> <notification @@ -2629,9 +2628,9 @@ This update is not required, but we suggest you install it to improve performanc icon="alertmodal.tga" name="DownloadLinuxMandatory" type="alertmodal"> -A new version of [SECOND_LIFE] is available. +A new version of [APP_NAME] is available. [MESSAGE] -You must download this update to use [SECOND_LIFE]. +You must download this update to use [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Quit" @@ -2642,7 +2641,7 @@ You must download this update to use [SECOND_LIFE]. icon="alertmodal.tga" name="DownloadLinux" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. <usetemplate @@ -2655,7 +2654,7 @@ This update is not required, but we suggest you install it to improve performanc icon="alertmodal.tga" name="DownloadLinuxReleaseForDownload" type="alertmodal"> -An updated version of [SECOND_LIFE] is available. +An updated version of [APP_NAME] is available. [MESSAGE] This update is not required, but we suggest you install it to improve performance and stability. <usetemplate @@ -3333,7 +3332,7 @@ You are not allowed in that region due to your maturity Rating. type="alertmodal"> You are not allowed in that Region due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <form name="form"> <button index="0" @@ -3390,7 +3389,7 @@ You cannot claim this land due to your maturity Rating. type="alertmodal"> You cannot claim this land due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <usetemplate name="okcancelignore" yestext="Change Preference" @@ -3440,7 +3439,7 @@ You cannot buy this land due to your maturity Rating. type="alertmodal"> You cannot buy this land due to your maturity Rating preference. -You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit > Preferences... > General. +You can click 'Change Preference' to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Me > Preferences > General. <usetemplate name="okcancelignore" yestext="Change Preference" @@ -3769,7 +3768,7 @@ Default: off label="Top Colliders" name="HelpRegionTopColliders" type="alertmodal"> -Show a list of objects experiencing the greatest number of potential object-object collisions. These objects can slow performance. Select View > Statistics Bar and look under Simulator > Time > Sim Time (Physics) to see if more than 20 ms is being spent in physics. +Show a list of objects experiencing the greatest number of potential object-object collisions. These objects can slow performance. Select Advanced > Performance Tools > Statistics Bar and look under Simulator > Time > Physics Time to see if more than 20 ms is being spent in physics. </notification> <notification @@ -3778,7 +3777,7 @@ Show a list of objects experiencing the greatest number of potential object-obje name="HelpRegionTopScripts" type="alertmodal"> Show a list of objects spending the most time running LSL scripts. These objects can slow performance. -Select View > Statistics Bar and look under Simulator > Time > Script Time to see if more than 25 ms is being spent in scripts. +Select Advanced > Performance Tools > Statistics Bar and look under Simulator > Time > Script Time to see if more than 25 ms is being spent in scripts. </notification> <notification @@ -4437,7 +4436,7 @@ Are you sure you want to permanently delete the contents of your Trash? icon="alertmodal.tga" name="ConfirmClearBrowserCache" type="alertmodal"> -Delete your travel, web, and search history? +Are you sure you want to delete your travel, web, and search history? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -6561,5 +6560,12 @@ Yes <global name="PermNo"> No </global> +<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed + whenever the server string changes --> + <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> +If you own a piece of land, you can make it your home location. +Otherwise, you can look at the Map and find places marked "Infohub". + </global> + </notifications> |