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: 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/newview/skins/default/xui/da/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins/default/xui/da')

diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 74d160dfae..80d75e3194 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>
-- 
cgit v1.2.3


From 195f69f603613c3270050169c6a42f84307f8163 Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Fri, 24 Jan 2020 16:45:36 -0700
Subject: SL-12594, remove the Basic Shaders checkbox from the gui

---
 indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/da')

diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index e494b2b755..c7770eb81b 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -29,7 +29,6 @@
 		<check_box initial_value="true" label="Gennemsigtig vand" name="TransparentWater"/>
 		<check_box initial_value="true" label="Glatte flader og skin" name="BumpShiny"/>
 		<check_box initial_value="true" label="Lokale lys" name="LocalLights"/>
-		<check_box initial_value="true" label="Basale flader" name="BasicShaders" tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher."/>
 		<check_box initial_value="true" label="Atmosfæriske flader" name="WindLightUseAtmosShaders"/>
 		<check_box initial_value="true" label="Lys og skygger" name="UseLightShaders"/>
 		<check_box initial_value="true" label="&quot;Ambient Occlusion&quot;" name="UseSSAO"/>
-- 
cgit v1.2.3