diff options
Diffstat (limited to 'linden/indra/newview/skins/xui/en-us')
11 files changed, 331 insertions, 290 deletions
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml index 192fcdb..fdb84b9 100644 --- a/linden/indra/newview/skins/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/xui/en-us/alerts.xml | |||
@@ -51,6 +51,7 @@ | |||
51 | <message name="message"> | 51 | <message name="message"> |
52 | Unable to connect to [SECOND_LIFE]. | 52 | Unable to connect to [SECOND_LIFE]. |
53 | The system may be down. | 53 | The system may be down. |
54 | |||
54 | Please try again in a few minutes, or click Help | 55 | Please try again in a few minutes, or click Help |
55 | for advice and a link to the system status web page. | 56 | for advice and a link to the system status web page. |
56 | </message> | 57 | </message> |
@@ -115,7 +116,6 @@ Enter a brief description of the group's purpose. | |||
115 | <alert modal="true" name="CharacterSnapshotSaved"> | 116 | <alert modal="true" name="CharacterSnapshotSaved"> |
116 | <message name="message"> | 117 | <message name="message"> |
117 | A snapshot of your character has been saved. | 118 | A snapshot of your character has been saved. |
118 | |||
119 | Visit the Webpage Studio exhibit to see it. | 119 | Visit the Webpage Studio exhibit to see it. |
120 | </message> | 120 | </message> |
121 | </alert> | 121 | </alert> |
@@ -201,7 +201,6 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]? | |||
201 | <alert modal="true" name="CreateGroupCanAfford"> | 201 | <alert modal="true" name="CreateGroupCanAfford"> |
202 | <message name="message"> | 202 | <message name="message"> |
203 | Creating a group costs L$[COST]. | 203 | Creating a group costs L$[COST]. |
204 | |||
205 | To maintain the group for more than three days, | 204 | To maintain the group for more than three days, |
206 | you must reach a total of two or more members. | 205 | you must reach a total of two or more members. |
207 | 206 | ||
@@ -307,8 +306,8 @@ Add this Ability to '[ROLE_NAME]'? | |||
307 | Selecting the "Publish on the Web" option allows us to publish | 306 | Selecting the "Publish on the Web" option allows us to publish |
308 | the group name, insignia, charter, titles, and founder on the | 307 | the group name, insignia, charter, titles, and founder on the |
309 | [SECOND_LIFE] website. You are responsible for indicating if any | 308 | [SECOND_LIFE] website. You are responsible for indicating if any |
310 | of the above content is considered Mature according to the | 309 | of the above content is considered inappropriate for a minor |
311 | Community Standards. | 310 | according to the Community Standards. |
312 | </message> | 311 | </message> |
313 | </alert> | 312 | </alert> |
314 | <alert modal="true" name="ClickPublishHelpLand"> | 313 | <alert modal="true" name="ClickPublishHelpLand"> |
@@ -331,8 +330,8 @@ region that forbids this. | |||
331 | Selecting the "Publish on the Web" option allows us to publish | 330 | Selecting the "Publish on the Web" option allows us to publish |
332 | the photographer's [SECOND_LIFE] name, subject line, location, message and | 331 | the photographer's [SECOND_LIFE] name, subject line, location, message and |
333 | snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any | 332 | snapshot on the [SECOND_LIFE] website. You are responsible for indicating if any |
334 | of the above content for each snapshot is considered Mature according to the | 333 | of the above content for each snapshot is considered inappropriate for a minor |
335 | Community Standards. | 334 | according to the Community Standards. |
336 | </message> | 335 | </message> |
337 | </alert> | 336 | </alert> |
338 | <alert modal="true" name="ClickPublishHelpAvatar"> | 337 | <alert modal="true" name="ClickPublishHelpAvatar"> |
@@ -474,7 +473,6 @@ Please select an individual to sell to if selling for L$0. | |||
474 | <message name="message"> | 473 | <message name="message"> |
475 | The selected [LAND_SIZE] m2 land is being set for sale. | 474 | The selected [LAND_SIZE] m2 land is being set for sale. |
476 | Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME]. | 475 | Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME]. |
477 | |||
478 | </message> | 476 | </message> |
479 | <option name="Continue"> | 477 | <option name="Continue"> |
480 | OK | 478 | OK |
@@ -692,7 +690,6 @@ The outfit folder contains no clothing, body parts, or attachments. | |||
692 | <alert modal="true" name="MustHaveAccountToLogIn"> | 690 | <alert modal="true" name="MustHaveAccountToLogIn"> |
693 | <message name="message"> | 691 | <message name="message"> |
694 | You must have an account to connect to [SECOND_LIFE]. | 692 | You must have an account to connect to [SECOND_LIFE]. |
695 | |||
696 | Go to www.secondlife.com to create an account? | 693 | Go to www.secondlife.com to create an account? |
697 | </message> | 694 | </message> |
698 | <option name="OK"> | 695 | <option name="OK"> |
@@ -706,10 +703,8 @@ Go to www.secondlife.com to create an account? | |||
706 | <message name="message"> | 703 | <message name="message"> |
707 | Classified ads appear in the 'Classified' section of the | 704 | Classified ads appear in the 'Classified' section of the |
708 | Search directory and on www.secondlife.com for one week. | 705 | Search directory and on www.secondlife.com for one week. |
709 | |||
710 | Fill out your ad, then click 'Publish...' to add it to the | 706 | Fill out your ad, then click 'Publish...' to add it to the |
711 | directory. | 707 | directory. |
712 | |||
713 | You'll be asked for a price to pay when clicking Publish. | 708 | You'll be asked for a price to pay when clicking Publish. |
714 | Paying more makes your ad appear higher in the list, and | 709 | Paying more makes your ad appear higher in the list, and |
715 | also appear higher when people search for keywords. | 710 | also appear higher when people search for keywords. |
@@ -766,8 +761,8 @@ There is no reimbursement for fees paid. | |||
766 | Some of the display changes that you have made | 761 | Some of the display changes that you have made |
767 | require [SECOND_LIFE] to shut down immediately, | 762 | require [SECOND_LIFE] to shut down immediately, |
768 | which will cause you to lose any work in progress. | 763 | which will cause you to lose any work in progress. |
769 | 764 | ||
770 | Apply those changes and quit | 765 | Apply those changes and quit? |
771 | </message> | 766 | </message> |
772 | <option name="ApplyandQuit"> | 767 | <option name="ApplyandQuit"> |
773 | Apply and Quit | 768 | Apply and Quit |
@@ -1007,7 +1002,6 @@ Could not request domain name: [HOST] | |||
1007 | Unable to find the server domain name. | 1002 | Unable to find the server domain name. |
1008 | This could be the result of a lost network connection | 1003 | This could be the result of a lost network connection |
1009 | or a server problem. | 1004 | or a server problem. |
1010 | |||
1011 | Please try again in a few minutes, or click Help | 1005 | Please try again in a few minutes, or click Help |
1012 | for advice and a link to the system status web page. | 1006 | for advice and a link to the system status web page. |
1013 | </message> | 1007 | </message> |
@@ -1028,6 +1022,7 @@ Unable to connect to [SERVER] | |||
1028 | <message name="message"> | 1022 | <message name="message"> |
1029 | Unable to connect to [SECOND_LIFE]. | 1023 | Unable to connect to [SECOND_LIFE]. |
1030 | DNS could not resolve the host name. | 1024 | DNS could not resolve the host name. |
1025 | |||
1031 | Please verify that you can connect to the www.secondlife.com | 1026 | Please verify that you can connect to the www.secondlife.com |
1032 | web site. If you can, but continue to receive this error, | 1027 | web site. If you can, but continue to receive this error, |
1033 | please go to www.secondlife.com/support and report this problem. | 1028 | please go to www.secondlife.com/support and report this problem. |
@@ -1037,8 +1032,8 @@ please go to www.secondlife.com/support and report this problem. | |||
1037 | <message name="message"> | 1032 | <message name="message"> |
1038 | Unable to establish a secure connection to the login server. | 1033 | Unable to establish a secure connection to the login server. |
1039 | Often this means that your computer's clock is set incorrectly. | 1034 | Often this means that your computer's clock is set incorrectly. |
1035 | |||
1040 | Please ensure the time and date are set correctly. | 1036 | Please ensure the time and date are set correctly. |
1041 | |||
1042 | If you continue to receive this error, please go | 1037 | If you continue to receive this error, please go |
1043 | to www.secondlife.com/support | 1038 | to www.secondlife.com/support |
1044 | and report the problem. | 1039 | and report the problem. |
@@ -1048,6 +1043,7 @@ and report the problem. | |||
1048 | <message name="message"> | 1043 | <message name="message"> |
1049 | Unable to connect to [SECOND_LIFE]. | 1044 | Unable to connect to [SECOND_LIFE]. |
1050 | The login server couldn't verify itself via SSL. | 1045 | The login server couldn't verify itself via SSL. |
1046 | |||
1051 | If you continue to receive this error, please go | 1047 | If you continue to receive this error, please go |
1052 | to www.secondlife.com/support | 1048 | to www.secondlife.com/support |
1053 | and report the problem. | 1049 | and report the problem. |
@@ -1057,6 +1053,7 @@ and report the problem. | |||
1057 | <message name="message"> | 1053 | <message name="message"> |
1058 | Unable to connect to [SECOND_LIFE]. | 1054 | Unable to connect to [SECOND_LIFE]. |
1059 | Despite our best efforts, something unexpected has gone wrong. | 1055 | Despite our best efforts, something unexpected has gone wrong. |
1056 | |||
1060 | Please go to www.secondlife.com/support | 1057 | Please go to www.secondlife.com/support |
1061 | and report the problem. If possible, include your SecondLife.log | 1058 | and report the problem. If possible, include your SecondLife.log |
1062 | file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs | 1059 | file from: C:\Documents and Settings\(name)\Application Data\SecondLife\logs |
@@ -1067,6 +1064,7 @@ Thank you. | |||
1067 | <message name="message"> | 1064 | <message name="message"> |
1068 | Unable to connect to [SECOND_LIFE]. | 1065 | Unable to connect to [SECOND_LIFE]. |
1069 | Despite our best efforts, something unexpected has gone wrong. | 1066 | Despite our best efforts, something unexpected has gone wrong. |
1067 | |||
1070 | Please go to www.secondlife.com/support | 1068 | Please go to www.secondlife.com/support |
1071 | and report the problem. If possible, include your SecondLife.log | 1069 | and report the problem. If possible, include your SecondLife.log |
1072 | file from: ~/Library/Application Support/SecondLife/logs | 1070 | file from: ~/Library/Application Support/SecondLife/logs |
@@ -1076,15 +1074,16 @@ Thank you. | |||
1076 | <alert modal="true" name="CannotResolveLoginToken"> | 1074 | <alert modal="true" name="CannotResolveLoginToken"> |
1077 | <message name="message"> | 1075 | <message name="message"> |
1078 | There was a problem resolving your login | 1076 | There was a problem resolving your login |
1079 | authentication token. Please try logging in | 1077 | authentication token. Please try logging in again. |
1080 | again. If you continue to receive this error, | 1078 | |
1079 | If you continue to receive this error, | ||
1081 | please go to www.secondlife.com/support. | 1080 | please go to www.secondlife.com/support. |
1082 | </message> | 1081 | </message> |
1083 | </alert> | 1082 | </alert> |
1084 | <alert modal="true" name="CannotConnectNoMessage"> | 1083 | <alert modal="true" name="CannotConnectNoMessage"> |
1085 | <message name="message"> | 1084 | <message name="message"> |
1086 | Unknown problem trying to connect. | 1085 | Unknown problem trying to connect. |
1087 | 1086 | ||
1088 | Please try again in a few minutes, or click Help | 1087 | Please try again in a few minutes, or click Help |
1089 | for advice and a link to the system status web page. | 1088 | for advice and a link to the system status web page. |
1090 | </message> | 1089 | </message> |
@@ -1117,10 +1116,9 @@ for advice and a link to the system status web page. | |||
1117 | <alert modal="true" name="FirstRunDialog"> | 1116 | <alert modal="true" name="FirstRunDialog"> |
1118 | <message name="message"> | 1117 | <message name="message"> |
1119 | [SECOND_LIFE] installation is complete. | 1118 | [SECOND_LIFE] installation is complete. |
1120 | 1119 | ||
1121 | If this is your first time using [SECOND_LIFE], you will need to create | 1120 | If this is your first time using [SECOND_LIFE], you will need to create |
1122 | an account before you can log on. | 1121 | an account before you can log on. |
1123 | |||
1124 | Return to www.secondlife.com to create a new account? | 1122 | Return to www.secondlife.com to create a new account? |
1125 | </message> | 1123 | </message> |
1126 | <option name="NewAccount..."> | 1124 | <option name="NewAccount..."> |
@@ -1141,6 +1139,7 @@ will see you correctly. | |||
1141 | <message name="message"> | 1139 | <message name="message"> |
1142 | Unable to connect to server. | 1140 | Unable to connect to server. |
1143 | Could not resolve domain name: [DOMAIN] | 1141 | Could not resolve domain name: [DOMAIN] |
1142 | |||
1144 | Please check your network connection. | 1143 | Please check your network connection. |
1145 | </message> | 1144 | </message> |
1146 | </alert> | 1145 | </alert> |
@@ -1162,9 +1161,8 @@ for advice and a link to the system status web page. | |||
1162 | <alert modal="true" name="WelcomeToSecondLife"> | 1161 | <alert modal="true" name="WelcomeToSecondLife"> |
1163 | <message name="message"> | 1162 | <message name="message"> |
1164 | Welcome to [SECOND_LIFE]! | 1163 | Welcome to [SECOND_LIFE]! |
1165 | 1164 | ||
1166 | Use arrow keys to walk. | 1165 | Use arrow keys to walk. |
1167 | |||
1168 | Please choose the male or female avatar. | 1166 | Please choose the male or female avatar. |
1169 | You can change your mind later. | 1167 | You can change your mind later. |
1170 | </message> | 1168 | </message> |
@@ -1177,10 +1175,9 @@ You can change your mind later. | |||
1177 | </alert> | 1175 | </alert> |
1178 | <alert modal="true" name="WelcomeToSecondLifeSimple"> | 1176 | <alert modal="true" name="WelcomeToSecondLifeSimple"> |
1179 | <message name="message"> | 1177 | <message name="message"> |
1180 | Welcome to [SECOND_LIFE]! | 1178 | Welcome to [SECOND_LIFE]! |
1181 | 1179 | ||
1182 | Use arrow keys to walk. | 1180 | Use arrow keys to walk. |
1183 | |||
1184 | Please choose the male or female avatar. | 1181 | Please choose the male or female avatar. |
1185 | </message> | 1182 | </message> |
1186 | <option name="Male"> | 1183 | <option name="Male"> |
@@ -1316,8 +1313,7 @@ Are you sure you want to take these itmes? | |||
1316 | <alert modal="true" name="PromptGoToCurrencyPage"> | 1313 | <alert modal="true" name="PromptGoToCurrencyPage"> |
1317 | <message name="message"> | 1314 | <message name="message"> |
1318 | [EXTRA] | 1315 | [EXTRA] |
1319 | 1316 | ||
1320 | |||
1321 | Go to [URL] for information on purchasing currency? | 1317 | Go to [URL] for information on purchasing currency? |
1322 | </message> | 1318 | </message> |
1323 | <option name="GotoPage"> | 1319 | <option name="GotoPage"> |
@@ -1342,20 +1338,24 @@ select more than one object. | |||
1342 | <alert modal="true" name="CannotLinkModify"> | 1338 | <alert modal="true" name="CannotLinkModify"> |
1343 | <message name="message"> | 1339 | <message name="message"> |
1344 | Unable to link because you don't have modify permission | 1340 | Unable to link because you don't have modify permission |
1345 | on all the objects. Make sure none are locked, and that | 1341 | on all the objects. |
1346 | you own all of them. | 1342 | |
1343 | Please make sure none are locked, and that you own all of them. | ||
1347 | </message> | 1344 | </message> |
1348 | </alert> | 1345 | </alert> |
1349 | <alert modal="true" name="CannotLinkDifferentOwners"> | 1346 | <alert modal="true" name="CannotLinkDifferentOwners"> |
1350 | <message name="message"> | 1347 | <message name="message"> |
1351 | Unable to link because not all of the objects have the | 1348 | Unable to link because not all of the objects have the |
1352 | same owner. Make sure you own all of the selected objects. | 1349 | same owner. |
1350 | |||
1351 | Please make sure you own all of the selected objects. | ||
1353 | </message> | 1352 | </message> |
1354 | </alert> | 1353 | </alert> |
1355 | <alert modal="true" name="NoFileExtension"> | 1354 | <alert modal="true" name="NoFileExtension"> |
1356 | <message name="message"> | 1355 | <message name="message"> |
1357 | No file extension for the file: '[FILE]' | 1356 | No file extension for the file: '[FILE]' |
1358 | Please make sure the file has a correct file extension | 1357 | |
1358 | Please make sure the file has a correct file extension. | ||
1359 | </message> | 1359 | </message> |
1360 | </alert> | 1360 | </alert> |
1361 | <alert modal="true" name="InvalidFileExtension"> | 1361 | <alert modal="true" name="InvalidFileExtension"> |
@@ -1488,6 +1488,7 @@ Select an object with a script. | |||
1488 | <alert modal="true" name="CannotRecompileSelectObjectsNoPermission"> | 1488 | <alert modal="true" name="CannotRecompileSelectObjectsNoPermission"> |
1489 | <message name="message"> | 1489 | <message name="message"> |
1490 | Not able to perform 'recompilation'. | 1490 | Not able to perform 'recompilation'. |
1491 | |||
1491 | Select objects with scripts that you | 1492 | Select objects with scripts that you |
1492 | have permission to modify. | 1493 | have permission to modify. |
1493 | </message> | 1494 | </message> |
@@ -1495,12 +1496,14 @@ have permission to modify. | |||
1495 | <alert modal="true" name="CannotResetSelectObjectsNoScripts"> | 1496 | <alert modal="true" name="CannotResetSelectObjectsNoScripts"> |
1496 | <message name="message"> | 1497 | <message name="message"> |
1497 | Not able to perform 'reset'. | 1498 | Not able to perform 'reset'. |
1499 | |||
1498 | Select objects with scripts. | 1500 | Select objects with scripts. |
1499 | </message> | 1501 | </message> |
1500 | </alert> | 1502 | </alert> |
1501 | <alert modal="true" name="CannotResetSelectObjectsNoPermission"> | 1503 | <alert modal="true" name="CannotResetSelectObjectsNoPermission"> |
1502 | <message name="message"> | 1504 | <message name="message"> |
1503 | Not able to perform 'reset'. | 1505 | Not able to perform 'reset'. |
1506 | |||
1504 | Select objects with scripts that you | 1507 | Select objects with scripts that you |
1505 | have permission to modify. | 1508 | have permission to modify. |
1506 | </message> | 1509 | </message> |
@@ -1508,12 +1511,14 @@ have permission to modify. | |||
1508 | <alert modal="true" name="CannotSetRunningSelectObjectsNoScripts"> | 1511 | <alert modal="true" name="CannotSetRunningSelectObjectsNoScripts"> |
1509 | <message name="message"> | 1512 | <message name="message"> |
1510 | Not able to set any scripts to 'running'. | 1513 | Not able to set any scripts to 'running'. |
1514 | |||
1511 | Select objects with scripts. | 1515 | Select objects with scripts. |
1512 | </message> | 1516 | </message> |
1513 | </alert> | 1517 | </alert> |
1514 | <alert modal="true" name="CannotSetRunningSelectObjectsNoPermission"> | 1518 | <alert modal="true" name="CannotSetRunningSelectObjectsNoPermission"> |
1515 | <message name="message"> | 1519 | <message name="message"> |
1516 | Not able to set any scripts to 'running'. | 1520 | Not able to set any scripts to 'running'. |
1521 | |||
1517 | Select objects with scripts that you | 1522 | Select objects with scripts that you |
1518 | have permission to modify. | 1523 | have permission to modify. |
1519 | </message> | 1524 | </message> |
@@ -1521,12 +1526,14 @@ have permission to modify. | |||
1521 | <alert modal="true" name="CannotSetRunningNotSelectObjectsNoScripts"> | 1526 | <alert modal="true" name="CannotSetRunningNotSelectObjectsNoScripts"> |
1522 | <message name="message"> | 1527 | <message name="message"> |
1523 | Unable to set any scripts to 'not running'. | 1528 | Unable to set any scripts to 'not running'. |
1529 | |||
1524 | Select objects with scripts. | 1530 | Select objects with scripts. |
1525 | </message> | 1531 | </message> |
1526 | </alert> | 1532 | </alert> |
1527 | <alert modal="true" name="CannotSetRunningNotSelectObjectsNoPermission"> | 1533 | <alert modal="true" name="CannotSetRunningNotSelectObjectsNoPermission"> |
1528 | <message name="message"> | 1534 | <message name="message"> |
1529 | Unable to set any scripts to 'not running'. | 1535 | Unable to set any scripts to 'not running'. |
1536 | |||
1530 | Select objects with scripts that you | 1537 | Select objects with scripts that you |
1531 | have permission to modify. | 1538 | have permission to modify. |
1532 | </message> | 1539 | </message> |
@@ -1661,6 +1668,7 @@ No parcel selected. | |||
1661 | <alert modal="true" name="CannotBuyLandMultipleRegions"> | 1668 | <alert modal="true" name="CannotBuyLandMultipleRegions"> |
1662 | <message name="message"> | 1669 | <message name="message"> |
1663 | Unable to buy land because selection spans multiple regions. | 1670 | Unable to buy land because selection spans multiple regions. |
1671 | |||
1664 | Please select a smaller area and try again. | 1672 | Please select a smaller area and try again. |
1665 | </message> | 1673 | </message> |
1666 | </alert> | 1674 | </alert> |
@@ -1668,6 +1676,7 @@ Please select a smaller area and try again. | |||
1668 | <message name="message"> | 1676 | <message name="message"> |
1669 | Unable to buy land: | 1677 | Unable to buy land: |
1670 | Multiple parcels selected. | 1678 | Multiple parcels selected. |
1679 | |||
1671 | Try selecting a single parcel. | 1680 | Try selecting a single parcel. |
1672 | </message> | 1681 | </message> |
1673 | </alert> | 1682 | </alert> |
@@ -1675,6 +1684,7 @@ Try selecting a single parcel. | |||
1675 | <message name="message"> | 1684 | <message name="message"> |
1676 | Unable to deed land: | 1685 | Unable to deed land: |
1677 | Multiple parcels selected. | 1686 | Multiple parcels selected. |
1687 | |||
1678 | Try selecting a single parcel. | 1688 | Try selecting a single parcel. |
1679 | </message> | 1689 | </message> |
1680 | </alert> | 1690 | </alert> |
@@ -1686,10 +1696,9 @@ Try selecting a single parcel. | |||
1686 | <alert modal="true" name="ParcelCanPlayMusic"> | 1696 | <alert modal="true" name="ParcelCanPlayMusic"> |
1687 | <message name="message"> | 1697 | <message name="message"> |
1688 | This location can play streaming music. | 1698 | This location can play streaming music. |
1689 | |||
1690 | Music requires a 768 kbps or faster | 1699 | Music requires a 768 kbps or faster |
1691 | Internet connection. | 1700 | Internet connection. |
1692 | 1701 | ||
1693 | Play music when available? | 1702 | Play music when available? |
1694 | </message> | 1703 | </message> |
1695 | <option name="PlayMusic"> | 1704 | <option name="PlayMusic"> |
@@ -1702,12 +1711,10 @@ Play music when available? | |||
1702 | <alert modal="true" name="ParcelCanPlayMedia"> | 1711 | <alert modal="true" name="ParcelCanPlayMedia"> |
1703 | <message name="message"> | 1712 | <message name="message"> |
1704 | This location can play streaming video. | 1713 | This location can play streaming video. |
1705 | |||
1706 | Streaming video requires a 768 kbps or | 1714 | Streaming video requires a 768 kbps or |
1707 | faster Internet connection. | 1715 | faster Internet connection. |
1708 | 1716 | ||
1709 | Play streaming video when available? | 1717 | Play streaming video when available? |
1710 | |||
1711 | (You can change this option later under | 1718 | (You can change this option later under |
1712 | Preferences > Audio & Video.) | 1719 | Preferences > Audio & Video.) |
1713 | </message> | 1720 | </message> |
@@ -1722,6 +1729,7 @@ Preferences > Audio & Video.) | |||
1722 | <message name="message"> | 1729 | <message name="message"> |
1723 | Unable to buy land: | 1730 | Unable to buy land: |
1724 | Waiting for server to report cost. | 1731 | Waiting for server to report cost. |
1732 | |||
1725 | Please try again. | 1733 | Please try again. |
1726 | </message> | 1734 | </message> |
1727 | </alert> | 1735 | </alert> |
@@ -1729,6 +1737,7 @@ Please try again. | |||
1729 | <message name="message"> | 1737 | <message name="message"> |
1730 | Unable to deed land: | 1738 | Unable to deed land: |
1731 | Waiting for server to report ownership. | 1739 | Waiting for server to report ownership. |
1740 | |||
1732 | Please try again. | 1741 | Please try again. |
1733 | </message> | 1742 | </message> |
1734 | </alert> | 1743 | </alert> |
@@ -1749,6 +1758,7 @@ by another Resident. | |||
1749 | <message name="message"> | 1758 | <message name="message"> |
1750 | Unable to buy land: | 1759 | Unable to buy land: |
1751 | Cannot find the region this land is in. | 1760 | Cannot find the region this land is in. |
1761 | |||
1752 | Please use Tools -> Report Bug to report this. | 1762 | Please use Tools -> Report Bug to report this. |
1753 | </message> | 1763 | </message> |
1754 | </alert> | 1764 | </alert> |
@@ -1768,6 +1778,7 @@ The region [REGION] does not allow transfer of land. | |||
1768 | <message name="message"> | 1778 | <message name="message"> |
1769 | Unable to buy land for the group: | 1779 | Unable to buy land for the group: |
1770 | You are not an officer in your current group. | 1780 | You are not an officer in your current group. |
1781 | |||
1771 | Please activate another group using Edit -> Groups... | 1782 | Please activate another group using Edit -> Groups... |
1772 | </message> | 1783 | </message> |
1773 | </alert> | 1784 | </alert> |
@@ -1787,6 +1798,7 @@ No parcel selected. | |||
1787 | <message name="message"> | 1798 | <message name="message"> |
1788 | Unable to abandon land: | 1799 | Unable to abandon land: |
1789 | Waiting for server to update parcel information. | 1800 | Waiting for server to update parcel information. |
1801 | |||
1790 | Try again in a few seconds. | 1802 | Try again in a few seconds. |
1791 | </message> | 1803 | </message> |
1792 | </alert> | 1804 | </alert> |
@@ -1794,6 +1806,7 @@ Try again in a few seconds. | |||
1794 | <message name="message"> | 1806 | <message name="message"> |
1795 | Unable to abandon land: | 1807 | Unable to abandon land: |
1796 | You do not own all the parcels selected. | 1808 | You do not own all the parcels selected. |
1809 | |||
1797 | Please select a single parcel. | 1810 | Please select a single parcel. |
1798 | </message> | 1811 | </message> |
1799 | </alert> | 1812 | </alert> |
@@ -1808,6 +1821,7 @@ Parcels you own appear in green. | |||
1808 | <message name="message"> | 1821 | <message name="message"> |
1809 | Unable to abandon land: | 1822 | Unable to abandon land: |
1810 | Cannot find the region this land is in. | 1823 | Cannot find the region this land is in. |
1824 | |||
1811 | Please use Tools -> Report Bug to report this. | 1825 | Please use Tools -> Report Bug to report this. |
1812 | </message> | 1826 | </message> |
1813 | </alert> | 1827 | </alert> |
@@ -1821,6 +1835,7 @@ The region [REGION] does not allow transfer of land. | |||
1821 | <message name="message"> | 1835 | <message name="message"> |
1822 | Unable to abandon land: | 1836 | Unable to abandon land: |
1823 | You must select an entire parcel to release it. | 1837 | You must select an entire parcel to release it. |
1838 | |||
1824 | Select an entire parcel, or divide your parcel first. | 1839 | Select an entire parcel, or divide your parcel first. |
1825 | </message> | 1840 | </message> |
1826 | </alert> | 1841 | </alert> |
@@ -1829,7 +1844,7 @@ Select an entire parcel, or divide your parcel first. | |||
1829 | You are about to release [AREA] m2 of land. | 1844 | You are about to release [AREA] m2 of land. |
1830 | Releasing this parcel will remove it from your land | 1845 | Releasing this parcel will remove it from your land |
1831 | holdings, but will not grant any L$. | 1846 | holdings, but will not grant any L$. |
1832 | 1847 | ||
1833 | Release this land? | 1848 | Release this land? |
1834 | </message> | 1849 | </message> |
1835 | <option name="Release"> | 1850 | <option name="Release"> |
@@ -1842,12 +1857,14 @@ Release this land? | |||
1842 | <alert modal="true" name="CannotDivideLandNothingSelected"> | 1857 | <alert modal="true" name="CannotDivideLandNothingSelected"> |
1843 | <message name="message"> | 1858 | <message name="message"> |
1844 | Unable to divide land: | 1859 | Unable to divide land: |
1860 | |||
1845 | No parcels selected. | 1861 | No parcels selected. |
1846 | </message> | 1862 | </message> |
1847 | </alert> | 1863 | </alert> |
1848 | <alert modal="true" name="CannotDivideLandPartialSelection"> | 1864 | <alert modal="true" name="CannotDivideLandPartialSelection"> |
1849 | <message name="message"> | 1865 | <message name="message"> |
1850 | Unable to divide land: | 1866 | Unable to divide land: |
1867 | |||
1851 | You have an entire parcel selected. | 1868 | You have an entire parcel selected. |
1852 | Try selecting a part of the parcel. | 1869 | Try selecting a part of the parcel. |
1853 | </message> | 1870 | </message> |
@@ -1871,6 +1888,7 @@ Divide land? | |||
1871 | <message name="message"> | 1888 | <message name="message"> |
1872 | Unable to divide land: | 1889 | Unable to divide land: |
1873 | Cannot find the region this land is in. | 1890 | Cannot find the region this land is in. |
1891 | |||
1874 | Please use Tools -> Report Bug to report this. | 1892 | Please use Tools -> Report Bug to report this. |
1875 | </message> | 1893 | </message> |
1876 | </alert> | 1894 | </alert> |
@@ -1878,6 +1896,7 @@ Please use Tools -> Report Bug to report this. | |||
1878 | <message name="message"> | 1896 | <message name="message"> |
1879 | Unable to join land: | 1897 | Unable to join land: |
1880 | Cannot find the region this land is in. | 1898 | Cannot find the region this land is in. |
1899 | |||
1881 | Please use Tools -> Report Bug to report this. | 1900 | Please use Tools -> Report Bug to report this. |
1882 | </message> | 1901 | </message> |
1883 | </alert> | 1902 | </alert> |
@@ -1891,6 +1910,7 @@ No parcels selected. | |||
1891 | <message name="message"> | 1910 | <message name="message"> |
1892 | Unable to join land: | 1911 | Unable to join land: |
1893 | You only have one parcel selected. | 1912 | You only have one parcel selected. |
1913 | |||
1894 | Select land across both parcels. | 1914 | Select land across both parcels. |
1895 | </message> | 1915 | </message> |
1896 | </alert> | 1916 | </alert> |
@@ -1898,6 +1918,7 @@ Select land across both parcels. | |||
1898 | <message name="message"> | 1918 | <message name="message"> |
1899 | Unable to join land: | 1919 | Unable to join land: |
1900 | You must select more than one parcel. | 1920 | You must select more than one parcel. |
1921 | |||
1901 | Select land across both parcels. | 1922 | Select land across both parcels. |
1902 | </message> | 1923 | </message> |
1903 | </alert> | 1924 | </alert> |
@@ -1905,9 +1926,8 @@ Select land across both parcels. | |||
1905 | <message name="message"> | 1926 | <message name="message"> |
1906 | Joining this land will create one large parcel | 1927 | Joining this land will create one large parcel |
1907 | out of all parcels intersecting the selected rectangle. | 1928 | out of all parcels intersecting the selected rectangle. |
1908 | |||
1909 | You will need to reset the name and options of the | 1929 | You will need to reset the name and options of the |
1910 | new parcel. | 1930 | new parcel. |
1911 | 1931 | ||
1912 | Join land? | 1932 | Join land? |
1913 | </message> | 1933 | </message> |
@@ -1978,7 +1998,9 @@ save the wearable again. | |||
1978 | Unable to save [NAME] to central asset store. | 1998 | Unable to save [NAME] to central asset store. |
1979 | This is usually a temporary failure. Please | 1999 | This is usually a temporary failure. Please |
1980 | customize and save the wearable again in a | 2000 | customize and save the wearable again in a |
1981 | few minutes. If this problem persists, please | 2001 | few minutes. |
2002 | |||
2003 | If this problem persists, please | ||
1982 | click on the 'Tools | Report Bug' pull down menu | 2004 | click on the 'Tools | Report Bug' pull down menu |
1983 | and provide details about your network setup. | 2005 | and provide details about your network setup. |
1984 | </message> | 2006 | </message> |
@@ -1987,8 +2009,9 @@ and provide details about your network setup. | |||
1987 | <message name="message"> | 2009 | <message name="message"> |
1988 | [MESSAGE] | 2010 | [MESSAGE] |
1989 | 2011 | ||
1990 | We are unable to recover from this problem. Please | 2012 | We are unable to recover from this problem. |
1991 | uninstall and reinstall before trying again. If this | 2013 | |
2014 | Please uninstall and reinstall before trying again. If this | ||
1992 | problem persists, check the Tech Support FAQ at: | 2015 | problem persists, check the Tech Support FAQ at: |
1993 | www.secondlife.com/support. | 2016 | www.secondlife.com/support. |
1994 | </message> | 2017 | </message> |
@@ -1999,9 +2022,8 @@ www.secondlife.com/support. | |||
1999 | <alert modal="true" name="YouHaveBeenLoggedOut"> | 2022 | <alert modal="true" name="YouHaveBeenLoggedOut"> |
2000 | <message name="message"> | 2023 | <message name="message"> |
2001 | You have been logged out of [SECOND_LIFE]: | 2024 | You have been logged out of [SECOND_LIFE]: |
2002 | |||
2003 | [MESSAGE] | 2025 | [MESSAGE] |
2004 | 2026 | ||
2005 | Click Continue to look at existing IM and chat. | 2027 | Click Continue to look at existing IM and chat. |
2006 | You will not be able to perform any other operations. | 2028 | You will not be able to perform any other operations. |
2007 | Click Quit to exit [SECOND_LIFE] immediately. | 2029 | Click Quit to exit [SECOND_LIFE] immediately. |
@@ -2024,7 +2046,7 @@ You do not have permission to buy land for your active group. | |||
2024 | Friends can give permissions to | 2046 | Friends can give permissions to |
2025 | track each other on the map and | 2047 | track each other on the map and |
2026 | receive online status updates. | 2048 | receive online status updates. |
2027 | 2049 | ||
2028 | Offer friendship to [NAME]? | 2050 | Offer friendship to [NAME]? |
2029 | </message> | 2051 | </message> |
2030 | <option name="Offer"> | 2052 | <option name="Offer"> |
@@ -2059,9 +2081,7 @@ Offer friendship to [NAME]? | |||
2059 | <alert modal="true" name="GodDeleteAllScriptedPublicObjectsByUser"> | 2081 | <alert modal="true" name="GodDeleteAllScriptedPublicObjectsByUser"> |
2060 | <message name="message"> | 2082 | <message name="message"> |
2061 | Are you sure you want to delete all scripted objects owned by | 2083 | Are you sure you want to delete all scripted objects owned by |
2062 | |||
2063 | ** [AVATAR_NAME] ** | 2084 | ** [AVATAR_NAME] ** |
2064 | |||
2065 | on all others land in this sim? | 2085 | on all others land in this sim? |
2066 | </message> | 2086 | </message> |
2067 | <option name="DELETE!!"> | 2087 | <option name="DELETE!!"> |
@@ -2074,9 +2094,7 @@ on all others land in this sim? | |||
2074 | <alert modal="true" name="GodDeleteAllScriptedObjectsByUser"> | 2094 | <alert modal="true" name="GodDeleteAllScriptedObjectsByUser"> |
2075 | <message name="message"> | 2095 | <message name="message"> |
2076 | Are you sure you want to DELETE ALL scripted objects owned by | 2096 | Are you sure you want to DELETE ALL scripted objects owned by |
2077 | |||
2078 | ** [AVATAR_NAME] ** | 2097 | ** [AVATAR_NAME] ** |
2079 | |||
2080 | on ALL LAND in this sim? | 2098 | on ALL LAND in this sim? |
2081 | </message> | 2099 | </message> |
2082 | <option name="!!DELETEALL!!"> | 2100 | <option name="!!DELETEALL!!"> |
@@ -2090,9 +2108,7 @@ on ALL LAND in this sim? | |||
2090 | <message name="message"> | 2108 | <message name="message"> |
2091 | Are you sure you want to DELETE ALL objects (scripted or not) | 2109 | Are you sure you want to DELETE ALL objects (scripted or not) |
2092 | owned by | 2110 | owned by |
2093 | |||
2094 | ** [AVATAR_NAME] ** | 2111 | ** [AVATAR_NAME] ** |
2095 | |||
2096 | on ALL LAND in this sim? | 2112 | on ALL LAND in this sim? |
2097 | </message> | 2113 | </message> |
2098 | <option name="!!DELETEALL!!"> | 2114 | <option name="!!DELETEALL!!"> |
@@ -2266,6 +2282,7 @@ If you continue, next owner permissions will be | |||
2266 | applied and possibly restrict your | 2282 | applied and possibly restrict your |
2267 | ability to modify or copy them. | 2283 | ability to modify or copy them. |
2268 | However, you can take the current selection. | 2284 | However, you can take the current selection. |
2285 | |||
2269 | Are you sure you want to take these items? | 2286 | Are you sure you want to take these items? |
2270 | </message> | 2287 | </message> |
2271 | <option name="Yes"> | 2288 | <option name="Yes"> |
@@ -2278,6 +2295,7 @@ Are you sure you want to take these items? | |||
2278 | <alert modal="true" name="CantBuyLandAcrossMultipleRegions"> | 2295 | <alert modal="true" name="CantBuyLandAcrossMultipleRegions"> |
2279 | <message name="message"> | 2296 | <message name="message"> |
2280 | Unable to buy land because selection spans multiple regions. | 2297 | Unable to buy land because selection spans multiple regions. |
2298 | |||
2281 | Please select a smaller area and try again. | 2299 | Please select a smaller area and try again. |
2282 | </message> | 2300 | </message> |
2283 | </alert> | 2301 | </alert> |
@@ -2285,11 +2303,10 @@ Please select a smaller area and try again. | |||
2285 | <message name="message"> | 2303 | <message name="message"> |
2286 | By deeding this parcel, the group will be required | 2304 | By deeding this parcel, the group will be required |
2287 | to have and maintain sufficient land use credits. | 2305 | to have and maintain sufficient land use credits. |
2288 | |||
2289 | The purchase price of the land is not refunded to | 2306 | The purchase price of the land is not refunded to |
2290 | the owner. If a deeded parcel is sold, the sale | 2307 | the owner. If a deeded parcel is sold, the sale |
2291 | price will be divided evenly among group members. | 2308 | price will be divided evenly among group members. |
2292 | 2309 | ||
2293 | Deed this [AREA] m2 of land to the group | 2310 | Deed this [AREA] m2 of land to the group |
2294 | '[GROUP_NAME]'? | 2311 | '[GROUP_NAME]'? |
2295 | </message> | 2312 | </message> |
@@ -2304,10 +2321,8 @@ Deed this [AREA] m2 of land to the group | |||
2304 | <message name="message"> | 2321 | <message name="message"> |
2305 | By deeding this parcel, the group will be required | 2322 | By deeding this parcel, the group will be required |
2306 | to have and maintain sufficient land use credits. | 2323 | to have and maintain sufficient land use credits. |
2307 | |||
2308 | The deed will include a simultaneous land | 2324 | The deed will include a simultaneous land |
2309 | contribution to the group from '[FIRST_NAME] [LAST_NAME]'. | 2325 | contribution to the group from '[FIRST_NAME] [LAST_NAME]'. |
2310 | |||
2311 | The purchase price of the land is not refunded to | 2326 | The purchase price of the land is not refunded to |
2312 | the owner. If a deeded parcel is sold, the sale | 2327 | the owner. If a deeded parcel is sold, the sale |
2313 | price will be divided evenly among group members. | 2328 | price will be divided evenly among group members. |
@@ -2345,7 +2360,7 @@ Could not request domain name: [HOST_NAME] | |||
2345 | Unable to find the server domain name. | 2360 | Unable to find the server domain name. |
2346 | This could be the result of a lost network connection | 2361 | This could be the result of a lost network connection |
2347 | or a server problem. | 2362 | or a server problem. |
2348 | 2363 | ||
2349 | Please try again in a few minutes, or click Help | 2364 | Please try again in a few minutes, or click Help |
2350 | for advice and a link to the system status web page. | 2365 | for advice and a link to the system status web page. |
2351 | </message> | 2366 | </message> |
@@ -2366,6 +2381,7 @@ Unable to connect to [IP_ADDRESS] | |||
2366 | <message name="message"> | 2381 | <message name="message"> |
2367 | Unable to connect to [SECOND_LIFE] | 2382 | Unable to connect to [SECOND_LIFE] |
2368 | The system may be down. | 2383 | The system may be down. |
2384 | |||
2369 | Please try again in a few minutes, or click Help | 2385 | Please try again in a few minutes, or click Help |
2370 | for advice and a link to the system status web page. | 2386 | for advice and a link to the system status web page. |
2371 | </message> | 2387 | </message> |
@@ -2383,8 +2399,7 @@ for advice and a link to the system status web page. | |||
2383 | </alert> | 2399 | </alert> |
2384 | <alert modal="true" name="AvatarMoved"> | 2400 | <alert modal="true" name="AvatarMoved"> |
2385 | <message name="message"> | 2401 | <message name="message"> |
2386 | Your [TYPE] location is not currently available. | 2402 | Your [TYPE] location is not currently available. [HELP] |
2387 | [HELP] | ||
2388 | You have been moved into a nearby region. | 2403 | You have been moved into a nearby region. |
2389 | </message> | 2404 | </message> |
2390 | </alert> | 2405 | </alert> |
@@ -2398,10 +2413,9 @@ will see you correctly. | |||
2398 | <alert modal="true" name="FirstRun"> | 2413 | <alert modal="true" name="FirstRun"> |
2399 | <message name="message"> | 2414 | <message name="message"> |
2400 | [SECOND_LIFE] installation is complete. | 2415 | [SECOND_LIFE] installation is complete. |
2401 | 2416 | ||
2402 | If this is your first time using [SECOND_LIFE], you will need to create | 2417 | If this is your first time using [SECOND_LIFE], you will need to create |
2403 | an account before you can log on. | 2418 | an account before you can log on. |
2404 | |||
2405 | Return to www.secondlife.com to create a new account? | 2419 | Return to www.secondlife.com to create a new account? |
2406 | </message> | 2420 | </message> |
2407 | <option name="NewAccount..."> | 2421 | <option name="NewAccount..."> |
@@ -2415,6 +2429,7 @@ Return to www.secondlife.com to create a new account? | |||
2415 | <message name="message"> | 2429 | <message name="message"> |
2416 | Unable to connect to server. | 2430 | Unable to connect to server. |
2417 | Could not resolve domain name: [HOST_NAME] | 2431 | Could not resolve domain name: [HOST_NAME] |
2432 | |||
2418 | Please check your network connection. | 2433 | Please check your network connection. |
2419 | </message> | 2434 | </message> |
2420 | </alert> | 2435 | </alert> |
@@ -2422,7 +2437,7 @@ Please check your network connection. | |||
2422 | <message name="message"> | 2437 | <message name="message"> |
2423 | Unable to connect. Login packet never received by | 2438 | Unable to connect. Login packet never received by |
2424 | login server. | 2439 | login server. |
2425 | 2440 | ||
2426 | Please try again in a few minutes, or click Help | 2441 | Please try again in a few minutes, or click Help |
2427 | for advice and a link to the system status web page. | 2442 | for advice and a link to the system status web page. |
2428 | </message> | 2443 | </message> |
@@ -2436,9 +2451,8 @@ for advice and a link to the system status web page. | |||
2436 | <alert modal="true" name="WelcomeNoClothes"> | 2451 | <alert modal="true" name="WelcomeNoClothes"> |
2437 | <message name="message"> | 2452 | <message name="message"> |
2438 | Your character will appear in a moment. | 2453 | Your character will appear in a moment. |
2439 | 2454 | ||
2440 | Use arrow keys to walk. | 2455 | Use arrow keys to walk. |
2441 | |||
2442 | Press the F1 key at any time for help or | 2456 | Press the F1 key at any time for help or |
2443 | to learn more about [SECOND_LIFE]. | 2457 | to learn more about [SECOND_LIFE]. |
2444 | </message> | 2458 | </message> |
@@ -2446,12 +2460,10 @@ to learn more about [SECOND_LIFE]. | |||
2446 | <alert modal="true" name="WelcomeChooseSex" nodefault="true"> | 2460 | <alert modal="true" name="WelcomeChooseSex" nodefault="true"> |
2447 | <message name="message"> | 2461 | <message name="message"> |
2448 | Your character will appear in a moment. | 2462 | Your character will appear in a moment. |
2449 | 2463 | ||
2450 | Use arrow keys to walk. | 2464 | Use arrow keys to walk. |
2451 | |||
2452 | Press the F1 key at any time for help or | 2465 | Press the F1 key at any time for help or |
2453 | to learn more about [SECOND_LIFE]. | 2466 | to learn more about [SECOND_LIFE]. |
2454 | |||
2455 | Please choose the male or female avatar. | 2467 | Please choose the male or female avatar. |
2456 | You can change your mind later. | 2468 | You can change your mind later. |
2457 | </message> | 2469 | </message> |
@@ -2480,9 +2492,7 @@ You can change your mind later. | |||
2480 | <alert modal="true" name="FlushMapVisibilityCaches"> | 2492 | <alert modal="true" name="FlushMapVisibilityCaches"> |
2481 | <message name="message"> | 2493 | <message name="message"> |
2482 | This will flush the map caches on this region. | 2494 | This will flush the map caches on this region. |
2483 | |||
2484 | This is really only useful for debugging. | 2495 | This is really only useful for debugging. |
2485 | |||
2486 | (In production, wait 5 minutes, then everyone's map will | 2496 | (In production, wait 5 minutes, then everyone's map will |
2487 | update after they relog.) | 2497 | update after they relog.) |
2488 | </message> | 2498 | </message> |
@@ -2545,9 +2555,8 @@ on ALL LAND in this region? | |||
2545 | <alert modal="true" name="InvalidTerrainBitDepth"> | 2555 | <alert modal="true" name="InvalidTerrainBitDepth"> |
2546 | <message name="message"> | 2556 | <message name="message"> |
2547 | Couldn't set region textures: | 2557 | Couldn't set region textures: |
2548 | |||
2549 | Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH]. | 2558 | Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH]. |
2550 | 2559 | ||
2551 | Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image | 2560 | Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image |
2552 | then click "Apply" again. | 2561 | then click "Apply" again. |
2553 | </message> | 2562 | </message> |
@@ -2555,9 +2564,8 @@ then click "Apply" again. | |||
2555 | <alert modal="true" name="InvalidTerrainSize"> | 2564 | <alert modal="true" name="InvalidTerrainSize"> |
2556 | <message name="message"> | 2565 | <message name="message"> |
2557 | Couldn't set region textures: | 2566 | Couldn't set region textures: |
2558 | |||
2559 | Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. | 2567 | Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. |
2560 | 2568 | ||
2561 | Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image | 2569 | Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image |
2562 | then click "Apply" again. | 2570 | then click "Apply" again. |
2563 | </message> | 2571 | </message> |
@@ -2639,7 +2647,6 @@ Please set the object for sale and try again. | |||
2639 | <message name="message"> | 2647 | <message name="message"> |
2640 | A new version of [SECOND_LIFE] is available. | 2648 | A new version of [SECOND_LIFE] is available. |
2641 | [MESSAGE] | 2649 | [MESSAGE] |
2642 | |||
2643 | You must download this update to use [SECOND_LIFE]. | 2650 | You must download this update to use [SECOND_LIFE]. |
2644 | </message> | 2651 | </message> |
2645 | <option name="Download"> | 2652 | <option name="Download"> |
@@ -2653,7 +2660,6 @@ You must download this update to use [SECOND_LIFE]. | |||
2653 | <message name="message"> | 2660 | <message name="message"> |
2654 | An updated version of [SECOND_LIFE] is available. | 2661 | An updated version of [SECOND_LIFE] is available. |
2655 | [MESSAGE] | 2662 | [MESSAGE] |
2656 | |||
2657 | This update is not required, but we suggest you install it to improve performance and stability. | 2663 | This update is not required, but we suggest you install it to improve performance and stability. |
2658 | </message> | 2664 | </message> |
2659 | <option name="Download"> | 2665 | <option name="Download"> |
@@ -2667,7 +2673,6 @@ This update is not required, but we suggest you install it to improve performanc | |||
2667 | <message name="message"> | 2673 | <message name="message"> |
2668 | An updated version of [SECOND_LIFE] is available. | 2674 | An updated version of [SECOND_LIFE] is available. |
2669 | [MESSAGE] | 2675 | [MESSAGE] |
2670 | |||
2671 | This update is not required, but we suggest you install it to improve performance and stability. | 2676 | This update is not required, but we suggest you install it to improve performance and stability. |
2672 | </message> | 2677 | </message> |
2673 | <option name="Download"> | 2678 | <option name="Download"> |
@@ -2681,9 +2686,8 @@ This update is not required, but we suggest you install it to improve performanc | |||
2681 | <message name="message"> | 2686 | <message name="message"> |
2682 | A new version of [SECOND_LIFE] is available. | 2687 | A new version of [SECOND_LIFE] is available. |
2683 | [MESSAGE] | 2688 | [MESSAGE] |
2684 | |||
2685 | You must download this update to use [SECOND_LIFE]. | 2689 | You must download this update to use [SECOND_LIFE]. |
2686 | 2690 | ||
2687 | Download to your Applications folder? | 2691 | Download to your Applications folder? |
2688 | </message> | 2692 | </message> |
2689 | <option name="Download"> | 2693 | <option name="Download"> |
@@ -2697,7 +2701,6 @@ Download to your Applications folder? | |||
2697 | <message name="message"> | 2701 | <message name="message"> |
2698 | An updated version of [SECOND_LIFE] is available. | 2702 | An updated version of [SECOND_LIFE] is available. |
2699 | [MESSAGE] | 2703 | [MESSAGE] |
2700 | |||
2701 | This update is not required, but we suggest you install it to improve performance and stability. | 2704 | This update is not required, but we suggest you install it to improve performance and stability. |
2702 | 2705 | ||
2703 | Download to your Applications folder? | 2706 | Download to your Applications folder? |
@@ -2713,7 +2716,6 @@ Download to your Applications folder? | |||
2713 | <message name="message"> | 2716 | <message name="message"> |
2714 | An updated version of [SECOND_LIFE] is available. | 2717 | An updated version of [SECOND_LIFE] is available. |
2715 | [MESSAGE] | 2718 | [MESSAGE] |
2716 | |||
2717 | This update is not required, but we suggest you install it to improve performance and stability. | 2719 | This update is not required, but we suggest you install it to improve performance and stability. |
2718 | 2720 | ||
2719 | Download to your Applications folder? | 2721 | Download to your Applications folder? |
@@ -2744,10 +2746,8 @@ Download to your Applications folder? | |||
2744 | <message name="message"> | 2746 | <message name="message"> |
2745 | Classified ads appear in the 'Classified' section of the | 2747 | Classified ads appear in the 'Classified' section of the |
2746 | Find directory for one week. | 2748 | Find directory for one week. |
2747 | |||
2748 | Fill out your ad, then click 'Publish...' to add it to the | 2749 | Fill out your ad, then click 'Publish...' to add it to the |
2749 | directory. | 2750 | directory. |
2750 | |||
2751 | You'll be asked for a price to pay when clicking Publish. | 2751 | You'll be asked for a price to pay when clicking Publish. |
2752 | Paying more makes your ad appear higher in the list, and | 2752 | Paying more makes your ad appear higher in the list, and |
2753 | also appear higher when people search for keywords. | 2753 | also appear higher when people search for keywords. |
@@ -2935,7 +2935,7 @@ also appear higher when people search for keywords. | |||
2935 | Are you sure you want to return the selected | 2935 | Are you sure you want to return the selected |
2936 | objects to their owners? Transferable deeded | 2936 | objects to their owners? Transferable deeded |
2937 | objects will be returned to their previous owners. | 2937 | objects will be returned to their previous owners. |
2938 | 2938 | ||
2939 | *WARNING* No-transfer deeded objects will be deleted! | 2939 | *WARNING* No-transfer deeded objects will be deleted! |
2940 | </message> | 2940 | </message> |
2941 | <ignore name="ignore"> | 2941 | <ignore name="ignore"> |
@@ -3264,7 +3264,7 @@ sent to everyone currently in your estate. | |||
3264 | <message name="message"> | 3264 | <message name="message"> |
3265 | You are about to change a Linden owned estate (mainland, | 3265 | You are about to change a Linden owned estate (mainland, |
3266 | teen grid, orientation, etc.). | 3266 | teen grid, orientation, etc.). |
3267 | 3267 | ||
3268 | This is EXTREMELY DANGEROUS because it can fundamentally | 3268 | This is EXTREMELY DANGEROUS because it can fundamentally |
3269 | affect the user experience. On the mainland, it will change | 3269 | affect the user experience. On the mainland, it will change |
3270 | thousands of regions and make the spaceserver hiccup. | 3270 | thousands of regions and make the spaceserver hiccup. |
@@ -3282,11 +3282,10 @@ Proceed? | |||
3282 | <message name="message"> | 3282 | <message name="message"> |
3283 | You are about to change the access list for a Linden owned | 3283 | You are about to change the access list for a Linden owned |
3284 | estate (mainland, teen grid, orientation, etc.). | 3284 | estate (mainland, teen grid, orientation, etc.). |
3285 | 3285 | ||
3286 | This is DANGEROUS and should only be done to invoke the | 3286 | This is DANGEROUS and should only be done to invoke the |
3287 | hack allowing objects/L$ to be transfered in/out of | 3287 | hack allowing objects/L$ to be transfered in/out of |
3288 | a grid. | 3288 | a grid. |
3289 | |||
3290 | It will change thousands of regions and make the | 3289 | It will change thousands of regions and make the |
3291 | spaceserver hiccup. | 3290 | spaceserver hiccup. |
3292 | </message> | 3291 | </message> |
@@ -3485,7 +3484,7 @@ spaceserver hiccup. | |||
3485 | <alert name="PublishClassified"> | 3484 | <alert name="PublishClassified"> |
3486 | <message name="message"> | 3485 | <message name="message"> |
3487 | Remember: Classified ad fees are non-refundable. | 3486 | Remember: Classified ad fees are non-refundable. |
3488 | 3487 | ||
3489 | Publish this classified now for L$[AMOUNT]? | 3488 | Publish this classified now for L$[AMOUNT]? |
3490 | </message> | 3489 | </message> |
3491 | <option name="Publish"> | 3490 | <option name="Publish"> |
@@ -3523,7 +3522,7 @@ sent to everyone in this region. | |||
3523 | <message name="message"> | 3522 | <message name="message"> |
3524 | If this box is checked, land owners will not be able to terraform | 3523 | If this box is checked, land owners will not be able to terraform |
3525 | their land regardless of the per-parcel 'Edit Terrain' setting. | 3524 | their land regardless of the per-parcel 'Edit Terrain' setting. |
3526 | 3525 | ||
3527 | Default: off | 3526 | Default: off |
3528 | </message> | 3527 | </message> |
3529 | </alert> | 3528 | </alert> |
@@ -3614,7 +3613,6 @@ Default: Off | |||
3614 | </alert> | 3613 | </alert> |
3615 | <alert modal="true" name="HelpParcelSearch" title="Do Not Show In Search"> | 3614 | <alert modal="true" name="HelpParcelSearch" title="Do Not Show In Search"> |
3616 | <message name="message"> | 3615 | <message name="message"> |
3617 | |||
3618 | Checking this box will show: | 3616 | Checking this box will show: |
3619 | - this parcel in search results | 3617 | - this parcel in search results |
3620 | - this parcel's public objects | 3618 | - this parcel's public objects |
@@ -3623,7 +3621,6 @@ Checking this box will show: | |||
3623 | <alert modal="true" name="RegionMaturityChange" title="Changed Region Maturity"> | 3621 | <alert modal="true" name="RegionMaturityChange" title="Changed Region Maturity"> |
3624 | <message name="message"> | 3622 | <message name="message"> |
3625 | The maturity rating for this region has been updated. | 3623 | The maturity rating for this region has been updated. |
3626 | |||
3627 | It may take some time for the change to be | 3624 | It may take some time for the change to be |
3628 | reflected on the map. | 3625 | reflected on the map. |
3629 | </message> | 3626 | </message> |
@@ -4043,7 +4040,6 @@ They will be copied to your inventory. | |||
4043 | <alert modal="true" name="ConfirmPurchase" nodefault="true"> | 4040 | <alert modal="true" name="ConfirmPurchase" nodefault="true"> |
4044 | <message name="message"> | 4041 | <message name="message"> |
4045 | This transaction will: | 4042 | This transaction will: |
4046 | |||
4047 | [ACTION] | 4043 | [ACTION] |
4048 | 4044 | ||
4049 | Are you sure you want to proceed with this purchase? | 4045 | Are you sure you want to proceed with this purchase? |
@@ -4058,7 +4054,6 @@ Are you sure you want to proceed with this purchase? | |||
4058 | <alert modal="true" name="ConfirmPurchasePassword" nodefault="true"> | 4054 | <alert modal="true" name="ConfirmPurchasePassword" nodefault="true"> |
4059 | <message name="message"> | 4055 | <message name="message"> |
4060 | This transaction will: | 4056 | This transaction will: |
4061 | |||
4062 | [ACTION] | 4057 | [ACTION] |
4063 | 4058 | ||
4064 | Are you sure you want to proceed with this purchase? | 4059 | Are you sure you want to proceed with this purchase? |
@@ -4104,7 +4099,6 @@ Move the inventory item(s)? | |||
4104 | <message name="message"> | 4099 | <message name="message"> |
4105 | You have selected 'no copy' inventory items. These items | 4100 | You have selected 'no copy' inventory items. These items |
4106 | will be moved to your inventory, not copied. | 4101 | will be moved to your inventory, not copied. |
4107 | |||
4108 | Because this object is scripted, moving these items | 4102 | Because this object is scripted, moving these items |
4109 | to your inventory may cause the script to malfunction. | 4103 | to your inventory may cause the script to malfunction. |
4110 | 4104 | ||
@@ -4232,42 +4226,36 @@ Note: Incomplete reports will not be investigated | |||
4232 | <alert modal="true" name="HelpReportAbuseSelectCategory"> | 4226 | <alert modal="true" name="HelpReportAbuseSelectCategory"> |
4233 | <message name="message"> | 4227 | <message name="message"> |
4234 | Please select a category for this abuse report. | 4228 | Please select a category for this abuse report. |
4235 | |||
4236 | Selecting a category helps us file and process abuse reports. | 4229 | Selecting a category helps us file and process abuse reports. |
4237 | </message> | 4230 | </message> |
4238 | </alert> | 4231 | </alert> |
4239 | <alert modal="true" name="HelpReportBugSelectCategory"> | 4232 | <alert modal="true" name="HelpReportBugSelectCategory"> |
4240 | <message name="message"> | 4233 | <message name="message"> |
4241 | Please select a category for this bug. | 4234 | Please select a category for this bug. |
4242 | |||
4243 | Selecting a category helps us file and process bug reports. | 4235 | Selecting a category helps us file and process bug reports. |
4244 | </message> | 4236 | </message> |
4245 | </alert> | 4237 | </alert> |
4246 | <alert modal="true" name="HelpReportAbuseAbuserNameEmpty"> | 4238 | <alert modal="true" name="HelpReportAbuseAbuserNameEmpty"> |
4247 | <message name="message"> | 4239 | <message name="message"> |
4248 | Please enter the name of the abuser. | 4240 | Please enter the name of the abuser. |
4249 | |||
4250 | Entering an accurate value helps us file and process abuse reports. | 4241 | Entering an accurate value helps us file and process abuse reports. |
4251 | </message> | 4242 | </message> |
4252 | </alert> | 4243 | </alert> |
4253 | <alert modal="true" name="HelpReportAbuseAbuserLocationEmpty"> | 4244 | <alert modal="true" name="HelpReportAbuseAbuserLocationEmpty"> |
4254 | <message name="message"> | 4245 | <message name="message"> |
4255 | Please enter the location where the abuse took place. | 4246 | Please enter the location where the abuse took place. |
4256 | |||
4257 | Entering an accurate value helps us file and process abuse reports. | 4247 | Entering an accurate value helps us file and process abuse reports. |
4258 | </message> | 4248 | </message> |
4259 | </alert> | 4249 | </alert> |
4260 | <alert modal="true" name="HelpReportAbuseSummaryEmpty"> | 4250 | <alert modal="true" name="HelpReportAbuseSummaryEmpty"> |
4261 | <message name="message"> | 4251 | <message name="message"> |
4262 | Please enter a summary of the abuse that took place. | 4252 | Please enter a summary of the abuse that took place. |
4263 | |||
4264 | Entering an accurate summary helps us file and process abuse reports. | 4253 | Entering an accurate summary helps us file and process abuse reports. |
4265 | </message> | 4254 | </message> |
4266 | </alert> | 4255 | </alert> |
4267 | <alert modal="true" name="HelpReportBugSummaryEmpty"> | 4256 | <alert modal="true" name="HelpReportBugSummaryEmpty"> |
4268 | <message name="message"> | 4257 | <message name="message"> |
4269 | Please enter a summary of the bug. | 4258 | Please enter a summary of the bug. |
4270 | |||
4271 | Entering an accurate summary helps us file and process bug reports. | 4259 | Entering an accurate summary helps us file and process bug reports. |
4272 | </message> | 4260 | </message> |
4273 | </alert> | 4261 | </alert> |
@@ -4276,7 +4264,6 @@ Entering an accurate summary helps us file and process bug reports. | |||
4276 | Please enter a detailed description of the abuse that took place. | 4264 | Please enter a detailed description of the abuse that took place. |
4277 | Be as specific as you can, including names and the details of the | 4265 | Be as specific as you can, including names and the details of the |
4278 | incident you are reporting. | 4266 | incident you are reporting. |
4279 | |||
4280 | Entering an accurate description helps us file and process abuse reports. | 4267 | Entering an accurate description helps us file and process abuse reports. |
4281 | </message> | 4268 | </message> |
4282 | </alert> | 4269 | </alert> |
@@ -4285,7 +4272,6 @@ Entering an accurate description helps us file and process abuse reports. | |||
4285 | Please enter a detailed description of the bug. | 4272 | Please enter a detailed description of the bug. |
4286 | Be as specific as you can, including steps to reproduce the bug | 4273 | Be as specific as you can, including steps to reproduce the bug |
4287 | if possible. | 4274 | if possible. |
4288 | |||
4289 | Entering an accurate description helps us file and process bug reports. | 4275 | Entering an accurate description helps us file and process bug reports. |
4290 | </message> | 4276 | </message> |
4291 | </alert> | 4277 | </alert> |
@@ -4295,7 +4281,7 @@ Entering an accurate description helps us file and process bug reports. | |||
4295 | 4281 | ||
4296 | Reports about copyright infringement can only be submitted | 4282 | Reports about copyright infringement can only be submitted |
4297 | as described at http://secondlife.com/corporate/dmca.php. | 4283 | as described at http://secondlife.com/corporate/dmca.php. |
4298 | 4284 | ||
4299 | Reports concerning copyright infringement will automatically | 4285 | Reports concerning copyright infringement will automatically |
4300 | be discarded if they are submitted through the 'Abuse Report' | 4286 | be discarded if they are submitted through the 'Abuse Report' |
4301 | feature. If your report does not relate to copyright infringement, | 4287 | feature. If your report does not relate to copyright infringement, |
@@ -4403,9 +4389,8 @@ the contents of your Lost And Found folder? | |||
4403 | <alert modal="true" name="CopySLURL"> | 4389 | <alert modal="true" name="CopySLURL"> |
4404 | <message name="message"> | 4390 | <message name="message"> |
4405 | The following SLURL has been copied to your clipboard: | 4391 | The following SLURL has been copied to your clipboard: |
4406 | |||
4407 | [SLURL] | 4392 | [SLURL] |
4408 | 4393 | ||
4409 | Put it in a web page to give others easy access to this location or | 4394 | Put it in a web page to give others easy access to this location or |
4410 | try it out yourself by pasting it into the address bar of your web browser. | 4395 | try it out yourself by pasting it into the address bar of your web browser. |
4411 | </message> | 4396 | </message> |
@@ -4481,9 +4466,7 @@ the contents of your Lost And Found folder? | |||
4481 | <alert modal="true" name="BadURL"> | 4466 | <alert modal="true" name="BadURL"> |
4482 | <message name="message"> | 4467 | <message name="message"> |
4483 | Second Life doesn't know how to handle the link: | 4468 | Second Life doesn't know how to handle the link: |
4484 | 4469 | [SLURL] | |
4485 | [SLURL] | ||
4486 | |||
4487 | Most links are similar to this: | 4470 | Most links are similar to this: |
4488 | 4471 | ||
4489 | secondlife:///app/agent/0e346d8b-4433-4d66-a6b0- | 4472 | secondlife:///app/agent/0e346d8b-4433-4d66-a6b0- |
@@ -4492,4 +4475,40 @@ fd37083abc4c/about | |||
4492 | Please check the spelling and try again. | 4475 | Please check the spelling and try again. |
4493 | </message> | 4476 | </message> |
4494 | </alert> | 4477 | </alert> |
4478 | <alert modal="true" name="NotAgeVerified"> | ||
4479 | <message name="message"> | ||
4480 | You need to be age-verified in order to access this parcel. | ||
4481 | Would you like to visit the Second Life website to verify your age? | ||
4482 | |||
4483 | [_URL] | ||
4484 | </message> | ||
4485 | <ignore name="ignore"> | ||
4486 | Warn about lack of age verification | ||
4487 | </ignore> | ||
4488 | <option name="Yes"> | ||
4489 | Yes | ||
4490 | </option> | ||
4491 | <option name="No"> | ||
4492 | No | ||
4493 | </option> | ||
4494 | <url option="0">https://secondlife.com/account/verification.php</url> | ||
4495 | </alert> | ||
4496 | <alert modal="true" name="Cannot enter parcel: no payment info on file"> | ||
4497 | <message name="message"> | ||
4498 | This parcel requires that you have payment information on file before you can access it. | ||
4499 | Would you like to visit the Second Life website to set this up? | ||
4500 | |||
4501 | [_URL] | ||
4502 | </message> | ||
4503 | <ignore name="ignore"> | ||
4504 | Warn about lack of payment info | ||
4505 | </ignore> | ||
4506 | <option name="Yes"> | ||
4507 | Yes | ||
4508 | </option> | ||
4509 | <option name="No"> | ||
4510 | No | ||
4511 | </option> | ||
4512 | <url option="0">https://secondlife.com/account/</url> | ||
4513 | </alert> | ||
4495 | </alerts> | 4514 | </alerts> |
diff --git a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml index eb5448f..37a4e8e 100644 --- a/linden/indra/newview/skins/xui/en-us/floater_about_land.xml +++ b/linden/indra/newview/skins/xui/en-us/floater_about_land.xml | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="true" can_tear_off="true" enabled="true" height="385" | 3 | can_resize="true" can_tear_off="false" enabled="true" height="385" |
4 | hidden="false" left="367" min_height="385" min_width="460" | 4 | hidden="false" left="367" min_height="385" min_width="460" |
5 | mouse_opaque="true" name="floaterland" rect_control="FloaterLandRect5" | 5 | mouse_opaque="true" name="floaterland" rect_control="FloaterLandRect5" |
6 | title="About Land" width="460"> | 6 | title="About Land" width="460"> |
@@ -755,49 +755,111 @@ Settings: | |||
755 | <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom" | 755 | <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom" |
756 | height="333" hidden="false" label="Access" left="1" mouse_opaque="true" | 756 | height="333" hidden="false" label="Access" left="1" mouse_opaque="true" |
757 | name="land_access_panel" width="458"> | 757 | name="land_access_panel" width="458"> |
758 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 758 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
759 | bottom="-20" drop_shadow_visible="true" enabled="true" follows="left|top" | 759 | bottom="-24" drop_shadow_visible="true" enabled="true" follows="left|top" |
760 | font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false" | 760 | font="SansSerif" h_pad="0" halign="left" height="20" hidden="false" |
761 | left="4" mouse_opaque="true" name="Limit access to this parcel to:" | 761 | left="8" mouse_opaque="true" name="Limit access to this parcel to:" |
762 | v_pad="0" width="278"> | 762 | v_pad="0" width="278"> |
763 | Limit access to this parcel to: | 763 | Access To This Parcel |
764 | </text> | 764 | </text> |
765 | <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall" | 765 | |
766 | height="16" hidden="false" initial_value="false" label="Group: [GROUP]" | 766 | <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerifSmall" |
767 | left="4" mouse_opaque="true" name="GroupCheck" radio_style="false" | 767 | height="16" hidden="false" initial_value="false" label="Allow Public Access" |
768 | left="8" mouse_opaque="true" name="public_access" radio_style="false" | ||
768 | width="278" /> | 769 | width="278" /> |
769 | <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall" | 770 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
771 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="top|left" | ||
772 | font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false" | ||
773 | left_delta="20" mouse_opaque="true" name="Only Allow" | ||
774 | v_pad="0" width="278"> | ||
775 | Restrict Access To: | ||
776 | </text> | ||
777 | <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" | ||
778 | height="16" hidden="false" initial_value="false" label="Residents who have given payment info to Linden Lab" | ||
779 | left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false" width="278" | ||
780 | tool_tip="Ban unidentified residents." /> | ||
781 | <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" | ||
782 | height="16" hidden="false" initial_value="false" label="Age-verified adults" | ||
783 | left_delta="0" mouse_opaque="true" name="limit_age_verified" radio_style="false" width="278" | ||
784 | tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information." /> | ||
785 | <string name="estate_override">One ore more of these options is set at the estate level</string> | ||
786 | |||
787 | <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" | ||
788 | height="16" hidden="false" initial_value="false" label="Allow Group Access: [GROUP]" | ||
789 | left="8" mouse_opaque="true" name="GroupCheck" radio_style="false" width="278" | ||
790 | tool_tip="Set group in the General tab." /> | ||
791 | |||
792 | <check_box bottom_delta="-20" enabled="false" follows="left|top" font="SansSerifSmall" | ||
770 | height="16" hidden="false" initial_value="false" | 793 | height="16" hidden="false" initial_value="false" |
771 | label="Avatars: ([LISTED] listed, [MAX] max)" left="4" mouse_opaque="true" | 794 | label="Sell passes to:" left="8" |
772 | name="AccessCheck" radio_style="false" width="278" /> | 795 | mouse_opaque="true" name="PassCheck" radio_style="false" width="120" |
773 | <name_list allow_calling_card_drop="false" background_visible="true" bottom="-234" | 796 | tool_tip="Allows temporary access to this parcel"/> |
774 | column_padding="0" draw_border="true" draw_heading="true" heading_font="SansSerifSmall" heading_height="14" | 797 | <combo_box allow_text_entry="false" bottom_delta="0" enabled="true" follows="left|top" |
775 | enabled="true" follows="left|top|right|bottom" height="170" | 798 | height="16" hidden="false" left_delta="120" max_chars="20" mouse_opaque="true" |
776 | hidden="false" left="28" mouse_opaque="true" multi_select="false" | 799 | name="pass_combo" width="100"> |
777 | name="AccessList" width="400"> | 800 | <combo_item name="Anyone" value="anyone"> |
778 | <column label="Allowed Residents" name="name" relwidth="1.0" /> | 801 | Anyone |
802 | </combo_item> | ||
803 | <combo_item name="Group" value="group"> | ||
804 | Group | ||
805 | </combo_item> | ||
806 | </combo_box> | ||
807 | <spinner bottom_delta="-20" enabled="false" follows="left|top" height="16" hidden="false" | ||
808 | increment="1" initial_val="10" label="Price in L$:" label_width="120" | ||
809 | left="28" max_val="500" min_val="1" mouse_opaque="true" name="PriceSpin" | ||
810 | width="180" /> | ||
811 | <spinner bottom_delta="-20" enabled="false" follows="left|top" height="16" hidden="false" | ||
812 | increment="0.25" initial_val="1" label="Hours of access:" label_width="120" | ||
813 | left_delta="0" max_val="24" min_val="0.01" mouse_opaque="true" name="HoursSpin" | ||
814 | width="180" /> | ||
815 | |||
816 | |||
817 | <text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall" | ||
818 | height="16" hidden="false" initial_value="false" | ||
819 | label="Always Allow" left="20" mouse_opaque="true" | ||
820 | name="AccessCheck" radio_style="false" width="195"> | ||
821 | Allowed Residents | ||
822 | </text> | ||
823 | <name_list allow_calling_card_drop="false" background_visible="true" bottom="-320" | ||
824 | column_padding="0" draw_border="true" draw_heading="false" heading_font="SansSerifSmall" heading_height="14" | ||
825 | enabled="true" follows="left|top" height="100" | ||
826 | hidden="false" left="20" mouse_opaque="true" multi_select="true" | ||
827 | name="AccessList" width="195" | ||
828 | tool_tip="([LISTED] listed, [MAX] max)"> | ||
779 | </name_list> | 829 | </name_list> |
780 | <button bottom="-264" enabled="true" follows="left|bottom" font="SansSerifSmall" | 830 | <button bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" |
781 | halign="center" height="16" hidden="false" label="Add..." | 831 | halign="center" height="16" hidden="false" label="Add..." |
782 | label_selected="Add..." left="28" mouse_opaque="true" name="Add..." | 832 | label_selected="Add..." left_delta="5" mouse_opaque="true" name="add_allowed" |
783 | scale_image="true" width="88" /> | 833 | scale_image="true" width="80" /> |
784 | <button bottom="-264" enabled="false" follows="left|bottom" font="SansSerifSmall" | 834 | <button bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" |
785 | halign="center" height="16" hidden="false" label="Remove" | 835 | halign="center" height="16" hidden="false" label="Remove" |
786 | label_selected="Remove" left="124" mouse_opaque="true" name="Remove" | 836 | label_selected="Remove" left_delta="100" mouse_opaque="true" name="remove_allowed" |
787 | scale_image="true" width="88" /> | 837 | scale_image="true" width="80" /> |
788 | <check_box bottom="-284" enabled="false" follows="left|bottom" font="SansSerifSmall" | 838 | |
839 | <text bottom="-220" enabled="true" follows="left|right|top" font="SansSerifSmall" | ||
789 | height="16" hidden="false" initial_value="false" | 840 | height="16" hidden="false" initial_value="false" |
790 | label="Sell passes allowing temporary access:" left="28" | 841 | label="Ban" left="240" mouse_opaque="true" |
791 | mouse_opaque="true" name="PassCheck" radio_style="false" width="254" /> | 842 | name="AccessCheck" radio_style="false" width="195"> |
792 | <spinner bottom="-304" enabled="false" follows="left|bottom" height="16" hidden="false" | 843 | Banned Residents |
793 | increment="1" initial_val="10" label="Price in L$:" label_width="128" | 844 | </text> |
794 | left="76" max_val="500" min_val="1" mouse_opaque="true" name="PriceSpin" | 845 | <name_list allow_calling_card_drop="false" background_visible="true" bottom="-320" |
795 | width="206" /> | 846 | column_padding="0" draw_border="true" draw_heading="false" heading_font="SansSerifSmall" heading_height="14" |
796 | <spinner bottom="-324" enabled="false" follows="left|bottom" height="16" hidden="false" | 847 | enabled="true" follows="left|right|top|bottom" height="100" |
797 | increment="0.25" initial_val="1" label="Hours of access:" label_width="128" | 848 | hidden="false" left_delta="0" mouse_opaque="true" multi_select="true" |
798 | left="76" max_val="24" min_val="0.01" mouse_opaque="true" name="HoursSpin" | 849 | name="BannedList" width="195" |
799 | width="206" /> | 850 | tool_tip="([LISTED] listed, [MAX] max)"> |
851 | </name_list> | ||
852 | <button bottom_delta="-20" enabled="true" follows="right|bottom" font="SansSerifSmall" | ||
853 | halign="center" height="16" hidden="false" label="Add..." | ||
854 | label_selected="Add..." left_delta="5" mouse_opaque="true" name="add_banned" | ||
855 | scale_image="true" width="80" /> | ||
856 | <button bottom_delta="0" enabled="false" follows="right|bottom" font="SansSerifSmall" | ||
857 | halign="center" height="16" hidden="false" label="Remove" | ||
858 | label_selected="Remove" left_delta="100" mouse_opaque="true" name="remove_banned" | ||
859 | scale_image="true" width="80" /> | ||
860 | |||
800 | </panel> | 861 | </panel> |
862 | <!-- | ||
801 | <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom" | 863 | <panel border="false" bottom="-349" enabled="true" follows="left|top|right|bottom" |
802 | height="333" hidden="false" label="Ban" left="1" mouse_opaque="true" | 864 | height="333" hidden="false" label="Ban" left="1" mouse_opaque="true" |
803 | name="land_ban_panel" width="458"> | 865 | name="land_ban_panel" width="458"> |
@@ -840,5 +902,6 @@ Settings: | |||
840 | label="Deny Payment Info Used" left="28" mouse_opaque="true" | 902 | label="Deny Payment Info Used" left="28" mouse_opaque="true" |
841 | name="DenyTransactedCheck" radio_style="false" width="254" /> | 903 | name="DenyTransactedCheck" radio_style="false" width="254" /> |
842 | </panel> | 904 | </panel> |
905 | --> | ||
843 | </tab_container> | 906 | </tab_container> |
844 | </floater> | 907 | </floater> |
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml index a012625..0d2063d 100644 --- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml +++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="true" |
3 | can_resize="false" height="570" min_height="570" min_width="780" | 3 | can_resize="true" height="570" min_height="570" min_width="780" |
4 | name="directory" rect_control="FloaterFindRect2" | 4 | name="directory" rect_control="FloaterFindRect2" |
5 | title="Search Second Life" width="780"> | 5 | title="Search Second Life" width="780"> |
6 | <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0" | 6 | <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0" |
@@ -324,7 +324,7 @@ | |||
324 | name="incpictures" width="200" /> | 324 | name="incpictures" width="200" /> |
325 | <check_box bottom_delta="-16" control_name="ShowMatureSims" follows="left|top" | 325 | <check_box bottom_delta="-16" control_name="ShowMatureSims" follows="left|top" |
326 | font="SansSerifSmall" height="16" initial_value="false" | 326 | font="SansSerifSmall" height="16" initial_value="false" |
327 | label="Include parcels with Mature Content" left="24" mouse_opaque="true" | 327 | label="Include parcels with Restricted Content" left="24" mouse_opaque="true" |
328 | name="incmature" width="204" /> | 328 | name="incmature" width="204" /> |
329 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 329 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
330 | bottom="-38" drop_shadow_visible="true" follows="right|top" | 330 | bottom="-38" drop_shadow_visible="true" follows="right|top" |
diff --git a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml b/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml index de2c40b..f9b0f28 100644 --- a/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml +++ b/linden/indra/newview/skins/xui/en-us/floater_texture_ctrl.xml | |||
@@ -3,6 +3,7 @@ | |||
3 | can_resize="true" can_tear_off="true" enabled="true" height="290" | 3 | can_resize="true" can_tear_off="true" enabled="true" height="290" |
4 | hidden="false" left="478" min_height="290" min_width="410" | 4 | hidden="false" left="478" min_height="290" min_width="410" |
5 | mouse_opaque="true" name="texture picker" title="Pick: Texture" width="410"> | 5 | mouse_opaque="true" name="texture picker" title="Pick: Texture" width="410"> |
6 | <string name="choose_picture">"Click to choose a picture"</string> | ||
6 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 7 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
7 | bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top" | 8 | bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top" |
8 | font="SansSerifSmall" h_pad="0" halign="center" height="14" hidden="false" | 9 | font="SansSerifSmall" h_pad="0" halign="center" height="14" hidden="false" |
diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml new file mode 100644 index 0000000..6533f90 --- /dev/null +++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml | |||
@@ -0,0 +1,37 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | ||
2 | <menu_bar bottom="-18" drop_shadow="false" enabled="true" | ||
3 | follows="left|top|right" height="18" hidden="false" left="0" | ||
4 | mouse_opaque="true" name="Login Menu" opaque="true" tear_off="false" | ||
5 | width="802"> | ||
6 | <menu bottom="273" drop_shadow="true" enabled="true" height="263" | ||
7 | hidden="false" label="File" left="0" mouse_opaque="false" name="File" | ||
8 | opaque="true" tear_off="true" create_jump_keys="true" width="243"> | ||
9 | <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Quit" left="0" | ||
10 | mouse_opaque="true" name="Quit" shortcut="control|Q" width="243"> | ||
11 | <on_click function="File.Quit" userdata="" /> | ||
12 | </menu_item_call> | ||
13 | </menu> | ||
14 | <menu bottom="97" drop_shadow="true" enabled="true" height="439" | ||
15 | hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit" | ||
16 | opaque="true" tear_off="true" create_jump_keys="true" width="153"> | ||
17 | <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Preferences..." | ||
18 | left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P" | ||
19 | width="153"> | ||
20 | <on_click function="ShowFloater" userdata="preferences" /> | ||
21 | </menu_item_call> | ||
22 | </menu> | ||
23 | <menu bottom="219" drop_shadow="true" enabled="true" height="317" | ||
24 | hidden="false" label="Help" left="80" mouse_opaque="false" name="Help" | ||
25 | opaque="true" tear_off="true" create_jump_keys="true" width="166"> | ||
26 | <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help" | ||
27 | left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1" | ||
28 | width="166"> | ||
29 | <on_click function="ShowFloater" userdata="help f1" /> | ||
30 | </menu_item_call> | ||
31 | <menu_item_call bottom="-48" enabled="true" height="19" hidden="false" | ||
32 | label="About Second Life..." left="0" mouse_opaque="true" | ||
33 | name="About Second Life..." width="166"> | ||
34 | <on_click function="ShowFloater" userdata="about" /> | ||
35 | </menu_item_call> | ||
36 | </menu> | ||
37 | </menu_bar> | ||
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml index 3b289d4..8643c7e 100644 --- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml | |||
@@ -43,7 +43,7 @@ | |||
43 | left="0" mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W" | 43 | left="0" mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W" |
44 | width="243"> | 44 | width="243"> |
45 | <on_click function="File.CloseAllWindows" userdata="" /> | 45 | <on_click function="File.CloseAllWindows" userdata="" /> |
46 | <on_enable function="File.EnableCloseWindow" userdata="" /> | 46 | <on_enable function="File.EnableCloseAllWindows" userdata="" /> |
47 | </menu_item_call> | 47 | </menu_item_call> |
48 | <menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------" | 48 | <menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------" |
49 | left="0" mouse_opaque="true" name="separator2" width="243" /> | 49 | left="0" mouse_opaque="true" name="separator2" width="243" /> |
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml index ad9e049..cbd2789 100644 --- a/linden/indra/newview/skins/xui/en-us/notify.xml +++ b/linden/indra/newview/skins/xui/en-us/notify.xml | |||
@@ -970,4 +970,24 @@ Click Accept to join the call or Decline to decline the invitation. Click Mute t | |||
970 | We are creating a voice channel for you. This may take up to one minute. | 970 | We are creating a voice channel for you. This may take up to one minute. |
971 | </message> | 971 | </message> |
972 | </notify> | 972 | </notify> |
973 | <notify name="VoiceLoginRetry" tip="true" unique="true" duration="10"> | ||
974 | <message name="message"> | ||
975 | We are creating a voice channel for you. This may take up to one minute. | ||
976 | </message> | ||
977 | </notify> | ||
978 | <notify name="Cannot enter parcel: not a group member" tip="true"> | ||
979 | <message name="message"> | ||
980 | Cannot enter parcel, you are not a member of the appropriate group. | ||
981 | </message> | ||
982 | </notify> | ||
983 | <notify name="Cannot enter parcel: banned" tip="true"> | ||
984 | <message name="message"> | ||
985 | Cannot enter parcel, you have been banned. | ||
986 | </message> | ||
987 | </notify> | ||
988 | <notify name="Cannot enter parcel: not on access list" tip="true"> | ||
989 | <message name="message"> | ||
990 | Cannot enter parcel, you are not on the access list. | ||
991 | </message> | ||
992 | </notify> | ||
973 | </notifications> | 993 | </notifications> |
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml index fa64706..c5c42b4 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml | |||
@@ -28,6 +28,12 @@ | |||
28 | <text hidden="true" name="NoPaymentInfoOnFile"> | 28 | <text hidden="true" name="NoPaymentInfoOnFile"> |
29 | No Payment Info On File | 29 | No Payment Info On File |
30 | </text> | 30 | </text> |
31 | <text hidden="true" name="AgeVerified"> | ||
32 | , Age-verified | ||
33 | </text> | ||
34 | <text hidden="true" name="NotAgeVerified"> | ||
35 | , Not Age-verified | ||
36 | </text> | ||
31 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 37 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
32 | bottom="-24" drop_shadow_visible="true" follows="left|top" | 38 | bottom="-24" drop_shadow_visible="true" follows="left|top" |
33 | font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" | 39 | font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4" |
diff --git a/linden/indra/newview/skins/xui/en-us/panel_login.xml b/linden/indra/newview/skins/xui/en-us/panel_login.xml index 6652a63..062eba1 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_login.xml | |||
@@ -6,95 +6,9 @@ | |||
6 | start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" | 6 | start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" |
7 | top="-1" /> | 7 | top="-1" /> |
8 | <text hidden="true" name="real_url"> | 8 | <text hidden="true" name="real_url"> |
9 | http://secondlife.com/app/login/ | 9 | https://secondlife.com/app/login/en/?show_login_form=True |
10 | </text> | 10 | </text> |
11 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 11 | <text hidden="true" name="forgot_password_url"> |
12 | bottom="54" drop_shadow_visible="true" follows="left|bottom" | 12 | http://secondlife.com/account/request.php |
13 | font="SansSerif" h_pad="0" halign="left" height="16" hidden="false" | ||
14 | left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120"> | ||
15 | First Name: | ||
16 | </text> | ||
17 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24" | ||
18 | follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" | ||
19 | height="20" hidden="false" left="32" max_length="31" mouse_opaque="true" | ||
20 | name="first_name_edit" select_all_on_focus_received="true" width="120" /> | ||
21 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
22 | bottom="54" drop_shadow_visible="true" follows="left|bottom" | ||
23 | font="SansSerif" h_pad="0" halign="left" height="16" hidden="false" | ||
24 | left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120"> | ||
25 | Last Name: | ||
26 | </text> | ||
27 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24" | ||
28 | follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" | ||
29 | height="20" hidden="false" left="164" max_length="31" mouse_opaque="true" | ||
30 | name="last_name_edit" select_all_on_focus_received="true" width="120" /> | ||
31 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
32 | bottom="54" drop_shadow_visible="true" follows="left|bottom" | ||
33 | font="SansSerif" h_pad="0" halign="left" height="16" hidden="false" | ||
34 | left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120"> | ||
35 | Password: | ||
36 | </text> | ||
37 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24" | ||
38 | follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" | ||
39 | height="20" hidden="false" left="296" max_length="16" mouse_opaque="true" | ||
40 | name="password_edit" select_all_on_focus_received="true" width="120" /> | ||
41 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
42 | bottom="10" drop_shadow_visible="true" follows="left|bottom" | ||
43 | font="SansSerif" h_pad="0" halign="left" height="16" hidden="false" | ||
44 | left="32" mouse_opaque="true" name="start_location_text" v_pad="0" | ||
45 | width="85"> | ||
46 | Start Location: | ||
47 | </text> | ||
48 | <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18" | ||
49 | hidden="false" left_delta="97" max_chars="128" mouse_opaque="true" | ||
50 | name="start_location_combo" width="140"> | ||
51 | <combo_item name="MyHome" value="My Home"> | ||
52 | My Home | ||
53 | </combo_item> | ||
54 | <combo_item name="MyLastLocation" value="My Last Location"> | ||
55 | My Last Location | ||
56 | </combo_item> | ||
57 | <combo_item name="Typeregionname" value="<Type region name>"> | ||
58 | <Type region name> | ||
59 | </combo_item> | ||
60 | </combo_box> | ||
61 | <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16" | ||
62 | hidden="false" initial_value="false" label="Remember password" | ||
63 | left_delta="167" mouse_opaque="true" name="remember_check" width="138" /> | ||
64 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
65 | bottom="74" drop_shadow_visible="true" follows="left|bottom" | ||
66 | font="SansSerifSmall" h_pad="0" halign="left" height="20" hidden="false" | ||
67 | left="32" mouse_opaque="true" name="full_screen_text" v_pad="0" width="300"> | ||
68 | Viewer will display full screen when logged in. | ||
69 | </text> | ||
70 | <button bottom="46" follows="left|bottom" font="SansSerif" halign="center" height="24" | ||
71 | hidden="false" label="New Account..." label_selected="New Account..." | ||
72 | left="440" mouse_opaque="true" name="new_account_btn" scale_image="TRUE" | ||
73 | width="120" /> | ||
74 | <button bottom="46" follows="left|bottom" font="SansSerif" halign="center" height="24" | ||
75 | hidden="false" label="Preferences..." label_selected="Preferences..." | ||
76 | left="572" mouse_opaque="true" name="preferences_btn" scale_image="TRUE" | ||
77 | width="120" /> | ||
78 | <combo_box allow_text_entry="true" bottom="48" follows="left|bottom" height="18" | ||
79 | hidden="false" left_delta="128" max_chars="20" mouse_opaque="true" | ||
80 | name="server_combo" width="120" /> | ||
81 | <button bottom_delta="-28" follows="left|bottom" font="SansSerif" halign="center" | ||
82 | height="24" hidden="false" label="Connect" label_selected="Connect" | ||
83 | left="440" mouse_opaque="true" name="connect_btn" scale_image="TRUE" | ||
84 | width="120" /> | ||
85 | <button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center" | ||
86 | height="24" hidden="false" label="Quit" label_selected="Quit" left="572" | ||
87 | mouse_opaque="true" name="quit_btn" scale_image="TRUE" width="120" /> | ||
88 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
89 | bottom="2" drop_shadow_visible="true" follows="right|bottom" | ||
90 | font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false" | ||
91 | left="698" mouse_opaque="true" name="version_text" v_pad="0" width="100"> | ||
92 | 1.23.4 (5) | ||
93 | </text> | ||
94 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
95 | bottom="14" drop_shadow_visible="true" follows="right|bottom" | ||
96 | font="SansSerifSmall" h_pad="0" halign="right" height="12" hidden="false" | ||
97 | left="698" mouse_opaque="true" name="channel_text" v_pad="0" width="300"> | ||
98 | [Viewer Channel Name] | ||
99 | </text> | 13 | </text> |
100 | </panel> | 14 | </panel> |
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml index 13d5f81..4a75032 100644 --- a/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml +++ b/linden/indra/newview/skins/xui/en-us/panel_region_estate.xml | |||
@@ -24,9 +24,9 @@ regions in the estate. | |||
24 | (unknown) | 24 | (unknown) |
25 | </text> | 25 | </text> |
26 | 26 | ||
27 | <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-280" follows="top|left" | 27 | <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-265" follows="top|left" |
28 | height="275" left="6" width="250" /> | 28 | height="260" left="6" width="250" /> |
29 | <check_box bottom_delta="252" follows="left|top" height="20" label="Use Global Time" | 29 | <check_box bottom_delta="235" follows="left|top" height="20" label="Use Global Time" |
30 | left="12" name="use_global_time_check" width="200" /> | 30 | left="12" name="use_global_time_check" width="200" /> |
31 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" | 31 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" |
32 | right="250" name="use_global_time_help" width="18" /> | 32 | right="250" name="use_global_time_help" width="18" /> |
@@ -39,61 +39,42 @@ regions in the estate. | |||
39 | <slider bottom_delta="-25" follows="left|top" height="20" increment="0.001" | 39 | <slider bottom_delta="-25" follows="left|top" height="20" increment="0.001" |
40 | label="Phase" left="12" max_val="30" min_val="6" name="sun_hour_slider" | 40 | label="Phase" left="12" max_val="30" min_val="6" name="sun_hour_slider" |
41 | show_text="false" width="200" /> | 41 | show_text="false" width="200" /> |
42 | <check_box bottom_delta="-26" follows="left|top" height="20" label="Public Access" | 42 | <check_box bottom_delta="-26" follows="left|top" height="20" label="Allow Public Access" |
43 | left="12" name="externally_visible_check" width="200" /> | 43 | left="12" name="externally_visible_check" width="200" /> |
44 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" | 44 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" |
45 | right="250" name="externally_visible_help" width="18" /> | 45 | right="250" name="externally_visible_help" width="18" /> |
46 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | ||
47 | bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="top|left" | ||
48 | font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false" | ||
49 | left="32" mouse_opaque="true" name="Only Allow" | ||
50 | v_pad="0" width="278"> | ||
51 | Restrict Access To: | ||
52 | </text> | ||
53 | <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" | ||
54 | height="16" hidden="false" initial_value="false" label="Residents with payment info on file" | ||
55 | left_delta="0" mouse_opaque="true" name="limit_payment" radio_style="false" width="278" | ||
56 | tool_tip="Ban unidentified residents."/> | ||
57 | <check_box bottom_delta="-20" enabled="true" follows="top|left" font="SansSerifSmall" | ||
58 | height="16" hidden="false" initial_value="false" label="Age-verified adults" | ||
59 | left_delta="0" mouse_opaque="true" name="limit_age_verified" radio_style="false" width="278" | ||
60 | tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."/> | ||
61 | |||
46 | <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Voice Chat" | 62 | <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Voice Chat" |
47 | left="12" name="voice_chat_check" width="200" /> | 63 | left="12" name="voice_chat_check" width="200" /> |
48 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" | 64 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" |
49 | right="250" name="voice_chat_help" width="18" /> | 65 | right="250" name="voice_chat_help" width="18" /> |
50 | 66 | ||
51 | <!-- | ||
52 | <check_box name="mainland_visible_check" | ||
53 | label="Mainland Visible From Here" | ||
54 | left="15" | ||
55 | bottom_delta="-20" | ||
56 | width="80" | ||
57 | height="20" | ||
58 | follows="left|top" | ||
59 | /> | ||
60 | <button name="mainland_visible_help" | ||
61 | label="?" | ||
62 | left="185" | ||
63 | bottom_delta="0" | ||
64 | width="18" | ||
65 | height="18" | ||
66 | follows="left|top" | ||
67 | font="SansSerifSmall" | ||
68 | /> | ||
69 | --> | ||
70 | <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport" left="12" name="allow_direct_teleport" width="80" /> | 67 | <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport" left="12" name="allow_direct_teleport" width="80" /> |
71 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" | 68 | <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" |
72 | right="250" name="allow_direct_teleport_help" width="18" /> | 69 | right="250" name="allow_direct_teleport_help" width="18" /> |
73 | <text bottom_delta="-28" follows="left|top" font="SansSerifSmall" height="20" | 70 | <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply" |
74 | left="12" name="region_text_lbl" width="210"> | ||
75 | Deny Access on Payment Status: | ||
76 | </text> | ||
77 | <check_box bottom_delta="-16" follows="left|top" height="20" | ||
78 | label="Deny No Payment Info On File" left="12" name="deny_anonymous" | ||
79 | width="80" /> | ||
80 | <check_box bottom_delta="-18" follows="left|top" height="20" | ||
81 | label="Deny Payment Info On File" left="12" name="deny_identified" | ||
82 | width="80" /> | ||
83 | <check_box bottom_delta="-18" follows="left|top" height="20" | ||
84 | label="Deny Payment Info Used" left="12" name="deny_transacted" width="80" /> | ||
85 | <text bottom_delta="-23" follows="left|top" height="20" | ||
86 | left="15" name="abuse_email_text" width="100" visible="false"> | ||
87 | [Abuse E-mail Beta] | ||
88 | </text> | ||
89 | <button bottom_delta="-8" enabled="false" follows="left|top" height="20" label="Apply" | ||
90 | right="250" name="apply_btn" width="90" /> | 71 | right="250" name="apply_btn" width="90" /> |
91 | 72 | ||
92 | 73 | ||
93 | <button bottom="-468" enabled="true" follows="left|top" height="20" | 74 | <button bottom="-468" enabled="true" follows="left|top" height="20" |
94 | label="Kick User from Estate..." left="8" | 75 | label="Kick User from Estate..." left="8" |
95 | name="kick_user_from_estate_btn" width="250" /> | 76 | name="kick_user_from_estate_btn" width="250" /> |
96 | <button bottom_delta="23" follows="left|top" height="20" | 77 | <button bottom_delta="23" follows="left|top" height="20" |
97 | label="Send Message To Estate..." left="8" name="message_estate_btn" | 78 | label="Send Message To Estate..." left="8" name="message_estate_btn" |
98 | width="250" /> | 79 | width="250" /> |
99 | 80 | ||
diff --git a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml b/linden/indra/newview/skins/xui/en-us/teleport_strings.xml index 80b5cc4..feac150 100644 --- a/linden/indra/newview/skins/xui/en-us/teleport_strings.xml +++ b/linden/indra/newview/skins/xui/en-us/teleport_strings.xml | |||
@@ -3,53 +3,53 @@ | |||
3 | <message_set name="errors"> | 3 | <message_set name="errors"> |
4 | <message name="invalid_tport"> | 4 | <message name="invalid_tport"> |
5 | Problem encountered processing your teleport request. You may | 5 | Problem encountered processing your teleport request. You may |
6 | need to log back in before you can teleport. If you continue | 6 | need to log back in before you can teleport. If you continue |
7 | to get this message, please check the Tech Support FAQ at: | 7 | to get this message, please check the Tech Support FAQ at: |
8 | www.secondlife.com/support | 8 | www.secondlife.com/support |
9 | </message> | 9 | </message> |
10 | <message name="invalid_region_handoff"> | 10 | <message name="invalid_region_handoff"> |
11 | Problem encountered processing your region crossing. You may | 11 | Problem encountered processing your region crossing. You may |
12 | need to log back in before you can cross regions. If you continue | 12 | need to log back in before you can cross regions. If you continue |
13 | to get this message, please check the Tech Support FAQ at: | 13 | to get this message, please check the Tech Support FAQ at: |
14 | www.secondlife.com/support. | 14 | www.secondlife.com/support. |
15 | </message> | 15 | </message> |
16 | <message name="blocked_tport"> | 16 | <message name="blocked_tport"> |
17 | Sorry, teleport is currently blocked. Try again in a moment. | 17 | Sorry, teleport is currently blocked. Try again in a moment. |
18 | If you still cannot teleport, please log out and log back in to | 18 | If you still cannot teleport, please log out and log back in to |
19 | resolve the problem. | 19 | resolve the problem. |
20 | </message> | 20 | </message> |
21 | <message name="nolandmark_tport"> | 21 | <message name="nolandmark_tport"> |
22 | Sorry, but system was unable to locate landmark destination. | 22 | Sorry, but system was unable to locate landmark destination. |
23 | </message> | 23 | </message> |
24 | <message name="timeout_tport"> | 24 | <message name="timeout_tport"> |
25 | Sorry, but system was unable to complete the teleport connection. | 25 | Sorry, but system was unable to complete the teleport connection. |
26 | Try again in a moment. | 26 | Try again in a moment. |
27 | </message> | 27 | </message> |
28 | <message name="noaccess_tport"> | 28 | <message name="noaccess_tport"> |
29 | Sorry, you do not have access to that teleport destination. | 29 | Sorry, you do not have access to that teleport destination. |
30 | </message> | 30 | </message> |
31 | <message name="missing_attach_tport"> | 31 | <message name="missing_attach_tport"> |
32 | Your attachments have not arrived yet. Try waiting for a few | 32 | Your attachments have not arrived yet. Try waiting for a few |
33 | more seconds or log out and back in again before attempting | 33 | more seconds or log out and back in again before attempting |
34 | to teleport. | 34 | to teleport. |
35 | </message> | 35 | </message> |
36 | <message name="too_many_uploads_tport"> | 36 | <message name="too_many_uploads_tport"> |
37 | The asset queue in this region is currently clogged so your teleport | 37 | The asset queue in this region is currently clogged so your teleport |
38 | request will not be able to succeed in a timely manner. Please try again | 38 | request will not be able to succeed in a timely manner. Please try again |
39 | in a few minutes or go to a less busy area. | 39 | in a few minutes or go to a less busy area. |
40 | </message> | 40 | </message> |
41 | <message name="expired_tport"> | 41 | <message name="expired_tport"> |
42 | Sorry, but the system was unable to complete your teleport request | 42 | Sorry, but the system was unable to complete your teleport request |
43 | in a timely fashion. Please try again in a few minutes. | 43 | in a timely fashion. Please try again in a few minutes. |
44 | </message> | 44 | </message> |
45 | <message name="expired_region_handoff"> | 45 | <message name="expired_region_handoff"> |
46 | Sorry, but the system was unable to complete your region crossing | 46 | Sorry, but the system was unable to complete your region crossing |
47 | in a timely fashion. Please try again in a few minutes. | 47 | in a timely fashion. Please try again in a few minutes. |
48 | </message> | 48 | </message> |
49 | <message name="no_host"> | 49 | <message name="no_host"> |
50 | Unable to find teleport destination. The destination may be | 50 | Unable to find teleport destination. The destination may be |
51 | temporarily unavailable or no longer exists. Please try again | 51 | temporarily unavailable or no longer exists. Please try again |
52 | in a few minutes. | 52 | in a few minutes. |
53 | </message> | 53 | </message> |
54 | <message name="no_inventory_host"> | 54 | <message name="no_inventory_host"> |
55 | The inventory system is currently unavailable. | 55 | The inventory system is currently unavailable. |