Merge branch 'branding' into weekly, with some post merge branding tweeks.

1 files changed, 9 insertions, 9 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ac8b236..5077a74 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1027,7 +1027,7 @@
   <key>SearchURLDefault</key>
   <map>
     <key>Comment</key>
-    <string>URL to load for empty Second Life searches</string>
+    <string>URL to load for empty searches</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>HideFromEditor</key>
@@ -1053,7 +1053,7 @@
   <key>SearchURLQuery</key>
   <map>
     <key>Comment</key>
-    <string>URL to use for Second Life searches</string>
+    <string>URL to use for searches</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>HideFromEditor</key>
@@ -1079,7 +1079,7 @@
   <key>SearchURLSuffix2</key>
   <map>
     <key>Comment</key>
-    <string>Parameters added to end of Second Life search queries</string>
+    <string>Parameters added to end of search queries</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>HideFromEditor</key>
@@ -1127,7 +1127,7 @@
   <key>ShowcaseURLDefault</key>
   <map>
     <key>Comment</key>
-    <string>URL to load for the Showcase tab in Second Life</string>
+    <string>URL to load for the Showcase tab</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -7708,7 +7708,7 @@
     <key>LoginAsGod</key>
     <map>
       <key>Comment</key>
-      <string>Attempt to login with god powers (Linden accounts only)</string>
+      <string>Attempt to login with god powers (grid staff accounts only)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -8405,7 +8405,7 @@
     <key>NumSessions</key>
     <map>
       <key>Comment</key>
-      <string>Number of successful logins to Second Life</string>
+      <string>Number of successful logins to grids</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -11160,7 +11160,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>default</string>
+      <string>Meta7</string>
     </map>
     <key>SkyAmbientScale</key>
     <map>
@@ -11228,7 +11228,7 @@
     <key>SkyUseClassicClouds</key>
     <map>
       <key>Comment</key>
-      <string>Whether to use the old Second Life particle clouds or not</string>
+      <string>Whether to use the old particle clouds or not</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -13480,7 +13480,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>Imprudence</string>
+      <string>meta-impy</string>
     </map>
     <key>VertexShaderEnable</key>
     <map>