diff options
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us/alerts.xml')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/alerts.xml | 53 |
1 files changed, 15 insertions, 38 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml index 75ab238..8bbdc3d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml | |||
@@ -387,22 +387,22 @@ Go to the Second Life web site for more information on partnering? | |||
387 | </alert> | 387 | </alert> |
388 | <alert modal="true" name="ClickWebProfileHelpAvatar"> | 388 | <alert modal="true" name="ClickWebProfileHelpAvatar"> |
389 | <message name="message"> | 389 | <message name="message"> |
390 | If this resident has set a web profile URL then you can: | 390 | If this Resident has set a web profile URL then you can: |
391 | * Click "Load" to load the page with the embedded web browser. | 391 | * Click 'Load' to see the page in this Web tab. |
392 | * Click Load->"Open in external browser" to view externally. | 392 | * Click Load > 'In external browser' to view the page in your default web browser. |
393 | * Click Load->"Home URL" to return to resident's web profile if you've navigated away. | 393 | * Click Load > 'Home URL' to return to this Resident's web profile if you've navigated away. |
394 | 394 | ||
395 | When viewing your own profile you can enter any URL as your web profile and click OK to set it. | 395 | When viewing your own profile, you can enter any URL as your web profile and click OK to set it. |
396 | Other residents can visit the URL you set when they view your profile. | 396 | Other residents can visit the URL you set when they look at your profile. |
397 | </message> | 397 | </message> |
398 | </alert> | 398 | </alert> |
399 | <alert modal="true" name="ClickWebProfileNoWebHelpAvatar"> | 399 | <alert modal="true" name="ClickWebProfileNoWebHelpAvatar"> |
400 | <message name="message"> | 400 | <message name="message"> |
401 | If this resident has a web profile URL set then you can: | 401 | If this resident has set a web profile URL then you can: |
402 | * Click Open to view externally in your default web browser. | 402 | * Click Open to view the page in your default web browser. |
403 | 403 | ||
404 | When viewing your profile you can enter any URL as your Web Profile. | 404 | When viewing your own profile, you can enter any URL as your web profile and click OK to set it. |
405 | Residents can visit the URL you specify when they view your profile. | 405 | Other residents can visit the URL you set when they look at your profile. |
406 | </message> | 406 | </message> |
407 | </alert> | 407 | </alert> |
408 | <alert modal="true" name="ReputationMinGreaterThanMax"> | 408 | <alert modal="true" name="ReputationMinGreaterThanMax"> |
@@ -3017,20 +3017,6 @@ objects will be returned to their previous owners. | |||
3017 | Cancel | 3017 | Cancel |
3018 | </option> | 3018 | </option> |
3019 | </alert> | 3019 | </alert> |
3020 | <alert modal="true" name="ViewReleaseNotes"> | ||
3021 | <message name="message"> | ||
3022 | View the Second Life release notes? | ||
3023 | </message> | ||
3024 | <ignore name="ignore"> | ||
3025 | When viewing the release notes | ||
3026 | </ignore> | ||
3027 | <option name="Gotopage"> | ||
3028 | OK | ||
3029 | </option> | ||
3030 | <option name="Cancel"> | ||
3031 | Cancel | ||
3032 | </option> | ||
3033 | </alert> | ||
3034 | <alert name="GroupLeaveConfirmOfficer"> | 3020 | <alert name="GroupLeaveConfirmOfficer"> |
3035 | <message name="message"> | 3021 | <message name="message"> |
3036 | You are currently an officer of the group [GROUP]. | 3022 | You are currently an officer of the group [GROUP]. |
@@ -4387,13 +4373,13 @@ Entering an accurate description helps us file and process bug reports. | |||
4387 | <message name="message"> | 4373 | <message name="message"> |
4388 | Dear Resident, | 4374 | Dear Resident, |
4389 | 4375 | ||
4390 | If you are reporting intellectual property infringement, please make sure you are reporting it correctly: | 4376 | You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly: |
4391 | 4377 | ||
4392 | (1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world. | 4378 | (1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world. |
4393 | 4379 | ||
4394 | (2) The DMCA or Content Removal Process. To request removal of content from Second Life, you must submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php. | 4380 | (2) The DMCA or Content Removal Process. To request removal of content from Second Life, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php. |
4395 | 4381 | ||
4396 | If you still wish to continue with the abuse process, please close this window and finish submitting your report. | 4382 | If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category 'CopyBot or Permissions Exploit'. |
4397 | 4383 | ||
4398 | Thank you, | 4384 | Thank you, |
4399 | 4385 | ||
@@ -4869,16 +4855,7 @@ with the the D slider. | |||
4869 | </alert> | 4855 | </alert> |
4870 | <alert modal="true" name="ChatterBoxSessionStartError"> | 4856 | <alert modal="true" name="ChatterBoxSessionStartError"> |
4871 | <message name="message"> | 4857 | <message name="message"> |
4872 | Error starting a new chat session with [RECIPIENT]. | 4858 | Unable to start a new chat session with [RECIPIENT]. |
4873 | [REASON] | ||
4874 | </message> | ||
4875 | <option default="true" name="OK"> | ||
4876 | OK | ||
4877 | </option> | ||
4878 | </alert> | ||
4879 | <alert modal="true" name="ChatterBoxSessionStartNotVerified"> | ||
4880 | <message name="message"> | ||
4881 | Error starting a new chat session with [RECIPIENT]. | ||
4882 | [REASON] | 4859 | [REASON] |
4883 | </message> | 4860 | </message> |
4884 | <option default="true" name="OK"> | 4861 | <option default="true" name="OK"> |
@@ -4887,7 +4864,7 @@ with the the D slider. | |||
4887 | </alert> | 4864 | </alert> |
4888 | <alert modal="true" name="ChatterBoxSessionEventError"> | 4865 | <alert modal="true" name="ChatterBoxSessionEventError"> |
4889 | <message name="message"> | 4866 | <message name="message"> |
4890 | Error [EVENT] [RECIPIENT]. | 4867 | [EVENT] |
4891 | [REASON] | 4868 | [REASON] |
4892 | </message> | 4869 | </message> |
4893 | <option default="true" name="OK"> | 4870 | <option default="true" name="OK"> |