From 6eba5e3a3273bc664dfd760a5016118cc8066f34 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 21 Mar 2022 01:46:45 -0400
Subject: [PATCH] Fix up some opensim localization issues
---
indra/newview/llappviewer.cpp | 3 +-
indra/newview/llchathistory.cpp | 2 +-
indra/newview/llgiveinventory.cpp | 2 +-
.../skins/default/xui/en/floater_tos.xml | 2 +-
.../skins/default/xui/en/notifications.xml | 42 +++++++--------
.../newview/skins/default/xui/en/strings.xml | 54 +++++++++----------
6 files changed, 53 insertions(+), 52 deletions(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b55931858c5..017b9c7627c 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -430,8 +430,9 @@ class LLDeferredTaskList final : public LLSingleton<LLDeferredTaskList>
static std::set<std::string> default_trans_args;
void init_default_trans_args()
{
- default_trans_args.insert("ALCHEMY"); // World
+ default_trans_args.insert("CURRENT_GRID");
default_trans_args.insert("SECOND_LIFE"); // World
+ default_trans_args.insert("GRID_ADMIN");
default_trans_args.insert("APP_NAME");
default_trans_args.insert("CAPITALIZED_APP_NAME");
default_trans_args.insert("SECOND_LIFE_GRID");
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 3cd1673f615..723a57a8446 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -703,7 +703,7 @@ class LLChatHistoryHeader: public LLPanel
else if (chat.mFromName.empty()
|| mSourceType == CHAT_SOURCE_SYSTEM)
{
- mFrom = LLTrans::getString("ALCHEMY");
+ mFrom = LLTrans::getString("APP_NAME");
if(!chat.mFromName.empty() && (mFrom != chat.mFromName))
{
mFrom += " (" + chat.mFromName + ")";
diff --git a/indra/newview/llgiveinventory.cpp b/indra/newview/llgiveinventory.cpp
index cdab6093854..cbc4b59bde4 100644
--- a/indra/newview/llgiveinventory.cpp
+++ b/indra/newview/llgiveinventory.cpp
@@ -350,7 +350,7 @@ void LLGiveInventory::logInventoryOffer(const LLUUID& to_agent, const LLUUID &im
std::string full_name = LLCacheName::buildUsername(av_name.getUserName());
LLUIString message = LLTrans::getString(message_name + "-im");
message.setArgs(args);
- LLIMModel::instance().logToFile(full_name, LLTrans::getString("ALCHEMY"), im_session_id, message.getString());
+ LLIMModel::instance().logToFile(full_name, LLTrans::getString("APP_NAME"), im_session_id, message.getString());
}
}
}
diff --git a/indra/newview/skins/default/xui/en/floater_tos.xml b/indra/newview/skins/default/xui/en/floater_tos.xml
index a8db0aca4ed..493dad009c3 100644
--- a/indra/newview/skins/default/xui/en/floater_tos.xml
+++ b/indra/newview/skins/default/xui/en/floater_tos.xml
@@ -27,7 +27,7 @@
top="20"
word_wrap="true"
width="552">
- Please read the following Second Life Terms and Conditions, Privacy Policy, and Terms of Service, including the requirements for the use of arbitration and the waiver of any class or group claim to resolve disputes. To continue logging in to [SECOND_LIFE], you must accept these agreements.
+ Please read the following Terms and Conditions, Privacy Policy, and Terms of Service, including the requirements for the use of arbitration and the waiver of any class or group claim to resolve disputes. To continue logging in to [CURRENT_GRID], you must accept these agreements.
</text>
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3659e16c0de..f64a92fb3a4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -628,7 +628,7 @@ Save all changes to clothing/body parts?
icon="alertmodal.tga"
name="AllowMultipleViewers"
type="alertmodal">
- Running multiple Second Life viewers is not supported. It can lead to texture cache collisions, corruption and degraded visuals and performance.
+ Running multiple [APP_NAME] viewers is not supported. It can lead to texture cache collisions, corruption and degraded visuals and performance.
<usetemplate
name="okbutton"
yestext="OK"/>
@@ -1075,7 +1075,7 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
icon="alertmodal.tga"
name="ConfirmLandSaleToAnyoneChange"
type="alertmodal">
-ATTENTION: Clicking 'sell to anyone' makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
+ATTENTION: Clicking 'sell to anyone' makes your land available to the entire [CURRENT_GRID] community, even those not in this region.
The selected [LAND_SIZE] m² land is being set for sale.
Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
@@ -1326,7 +1326,7 @@ There was a problem uploading a report screenshot due to the following reason: [
name="MustAgreeToLogIn"
type="alertmodal">
<tag>fail</tag>
-You must agree to the Second Life Terms and Conditions, Privacy Policy, and Terms of Service to continue logging into [SECOND_LIFE].
+You must agree to the Terms and Conditions, Privacy Policy, and Terms of Service to continue logging into [CURRENT_GRID].
</notification>
<notification
@@ -1391,7 +1391,7 @@ Please enter your Password to log in.
Oops! Something was left blank.
You need to enter the Username name of your avatar.
-You need an account to enter [SECOND_LIFE]. Would you like to create one now?
+You need an account to enter [CURRENT_GRID]. Would you like to create one now?
<tag>confirm</tag>
<url
option="0"
@@ -1509,7 +1509,7 @@ Delete pick <nolink>[PICK]</nolink>?
icon="alertmodal.tga"
name="PromptGoToEventsPage"
type="alertmodal">
-Go to the [SECOND_LIFE] events web page?
+Go to the [CURRENT_GRID] events web page?
<tag>confirm</tag>
<url option="0" name="url">
@@ -1615,7 +1615,7 @@ Changing language will take effect after you restart [APP_NAME].
icon="alertmodal.tga"
name="GoToAuctionPage"
type="alertmodal">
- Go to the [SECOND_LIFE] web page to see auction details or make a bid?
+ Go to the [CURRENT_GRID] web page to see auction details or make a bid?
<tag>confirm</tag>
<url option="0" name="url">
http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]
@@ -1775,7 +1775,7 @@ The object may be out of range or may have been deleted.
type="alert">
<unique/>
<tag>confirm</tag>
- You have requested a file download, which is not supported within [ALCHEMY].
+ You have requested a file download, which is not supported within [APP_NAME].
<usetemplate
ignoretext="Warn about unsupported file downloads"
name="okignore"
@@ -3067,7 +3067,7 @@ This is usually a temporary failure. Please customize and save the wearable agai
icon="alertmodal.tga"
name="YouHaveBeenLoggedOut"
type="alertmodal">
-Darn. You have been logged out of [SECOND_LIFE].
+Darn. You have been logged out of [CURRENT_GRID].
[MESSAGE]
<usetemplate
@@ -3679,7 +3679,7 @@ You may want to set a new home location.
type="alertmodal">
<tag>fail</tag>
Your clothing is still downloading.
-You can use [SECOND_LIFE] normally and other people will see you correctly.
+You can use [CURRENT_GRID] normally and other people will see you correctly.
<form name="form">
<ignore name="ignore"
text="Clothing is taking a long time to download"/>
@@ -3736,7 +3736,7 @@ Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Renderin
[APP_NAME] installation is complete.
-If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
+If this is your first time using [CURRENT_GRID], you will need to create an account before you can log in.
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
@@ -3774,7 +3774,7 @@ We're having trouble connecting. There may be a problem with your Internet
You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
<url option="1" name="url">
- http://secondlife.com/support/
+ https://git.alchemyviewer.org/alchemy/alchemy-next/issues
</url>
<form name="form">
<button
@@ -3802,7 +3802,7 @@ We're having trouble connecting. There may be a problem with your Internet
You can either check your Internet connection and try again in a few minutes or click Help to view the [SUPPORT_SITE].
<url option="1" name="url">
- http://secondlife.com/support/
+ https://git.alchemyviewer.org/alchemy/alchemy-next/issues
</url>
<form name="form">
<button
@@ -3836,7 +3836,7 @@ Local Data you are deleting is shared between multiple grids, are you sure you w
Your character will appear in a moment.
Use arrow keys to walk.
-Press the F1 key at any time for help or to learn more about [SECOND_LIFE].
+Press the F1 key at any time for help or to learn more about [CURRENT_GRID].
Please choose the male or female avatar. You can change your mind later.
<usetemplate
name="okcancelbuttons"
@@ -4316,7 +4316,7 @@ Go to your [http://secondlife.com/account/ Dashboard] to manage your account?
icon="alertmodal.tga"
name="WebLaunchSecurityIssues"
type="alertmodal">
-Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
+Visit the [CURRENT_GRID] Wiki for details of how to report a security issue.
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to learn how to report a Security Issue"
@@ -4329,7 +4329,7 @@ Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
icon="alertmodal.tga"
name="WebLaunchQAWiki"
type="alertmodal">
-Visit the [SECOND_LIFE] QA Wiki.
+Visit the [CURRENT_GRID] QA Wiki.
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to view the QA Wiki"
@@ -4342,7 +4342,7 @@ Visit the [SECOND_LIFE] QA Wiki.
icon="alertmodal.tga"
name="WebLaunchPublicIssue"
type="alertmodal">
-Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
+Visit the [CURRENT_GRID] Public Issue Tracker, where you can report bugs and other issues.
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to use the Public Issue Tracker"
@@ -6245,15 +6245,15 @@ 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 [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] [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 [SECOND_LIFE] 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 [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our [http://secondlife.com/corporate/dmca.php DMCA Policy].
+(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].
If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category 'CopyBot or Permissions Exploit'.
Thank you,
-Linden Lab
+[CURRENT_GRID]
</notification>
<notification
@@ -6679,7 +6679,7 @@ Would you like to automatically wear the clothing you are about to create?
icon="alertmodal.tga"
name="Cannot enter parcel: no payment info on file"
type="alertmodal">
-You must have payment information on file to visit this area. Do you want to go to the [SECOND_LIFE] website and set this up?
+You must have payment information on file to visit this area. Do you want to go to the [CURRENT_GRID] website and set this up?
[_URL]
<tag>confirm</tag>
@@ -12067,7 +12067,7 @@ Error: [STATUS] [REASON]
icon="notify.tga"
name="SecondLifePasswordTooLong"
type="notify">
- Due to a bug in the Second Life signup process, your password is longer than 16 characters and had been truncated to allow logging in.
+ Due to a bug in the [CURRENT_GRID] signup process, your password is longer than 16 characters and had been truncated to allow logging in.
</notification>
<notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a2ed595b26b..fda6fc2da86 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -6,12 +6,16 @@
<strings>
<!-- Default Args - these arguments will be replaced in all strings -->
- <string name="SECOND_LIFE">Second Life</string>
- <string name="ALCHEMY">Alchemy</string>
+ <string name="SECOND_LIFE">[CURRENT_GRID]</string>
<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="SECOND_LIFE_GRID">[CURRENT_GRID] Grid</string>
+ <string name="SUPPORT_SITE">Support Portal</string>
+
+ <!-- Default Args set in LLViewerNetwork -->
+ <string name="CURRENT_GRID"/>
+ <string name="GRID_ADMIN"/>
+
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
@@ -132,7 +136,7 @@ Voice Server Version: [VOICE_VERSION]
<string name="ViewerDownloadURL">https://www.alchemyviewer.org/pages/downloads.html</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:
+ The viewer you are using can no longer access [CURRENT_GRID]. Please visit the following page to download a new viewer:
https://www.alchemyviewer.org/pages/downloads.html</string>
<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>
<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>
@@ -144,47 +148,43 @@ 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 [GRID_ADMIN] 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.
+
+People 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://support.secondlife.com.</string>
+Please contact [CURRENT_GRID] support for assistance.</string>
<string name="LoginFailedTransformError">Data inconsistency found during login.
-Please contact support@secondlife.com.</string>
+Please contact [CURRENT_GRID] support.</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>
+If you feel this is an error, please contact [CURRENT_GRID] support.</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.
Please wait a minute before you try logging in again.</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>
+If you feel this is an error, please contact [CURRENT_GRID] support.</string>
<string name="LoginFailedIncorrectParameters">Incorrect parameters.
-If you feel this is an error, please contact support@secondlife.com.</string>
+If you feel this is an error, please contact [CURRENT_GRID] support.</string>
<string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric.
-If you feel this is an error, please contact support@secondlife.com.</string>
+If you feel this is an error, please contact [CURRENT_GRID] support.</string>
<string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric.
-If you feel this is an error, please contact support@secondlife.com.</string>
+If you feel this is an error, please contact [CURRENT_GRID] support.</string>
<string name="LogoutFailedRegionGoingOffline">Region is going offline.
Please try logging in again in a minute.</string>
<string name="LogoutFailedAgentNotInRegion">Agent not in region.
@@ -909,7 +909,7 @@ Returns the rotation velocity in radians per second
</string>
<string name="LSLTipText_llGetTimeOfDay" translate="false">
float llGetTimeOfDay()
-Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
+Returns the time in seconds since [CURRENT_GRID] server midnight or since region up-time, whichever is smaller
</string>
<string name="LSLTipText_llGetWallclock" translate="false">
float llGetWallclock()
--
GitLab