From 0ff65651cc219eef959c5e961663de2a07595e5a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 27 Jun 2018 23:52:02 +0100
Subject: [PATCH] MAINT-8011 make newly created Sky, Water, etc create a system
 folder with proper icon

Add entries to strings.xml for all langs for the "settings" string.
---
 indra/llinventory/llfoldertype.cpp             | 2 ++
 indra/llinventory/llfoldertype.h               | 2 ++
 indra/newview/llviewerfoldertype.cpp           | 3 ++-
 indra/newview/skins/default/xui/da/strings.xml | 3 +++
 indra/newview/skins/default/xui/de/strings.xml | 3 +++
 indra/newview/skins/default/xui/en/strings.xml | 3 ++-
 indra/newview/skins/default/xui/es/strings.xml | 3 +++
 indra/newview/skins/default/xui/fr/strings.xml | 3 +++
 indra/newview/skins/default/xui/it/strings.xml | 3 +++
 indra/newview/skins/default/xui/ja/strings.xml | 3 +++
 indra/newview/skins/default/xui/pl/strings.xml | 3 +++
 indra/newview/skins/default/xui/ru/strings.xml | 3 +++
 indra/newview/skins/default/xui/tr/strings.xml | 3 +++
 indra/newview/skins/default/xui/zh/strings.xml | 3 +++
 14 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index 2c8c82a62b1..067b22ee27c 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -100,6 +100,8 @@ LLFolderDictionary::LLFolderDictionary()
 	addEntry(LLFolderType::FT_MARKETPLACE_STOCK,    new FolderEntry("stock",    FALSE));
 	addEntry(LLFolderType::FT_MARKETPLACE_VERSION,  new FolderEntry("version",    FALSE));
 		 
+    addEntry(LLFolderType::FT_SETTINGS,             new FolderEntry("settings", FALSE));
+
 	addEntry(LLFolderType::FT_NONE, 				new FolderEntry("-1",		FALSE));
 };
 
diff --git a/indra/llinventory/llfoldertype.h b/indra/llinventory/llfoldertype.h
index 515bb05a3f1..85b86f9ce54 100644
--- a/indra/llinventory/llfoldertype.h
+++ b/indra/llinventory/llfoldertype.h
@@ -91,6 +91,8 @@ class LL_COMMON_API LLFolderType
 		FT_MARKETPLACE_STOCK = 54,
 		FT_MARKETPLACE_VERSION = 55,    // Note: We actually *never* create folders with that type. This is used for icon override only.
 
+        FT_SETTINGS = 56,
+
 		FT_COUNT,
 
 		FT_NONE = -1
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 9cb2e0336a3..afa84a5afc1 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -133,7 +133,8 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"Inv_LookFolderOpen",	"Inv_LookFolderClosed",	TRUE,      true));
 	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"Inv_SysOpen",			"Inv_SysClosed",		TRUE,      true));
 	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     true));
-	
+	addEntry(LLFolderType::FT_SETTINGS, 		    new ViewerFolderEntry("Settings",			    "Inv_SysOpen",			"Inv_SysClosed",		FALSE,     true));
+
 	bool boxes_invisible = !gSavedSettings.getBOOL("InventoryOutboxMakeVisible");
 	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Received Items",			"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     boxes_invisible));
 	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Merchant Outbox",		"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     true));
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 74d160dfaec..80d75e31945 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -560,6 +560,9 @@ Prøv venligst om lidt igen.
 	<string name="mesh">
 		mesh
 	</string>
+    <string name="settings">
+        indstillinger
+    </string>
 	<string name="AvatarEditingAppearance">
 		(Redigering Udseende)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 3e660076272..fbb96b3ca06 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -792,6 +792,9 @@ besuchen Sie bitte http://secondlife.com/support
 	<string name="mesh">
 		mesh
 	</string>
+    <string name="settings">
+        Einstellungen
+    </string> 
 	<string name="AvatarEditingAppearance">
 		(Aussehen wird bearbeitet)
 	</string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a40b94a542d..74171a86cc7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -395,7 +395,8 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="symbolic link">link</string>
 	<string name="symbolic folder link">folder link</string>
   <string name="mesh">mesh</string>
-
+  <string name="settings">settings</string>
+  
 	<!-- llvoavatar. Displayed in the avatar chat bubble -->
 	<string name="AvatarEditingAppearance">(Editing Appearance)</string>
 	<string name="AvatarAway">Away</string>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 341c6d2fe83..87c123125ca 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -781,6 +781,9 @@ http://secondlife.com/support para obtener ayuda sobre cómo solucionar este pro
 	<string name="mesh">
 		red
 	</string>
+    <string name="settings">
+        configuración
+    </string>
 	<string name="AvatarEditingAppearance">
 		(Edición de Apariencia)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index d76beee93d2..8b7269b915e 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -793,6 +793,9 @@ http://secondlife.com/support pour vous aider à résoudre ce problème.
 	<string name="mesh">
 		maillage
 	</string>
+    <string name="settings">
+        paramètres
+    </string>
 	<string name="AvatarEditingAppearance">
 		(Apparence en cours de modification)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index ad74e161708..a51b8ebf75e 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -786,6 +786,9 @@ http://secondlife.com/support per risolvere il problema.
 	<string name="mesh">
 		reticolo
 	</string>
+    <string name="settings">
+        impostazioni
+    </string>
 	<string name="AvatarEditingAppearance">
 		(Modifica Aspetto)
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 5ca7ddd92c3..d901e0ba63c 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -792,6 +792,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="mesh">
 		メッシュ
 	</string>
+    <string name="settings">
+        設定
+    </string>
 	<string name="AvatarEditingAppearance">
 		（容姿の編集中）
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 9aece1221d7..91fea234d2a 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -710,6 +710,9 @@ Spróbuj zalogować się ponownie za minutę.
 	<string name="mesh">
 		mesz
 	</string>
+    <string name="settings">
+        ustawień
+    </string>
 	<string name="AvatarEditingAppearance">
 		(Edycja wyglÄ…du)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 95225da7d0b..ac6209b1f27 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -790,6 +790,9 @@ support@secondlife.com.
 	<string name="mesh">
 		сетка
 	</string>
+    <string name="settings">
+        настроек
+    </string>
 	<string name="AvatarEditingAppearance">
 		(внешний вид редактируется)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 6850c67df33..3bbff7bfde1 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -790,6 +790,9 @@ http://secondlife.com/support adresini ziyaret edin.
 	<string name="mesh">
 		örgü
 	</string>
+    <string name="settings">
+        ayarlar
+    </string>
 	<string name="AvatarEditingAppearance">
 		(Görünümü Düzenliyor)
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index e4f9c5d4330..bc63c5af74c 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -786,6 +786,9 @@ http://secondlife.com/support 求助解決問題。
 	<string name="mesh">
 		網面
 	</string>
+    <string name="settings">
+        的設定
+    </string>
 	<string name="AvatarEditingAppearance">
 		（外觀編輯中）
 	</string>
-- 
GitLab