Skip to content
Snippets Groups Projects
Commit 4717df19 authored by ¡Cinder! ㊝'s avatar ¡Cinder! ㊝ :speech_balloon:
Browse files

DeLindenize a ton of proper nouns

parent 891984ca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 68 additions and 79 deletions
indra/llwindow/llwindowmacosx.cpp
+ 6
− 6
View file @ 4717df19
......@@ -64,17 +64,17 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
if (!strnicmp(RENDERER, bad_card, strlen(bad_card)))
{
std::string buffer = llformat(
"Your video card appears to be a %s, which Second Life does not support.\n"
"Your video card appears to be a %s, which Alchemy does not support.\n"
"\n"
"Second Life requires a video card with 32 Mb of memory or more, as well as\n"
"Alchemy requires a video card with 32 Mb of memory or more, as well as\n"
"multitexture support. We explicitly support nVidia GeForce 2 or better, \n"
"and ATI Radeon 8500 or better.\n"
"and ATI Radeon 8500 or better... A LOT better. lol\n"
"\n"
"If you own a supported card and continue to receive this message, try \n"
"updating to the latest video card drivers. Otherwise look in the\n"
"secondlife.com support section or e-mail technical support\n"
"\n"
"You can try to run Second Life, but it will probably crash or run\n"
"You can try to run Alchemy, but it will probably crash or run\n"
"very slowly. Try anyway?",
bad_card);
S32 button = OSMessageBox(buffer.c_str(), "Unsupported video card", OSMB_YESNO);
......@@ -173,10 +173,10 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
if (!gGLManager.initGL())
{
setupFailure(
"Second Life is unable to run because your video card drivers\n"
"Alchemy is unable to run because your video card drivers\n"
"are out of date or unsupported. Please make sure you have\n"
"the latest video card drivers installed.\n"
"If you continue to receive this message, contact customer service.",
"If you continue to receive this message, contact support.",
"Error",
OSMB_OK);
return;
......
indra/newview/app_settings/ignorable_dialogs.xml
+ 1
− 1
View file @ 4717df19
......@@ -81,7 +81,7 @@
<key>FirstReceiveLindens</key>
<map>
<key>Comment</key>
<string>Shows hint when resident receives linden dollars</string>
<string>Shows hint when resident receives a payment</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
......
indra/newview/app_settings/keywords_lsl_default.xml
+ 2
− 2
View file @ 4717df19
......@@ -6523,7 +6523,7 @@
</map>
</array>
<key>tooltip</key>
<string>This event is triggered when a resident has given an amount of Linden dollars to the object.</string>
<string>This event is triggered when a resident has paid the object.</string>
</map>
<key>moving_end</key>
<map>
......@@ -17760,7 +17760,7 @@
</map>
</array>
<key>tooltip</key>
<string>Transfer Amount of linden dollars (L$) from script owner to AvatarID. Returns a key to a corresponding transaction_result event for the success of the transfer.\nAttempts to send the amount of money to the specified avatar, and trigger a transaction_result event identified by the returned key.</string>
<string>Transfer Amount of money from script owner to AvatarID. Returns a key to a corresponding transaction_result event for the success of the transfer.\nAttempts to send the amount of money to the specified avatar, and trigger a transaction_result event identified by the returned key.</string>
</map>
<key>llTriggerSound</key>
<map>
......
indra/newview/lllogininstance.cpp
+ 2
− 2
View file @ 4717df19
......@@ -276,7 +276,7 @@ void MandatoryUpdateMachine::CheckingForUpdate::enter(void)
mProgressView = gViewerWindow->getProgressView();
mProgressView->setMessage("Looking for update...");
mProgressView->setText("There is a required update for your Second Life installation.");
mProgressView->setText("There is a required update for your viewer installation.");
mProgressView->setPercent(0);
mProgressView->setVisible(true);
mConnection = LLEventPumps::instance().obtain(LLUpdaterService::pumpName()).
......@@ -428,7 +428,7 @@ void MandatoryUpdateMachine::WaitingForDownload::enter(void)
mProgressView = gViewerWindow->getProgressView();
mProgressView->setMessage("Downloading update...");
std::ostringstream stream;
stream << "There is a required update for your Second Life installation." << std::endl <<
stream << "There is a required update for your viewer installation." << std::endl <<
"Version " << mMachine.mUpdaterService.updatedVersion();
mProgressView->setText(stream.str());
mProgressView->setPercent(0);
......
indra/newview/skins/default/xui/en/floater_media_browser.xml
+ 1
− 1
View file @ 4717df19
......@@ -13,7 +13,7 @@
width="820">
<floater.string
name="home_page_url">
http://www.secondlife.com
http://www.alchemyviewer.org/
</floater.string>
<floater.string
name="support_page_url">
......
indra/newview/skins/default/xui/en/menu_viewer.xml
+ 3
− 0
View file @ 4717df19
......@@ -375,6 +375,9 @@
function="Communicate.VoiceMorphing.NoVoiceMorphing.Check" />
<menu_item_check.on_click
function="Communicate.VoiceMorphing.NoVoiceMorphing.Click" />
<menu_item_call.on_visible
function="EnableGrid"
parameter="secondlife" />
</menu_item_check>
<menu_item_separator/>
<menu_item_check
......
indra/newview/skins/default/xui/en/notifications.xml
+ 13
− 13
View file @ 4717df19
......@@ -187,7 +187,7 @@ No tutorial is currently available.
icon="alertmodal.tga"
name="BadInstallation"
type="alertmodal">
An error occurred while updating [APP_NAME]. Please [http://get.secondlife.com download the latest version] of the Viewer.
An error occurred while updating [APP_NAME]. Please [http://www.alchemyviewer.org download the latest version] of the viewer.
<tag>fail</tag>
<usetemplate
name="okbutton"
......@@ -3758,7 +3758,7 @@ Download to your Applications folder?
type="alertmodal">
An error occurred installing the viewer update.
Please download and install the latest viewer from
http://secondlife.com/download.
http://www.alchemyviewer.org/
<usetemplate
name="okbutton"
yestext="OK"/>
......@@ -3772,7 +3772,7 @@ We were unable to install a required update.
You will be unable to log in until [APP_NAME] has been updated.
Please download and install the latest viewer from
http://secondlife.com/download.
http://www.alchemyviewer.org/
<tag>fail</tag>
<usetemplate
name="okbutton"
......@@ -3783,14 +3783,14 @@ http://secondlife.com/download.
icon="alertmodal.tga"
name="UpdaterServiceNotRunning"
type="alertmodal">
There is a required update for your Second Life Installation.
There is a required update for your viewer installation.
You may download this update from http://www.secondlife.com/downloads
You may download this update from https://alchemyviewer.org/
or you can install it now.
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="Quit Second Life"
notext="Quit [APP_NAME]"
yestext="Download and install now"/>
</notification>
......@@ -5706,7 +5706,7 @@ You cannot undo this action.
type="alert">
<unique/>
Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards].
Use this tool to report violations of the Terms of Service and Community Standards.
All reported abuses are investigated and resolved.
</notification>
......@@ -5765,7 +5765,7 @@ Dear Resident,
You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [CURRENT_GRID] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [CURRENT_GRID] [http://secondlife.com/corporate/tos.php Terms of Service] or [http://secondlife.com/corporate/cs.php Community Standards]. However, the Abuse Team does not handle and will not respond to requests to remove content from the [CURRENT_GRID] world.
(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [CURRENT_GRID] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [CURRENT_GRID] Terms of Service and Community Standards. However, the Abuse Team does not handle and will not respond to requests to remove content from the [CURRENT_GRID] world.
(2) The DMCA or Content Removal Process. To request removal of content from [CURRENT_GRID], you MUST submit a valid notification of infringement as provided in our [http://secondlife.com/corporate/dmca.php DMCA Policy].
......@@ -5773,7 +5773,7 @@ If you still wish to continue with the abuse process, please close this window a
Thank you,
Linden Lab
[CURRENT_GRID]
</notification>
<notification
......@@ -6074,7 +6074,7 @@ You can&apos;t buy an object while it is attached.
label="About Requests for the Debit Permission"
name="DebitPermissionDetails"
type="alertmodal">
Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
Granting this request gives a script ongoing permission to take funds (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
<usetemplate
name="okbutton"
yestext="OK"/>
......@@ -7649,7 +7649,7 @@ Scripts associated with this experience will be able to do the following on regi
priority="critical"
persist="true"
type="notify">
Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your inworld L$ account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
Do not allow access if you do not fully understand why it wants access to your account.
......@@ -8623,10 +8623,10 @@ Click and drag anywhere on the world to rotate your view
<notification
name="HintLindenDollar"
label="You've got Linden Dollars!"
label="You've got L$!"
type="hint">
<unique/>
Here's your current balance of L$. Click Buy L$ to purchase more Linden Dollars.
Here's your current balance of L$.
<tag>funds</tag>
</notification>
......
indra/newview/skins/default/xui/en/panel_edit_profile.xml
+ 1
− 1
View file @ 4717df19
......@@ -30,7 +30,7 @@
value="Charter Member" />
<string
name="AcctTypeEmployee"
value="Linden Lab Employee" />
value="[CURRENT_GRID] Employee" />
<string
name="PaymentInfoUsed"
value="Payment Info Used" />
......
indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+ 1
− 1
View file @ 4717df19
......@@ -6,7 +6,7 @@
name="panel_facebook_friends">
<string
name="facebook_friends_empty"
value="You currently do not have any Facebook friends who are also Second Life residents. Ask your Facebook friends to join Second Life today!" />
value="You currently do not have any Facebook friends who are also [CURRENT_GRID] residents." />
<string
name="facebook_friends_no_connected"
value="You're currently not connected to Facebook. Please go to the Status tab to connect and enable this feature." />
......
indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+ 2
− 2
View file @ 4717df19
......@@ -173,7 +173,7 @@
top="4"
name="favorite"
image_drag_indication="Accordion_ArrowOpened_Off"
tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
tool_tip="Drag Landmarks here for quick access to your favorite places!"
width="320">
<label
follows="left|top"
......@@ -182,7 +182,7 @@
left="10"
name="favorites_bar_label"
text_color="LtGray"
tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
tool_tip="Drag Landmarks here for quick access to your favorite places!"
top="13"
valign="bottom"
width="102">
......
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+ 1
− 1
View file @ 4717df19
......@@ -159,7 +159,7 @@
width="480" />
<radio_item
height="20"
label="Use built-in browser for Second Life links only"
label="Use built-in browser for inworld links only"
layout="topleft"
left_delta="0"
name="external"
......
indra/newview/skins/default/xui/en/panel_region_environment.xml
+ 1
− 1
View file @ 4717df19
......@@ -38,7 +38,7 @@
top_delta="20"
width="200">
<radio_item
label="Use Second Life default"
label="Use Region default"
layout="topleft"
name="use_sl_default_settings"/>
<radio_item
......
indra/newview/skins/default/xui/en/role_actions.xml
+ 2
− 2
View file @ 4717df19
......@@ -56,8 +56,8 @@
<action description="Deed land and buy land for group"
longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
name="land deed" value="12" />
<action description="Abandon land to Governor Linden"
longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
<action description="Abandon landn"
longdescription="Abandon land. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to grid ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
name="land release" value="13" />
<action description="Set land for sale info"
longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
......
indra/newview/skins/default/xui/en/strings.xml
+ 32
− 46
View file @ 4717df19
......@@ -9,9 +9,10 @@
<string name="SECOND_LIFE">[CURRENT_GRID]</string> <!-- I'd like to drop this but server supplied strings use it -->
<string name="APP_NAME">Alchemy</string>
<string name="CAPITALIZED_APP_NAME">ALCHEMY</string>
<string name="SECOND_LIFE_GRID">Second Life Grid</string>
<string name="SUPPORT_SITE">Second Life Support Portal</string>
<string name="CURRENT_GRID"/> <!-- Set in LLViewerNetwork -->
<string name="SECOND_LIFE_GRID">[CURRENT_GRID] Grid</string>
<string name="SUPPORT_SITE">Support Portal</string>
<string name="CURRENT_GRID"/> <!-- Set in LLViewerNetwork -->
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
......@@ -98,13 +99,10 @@ Voice Server Version: [VOICE_VERSION]
<string name="LoginFailed">Login failed.</string>
<string name="Quit">Quit</string>
<string name="ViewerDownloadURL">http://secondlife.com/download</string>
<string name="ViewerDownloadURL">http://www.alchemyviewer.org/</string>
<string name="LoginFailedViewerNotPermitted">
The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
http://secondlife.com/download
For more information, see our FAQ below:
http://secondlife.com/viewer-access-faq</string>
The viewer you are using can no longer access [CURRENT_GRID]. Please visit the following page to download a new viewer:
http://www.alchemyviewer.org/</string>
<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>
<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>
<string name="LoginFailedAlreadyLoggedIn">This agent is already logged in.
......@@ -115,49 +113,38 @@ Please check to make sure you entered the right
* Password
Also, please make sure your Caps Lock key is off.</string>
<string name="LoginFailedPasswordChanged">As a security precaution your password has been changed.
Please go to your account page at http://secondlife.com/password
and answer the security question to reset your password.
Please go to your account page and answer the security question to reset your password.
We are very sorry for the inconvenience.</string>
<string name="LoginFailedPasswordReset">We made some changes to our system and you will need to reset your password.
Please go to your account page at http://secondlife.com/password
and answer the security question to reset your password.
Please go to your account page and answer the security question to reset your password.
We are very sorry for the inconvenience.</string>
<string name="LoginFailedEmployeesOnly">Second Life is temporarily closed for maintenance.
Logins are currently restricted to employees only.
Check www.secondlife.com/status for updates.</string>
<string name="LoginFailedPremiumOnly">Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience.
People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life.</string>
<string name="LoginFailedComputerProhibited">Second Life cannot be accessed from this computer.
If you feel this is an error, please contact
support@secondlife.com.</string>
<string name="LoginFailedEmployeesOnly">[CURRENT_GRID] is temporarily closed for maintenance.
Logins are currently restricted to employees only.</string>
<string name="LoginFailedPremiumOnly">[CURRENT_GRID] logins are temporarily restricted in order to make sure that those in-world have the best possible experience.
Freetards with free accounts will not be able to access [CURRENT_GRID] during this time, to make room for those who have paid for [CURRENT_GRID].</string>
<string name="LoginFailedComputerProhibited">[CURRENT_GRID] cannot be accessed from this computer.
If you feel this is an error, please contact support.</string>
<string name="LoginFailedAcountSuspended">Your account is not accessible until
[TIME] Pacific Time.</string>
<string name="LoginFailedAccountDisabled">We are unable to complete your request at this time.
Please contact Second Life support for assistance at http://secondlife.com/support.
If you are unable to change your password, please call (866) 476-9763.</string>
<string name="LoginFailedTransformError">Data inconsistency found during login.
Please contact support@secondlife.com.</string>
Please contact [CURRENT_GRID] support for assistance.</string>
<string name="LoginFailedTransformError">Data inconsistency found during login.</string>
<string name="LoginFailedAccountMaintenance">Your account is undergoing minor maintenance.
Your account is not accessible until
[TIME] Pacific Time.
If you feel this is an error, please contact support@secondlife.com.</string>
[TIME] Pacific Time.</string>
<string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string>
<string name="LoginFailedPendingLogout">The system is logging you out right now.
Your Account will not be available until
[TIME] Pacific Time.</string>
<string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string>
<string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string>
<string name="LoginFailedRestrictedHours">Your account can only access Second Life
<string name="LoginFailedRestrictedHours">Your account can only access [CURRENT_GRID]
between [START] and [END] Pacific Time.
Please come back during those hours.
If you feel this is an error, please contact support@secondlife.com.</string>
<string name="LoginFailedIncorrectParameters">Incorrect parameters.
If you feel this is an error, please contact support@secondlife.com.</string>
<string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric.
If you feel this is an error, please contact support@secondlife.com.</string>
<string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric.
If you feel this is an error, please contact support@secondlife.com.</string>
Please come back during those hours.</string>
<string name="LoginFailedIncorrectParameters">Incorrect parameters.</string>
<string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric.</string>
<string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric.</string>
<string name="LogoutFailedRegionGoingOffline">Region is going offline.
Please try logging in again in a minute.</string>
<string name="LogoutFailedAgentNotInRegion">Agent not in region.
......@@ -479,7 +466,7 @@ Please try logging in again in a minute.</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
<string name="ScriptTakeMoney">Take funds (L$) from you</string>
<string name="ActOnControlInputs">Act on your control inputs</string>
<string name="RemapControlInputs">Remap your control inputs</string>
<string name="AnimateYourAvatar">Animate your avatar</string>
......@@ -2123,7 +2110,7 @@ Requests that a nonphysical object be keyframed according to keyframe list.
</string>
<string name="LSLTipText_llTransferLindenDollars" translate="false">
key llTransferLindenDollars(key destination, integer amount)
Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
Transfer amount of funds (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
</string>
<string name="LSLTipText_llGetParcelMusicURL" translate="false">
string llGetParcelMusicURL()
......@@ -2612,7 +2599,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<string name="AcctTypeResident">Resident</string>
<string name="AcctTypeTrial">Trial</string>
<string name="AcctTypeCharterMember">Charter Member</string>
<string name="AcctTypeEmployee">Linden Lab Employee</string>
<string name="AcctTypeEmployee">[CURRENT_GRID] Employee</string>
<string name="PaymentInfoUsed">Payment Info Used</string>
<string name="PaymentInfoOnFile">Payment Info On File</string>
<string name="NoPaymentInfoOnFile">No Payment Info On File</string>
......@@ -2782,7 +2769,7 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<!-- Region/Estate Covenant -->
<string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string>
<string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string>
<string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not [CURRENT_GRID]. Please contact the Estate Owner for sales details.</string>
<string name="covenant_last_modified" value="Last Modified: " /> <!-- use value="" to keep the trailing space -->
<string name="none_text" value=" (none) " />
<string name="never_text" value=" (never) " />
......@@ -2958,7 +2945,7 @@ Do you wish to continue?
<string name="MBWarning">Warning</string>
<string name="MBNoAutoUpdate">
Automatic updating is not yet implemented for Linux.
Please download the latest version from www.secondlife.com.
Please download the latest version from www.alchemyviewer.org.
</string>
<string name="MBRegClassFailed">RegisterClass failed</string>
<string name="MBError">Error</string>
......@@ -3601,7 +3588,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Failed to download update
</string>
<string name="UpdaterFailUpdateDescriptive">
An error occurred while updating [APP_NAME]. Please download the latest version from www.secondlife.com.
An error occurred while updating [APP_NAME]. Please download the latest version from www.alchemyviewer.org.
</string>
<string name="UpdaterFailInstallTitle">
Failed to install update
......@@ -3900,10 +3887,9 @@ Abuse Report</string>
<string name="words_separator" value=", "/>
<string name="server_is_down">
Despite our best efforts, something unexpected has gone wrong.
Oh god, despite our best efforts, something unexpected has gone wrong.
Please check status.secondlifegrid.net to see if there is a known problem with the service.
If you continue to experience problems, please check your network and firewall setup.
If you continue to experience problems, please check your network and firewall setup.
</string>
<!-- overriding datetime formating.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment