From b3fcf53a65ffa270106b9680771ad5fad8ee8fc5 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 12 Jun 2021 01:56:19 -0400
Subject: [PATCH] Fix a few branding issues
---
indra/newview/llappviewer.cpp | 1 +
indra/newview/skins/default/xui/en/notifications.xml | 2 +-
indra/newview/skins/default/xui/en/strings.xml | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c062f46e4d1..ce28a5870e5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -422,6 +422,7 @@ 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("SECOND_LIFE"); // World
default_trans_args.insert("APP_NAME");
default_trans_args.insert("CAPITALIZED_APP_NAME");
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af8abbc1a0d..a5096e44517 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1787,7 +1787,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 [SECOND_LIFE].
+ You have requested a file download, which is not supported within [ALCHEMY].
<usetemplate
ignoretext="Warn about unsupported file downloads"
name="okignore"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c430e44939b..eb4e22d97d5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -7,6 +7,7 @@
<!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">Second Life</string>
+ <string name="ALCHEMY">Alchemy</string>
<string name="APP_NAME">Alchemy</string>
<string name="CAPITALIZED_APP_NAME">ALCHEMY</string>
<string name="SECOND_LIFE_GRID">Second Life Grid</string>
--
GitLab