Merge remote branch 'develop' into marchcat/xcode-16

22 files changed, 107 insertions, 453 deletions

diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml
index 4a4b7269dc..283a7b2a43 100644
--- a/indra/newview/skins/default/xui/da/notifications.xml
+++ b/indra/newview/skins/default/xui/da/notifications.xml
@@ -1574,6 +1574,10 @@ Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik p
 		Den aktive stemme "morph" er udløbet og din normale stemme opsætning er genaktiveret.
 [[URL] Click here] for at forny dit abbonnement.
 	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		En eller flere af dine stemme &quot;morphs&quot; vil udløbe om mindre end [INTERVAL] dage.
+[[URL] Click here] for at forny dit abbonnement.
+	</notification>
 	<notification name="VoiceEffectsNew">
 		Nye stemme &quot;morphs&quot; er tilgængelige!
 	</notification>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 76bebedeec..6ad71e0ad1 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -2466,6 +2466,10 @@ Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice
 [[URL] Klicken Sie hier], um Ihr Abo zu erneuern. 
 
 Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.</notification>
+	<notification name="VoiceEffectsWillExpire">Ein oder mehrere Ihrer Voice-Morph-Abos laufen in weniger als [INTERVAL] Tagen ab. 
+[[URL] Klicken Sie hier], um Ihr Abo zu erneuern. 
+
+Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.</notification>
 	<notification name="VoiceEffectsNew">Neue Voice-Morph-Effekte sind erhältlich!</notification>
 	<notification name="Cannot enter parcel: not a group member">Nur Mitglieder einer bestimmten Gruppe dürfen diesen Bereich betreten.</notification>
 	<notification name="Cannot enter parcel: banned">Zugang zur Parzelle verweigert. Sie wurden verbannt.</notification>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index a9e7626dc5..486d604e9f 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -31,7 +31,6 @@ Sichtweite: [DRAW_DISTANCE] m
 Bandbreite: [NET_BANDWITH] kbit/s
 LOD-Faktor: [LOD_FACTOR]
 Darstellungsqualität: [RENDER_QUALITY]
-Erweitertes Beleuchtungsmodell: [GPU_SHADERS]
 Texturspeicher: [TEXTURE_MEMORY] MB</string>
 	<string name="AboutOSXHiDPI">HiDPI-Anzeigemodus: [HIDPI]</string>
 	<string name="AboutLibs">J2C-Decoderversion: [J2C_VERSION]
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
deleted file mode 100644
index 37339f79c8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_post_process.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="18"
- height="400"
- layout="topleft"
- name="Post-Process Floater"
- help_topic="post_process_floater"
- title="POST-PROCESS SETTINGS"
- width="400">
-    <tab_container
-     follows="left|top"
-     height="400"
-     layout="topleft"
-     left="0"
-     name="Post-Process Tabs"
-     tab_position="top"
-     top="0"
-     width="400">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Color Filter"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         help_topic="post_process_color_filter_tab"
-         name="wmiColorFilterPanel"
-         top="0"
-         width="398">
-            <check_box
-             control_name="wmiColorFilterToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiColorFilterToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterBrightnessText"
-             top_pad="4"
-             width="355">
-                Brightness
-            </text>
-            <slider
-             control_name="wmiColorFilterBrightness"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="4"
-             name="wmiColorFilterBrightness"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterSaturationText"
-             top_pad="4"
-             width="355">
-                Saturation
-            </text>
-            <slider
-             control_name="wmiColorFilterSaturation"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="2"
-             min_val="-1"
-             name="wmiColorFilterSaturation"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterContrastText"
-             top_pad="4"
-             width="355">
-                Contrast
-            </text>
-            <slider
-             control_name="wmiColorFilterContrast"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="4"
-             name="wmiColorFilterContrast"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterBaseText"
-             top_pad="4"
-             width="355">
-                Contrast Base Color
-            </text>
-            <slider
-             control_name="wmiColorFilterBaseR"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="R"
-             layout="topleft"
-             left_delta="4"
-             name="wmiColorFilterBaseR"
-             top_pad="20"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseG"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="G"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseG"
-             top_pad="10"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseB"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="B"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseB"
-             top_pad="10"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseI"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="I"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseI"
-             top_pad="10"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Night Vision"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="post_process_night_vision_tab"
-         name="wmiNightVisionPanel"
-         top_delta="-236"
-         width="398">
-            <check_box
-             control_name="wmiNightVisionToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiNightVisionToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionBrightMultText"
-             top_pad="5"
-             width="355">
-                Light Amplification Multiple
-            </text>
-            <slider
-             control_name="wmiNightVisionBrightMult"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="3.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="10"
-             min_val="1"
-             name="wmiNightVisionBrightMult"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionNoiseSizeText"
-             top_pad="4"
-             width="355">
-                Noise Size
-            </text>
-            <slider
-             control_name="wmiNightVisionNoiseSize"
-             follows="left"
-             height="10"
-             initial_value="1"
-             layout="topleft"
-             left_delta="4"
-             max_val="100"
-             min_val="1"
-             name="wmiNightVisionNoiseSize"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionNoiseStrengthText"
-             top_pad="4"
-             width="355">
-                Noise Strength
-            </text>
-            <slider
-             control_name="wmiNightVisionNoiseStrength"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.3"
-             layout="topleft"
-             left_delta="4"
-             name="wmiNightVisionNoiseStrength"
-             top_pad="20"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Bloom"
-         layout="topleft"
-         left_delta="0"
-         help_topic="post_process_bloom_tab"
-         name="wmiBloomPanel"
-         top_delta="-236"
-         width="398">
-            <check_box
-             control_name="wmiBloomToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiBloomToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomExtractText"
-             top_pad="5"
-             width="355">
-                Luminosity Extraction
-            </text>
-            <slider
-             control_name="wmiBloomExtract"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.9"
-             layout="topleft"
-             left_delta="4"
-             name="wmiBloomExtract"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomSizeText"
-             top_pad="4"
-             width="355">
-                Bloom Size
-            </text>
-            <slider
-             control_name="wmiBloomSize"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="3.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="20"
-             name="wmiBloomSize"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomStrengthText"
-             top_pad="4"
-             width="355">
-                Bloom Strength
-            </text>
-            <slider
-             control_name="wmiBloomStrength"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.2"
-             layout="topleft"
-             left_delta="4"
-             max_val="10"
-             name="wmiBloomStrength"
-             top_pad="20"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Extras"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="post_process_extras_tab"
-         name="Extras"
-         top_delta="-236"
-         width="398">
-            <button
-             height="20"
-             label="LoadEffect"
-             label_selected="LoadEffect"
-             layout="topleft"
-             left="15"
-             name="PPLoadEffect"
-             top="13"
-             width="100" />
-            <button
-             height="20"
-             label="SaveEffect"
-             label_selected="SaveEffect"
-             layout="topleft"
-             left_delta="0"
-             name="PPSaveEffect"
-             top_pad="7"
-             width="100" />
-            <combo_box
-             height="18"
-             layout="topleft"
-             left_delta="120"
-             name="PPEffectsCombo"
-             top="15"
-             width="150" />
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|right|bottom"
-             font="SansSerif"
-             height="20"
-             label="Effect Name"
-             layout="topleft"
-             left_delta="0"
-             max_length_bytes="40"
-             name="PPEffectNameEditor"
-             tab_group="1"
-             top_pad="22"
-             width="150" />
-        </panel>
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 43cdf30ba0..ec2dffb5e5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -465,24 +465,6 @@
           <menu_item_check.on_click
            function="World.AlwaysRun" />
         </menu_item_check>
-        <menu_item_check
-          label="Hear Media and Sound from Avatar"
-          name="Hear Media and Sound from Avatar">
-          <menu_item_check.on_check
-           control="MediaSoundsEarLocation" />
-          <menu_item_check.on_click
-           function="Agent.ToggleHearMediaSoundFromAvatar" />
-        </menu_item_check>
-        <menu_item_check
-          label="Hear Voice from Avatar"
-          name="Hear Voice from Avatar">
-          <menu_item_check.on_check
-           control="VoiceEarLocation" />
-          <menu_item_check.on_click
-           function="Agent.ToggleHearVoiceFromAvatar" />
-          <menu_item_call.on_enable
-           control="EnableVoiceChat" />
-        </menu_item_check>
       <menu_item_separator/>
       <menu_item_check
        label="Gestures..."
@@ -580,6 +562,25 @@
         </menu_item_check>
         <menu_item_separator/>
         <menu_item_check
+          label="Hear Media and Sound from Avatar"
+          name="Hear Media and Sound from Avatar">
+            <menu_item_check.on_check
+             control="MediaSoundsEarLocation" />
+            <menu_item_check.on_click
+             function="Agent.ToggleHearMediaSoundFromAvatar" />
+        </menu_item_check>
+        <menu_item_check
+          label="Hear Voice from Avatar"
+          name="Hear Voice from Avatar">
+            <menu_item_check.on_check
+             control="VoiceEarLocation" />
+            <menu_item_check.on_click
+             function="Agent.ToggleHearVoiceFromAvatar" />
+            <menu_item_call.on_enable
+             control="EnableVoiceChat" />
+        </menu_item_check>
+        <menu_item_separator/>
+        <menu_item_check
          label="Gestures..."
          name="Gestures"
          shortcut="control|G">
@@ -3466,6 +3467,16 @@ function="World.EnvPreset"
                  function="Advanced.HandleAttachedLightParticles"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
+            <menu_item_check
+             label="Collect Font Vertex Buffers"
+             name="Collect Font Vertex Buffers">
+                <menu_item_check.on_check
+                 function="CheckControl"
+                 parameter="CollectFontVertexBuffers" />
+                <menu_item_check.on_click
+                 function="ToggleControl"
+                 parameter="CollectFontVertexBuffers" />
+            </menu_item_check>
           <menu_item_separator />
           <menu_item_check
              label="Enable Shader Cache"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 848d9aca7c..071f6458c5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7556,7 +7556,7 @@ Message from [NAME]:
    type="notify">
     <unique/>
 This land has damage enabled.
-You can be hurt here. If you die, you will be teleported to your home location.
+You can be hurt here. If you die, you might be teleported to your home location or to the spawn point.
   </notification>
 
   <notification
@@ -8860,6 +8860,25 @@ If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice mo
 
   <notification
    icon="notify.tga"
+   name="VoiceEffectsWillExpire"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+    <unique/>    
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
+
+If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
+  <tag>fail</tag>
+  <tag>voice</tag>
+  <usetemplate
+      ignoretext="Warn me about voice morph expiring"
+      name="okignore"
+      yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
    name="VoiceEffectsNew"
    sound="UISndAlert"
    persist="true"
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index bf55e2c443..739391b965 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -2452,6 +2452,10 @@ Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio
 [[URL] Pulsa aquí] para renovar la suscripción. 
 
 Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.</notification>
+	<notification name="VoiceEffectsWillExpire">Una o más de tus transformaciones de voz caducarán en menos de [INTERVAL] días. 
+[[URL] Pulsa aquí] para renovar la suscripción 
+
+Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.</notification>
 	<notification name="VoiceEffectsNew">Están disponibles nuevas transformaciones de voz.</notification>
 	<notification name="Cannot enter parcel: not a group member">Sólo los miembros de un grupo determinado pueden visitar esta zona.</notification>
 	<notification name="Cannot enter parcel: banned">No puedes entrar en esta parcela, se te ha prohibido el acceso.</notification>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index cd8e7687ae..9fcfc2daa5 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -29,7 +29,6 @@ Distancia de dibujo: [DRAW_DISTANCE]m
 Ancho de banda: [NET_BANDWITH]kbit/s
 Factor LOD: [LOD_FACTOR]
 Calidad de renderización: [RENDER_QUALITY]
-Modelo de iluminación avanzado: [GPU_SHADERS]
 Memoria de textura: [TEXTURE_MEMORY]MB</string>
 	<string name="AboutOSXHiDPI">Modo de visualización HiDPi: [HIDPI]</string>
 	<string name="AboutLibs">Versión de descodificador J2C: [J2C_VERSION] 
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 17cf18633f..587c88faad 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -2451,6 +2451,10 @@ Si vous êtes un membre Premium,  [[PREMIUM_URL] cliquez ici] pour recevoir votr
 [[URL] Cliquez ici] pour renouveler votre abonnement. 
 
 Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.</notification>
+	<notification name="VoiceEffectsWillExpire">Au moins l'un de vos effets de voix expirera dans moins de [INTERVAL] jours.  
+[[URL] Cliquez ici] pour renouveler votre abonnement. 
+
+Si vous êtes un membre Premium,  [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.</notification>
 	<notification name="VoiceEffectsNew">De nouveaux effets de voix sont disponibles !</notification>
 	<notification name="Cannot enter parcel: not a group member">Seuls les membres d'un certain groupe peuvent visiter cette zone.</notification>
 	<notification name="Cannot enter parcel: banned">Vous ne pouvez pas pénétrer sur ce terrain car l'accès vous y est interdit.</notification>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0a3fbeb603..55f6209fe1 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -32,7 +32,6 @@ Distance de dessin : [DRAW_DISTANCE]m
 Bande passante : [NET_BANDWITH] kbit/s
 Facteur LOD (niveau de détail) : [LOD_FACTOR]
 Qualité de rendu : [RENDER_QUALITY]
-Modèle d’éclairage avancé : [GPU_SHADERS]
 Mémoire textures : [TEXTURE_MEMORY] Mo</string>
 	<string name="AboutOSXHiDPI">Mode d'affichage HiDPI : [HIDPI]</string>
 	<string name="AboutLibs">J2C Decoder Version: [J2C_VERSION] 
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 1c40e7304a..f79cc1515b 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -2454,6 +2454,10 @@ Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la
 [[URL] Fai clic qui] per rinnovare l'abbonamento. 
 
 Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.</notification>
+	<notification name="VoiceEffectsWillExpire">Almeno una delle tue manipolazioni vocali scadrà tra meno di [INTERVAL] giorni. 
+[[URL] Fai clic qui] per rinnovare l'abbonamento. 
+
+Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.</notification>
 	<notification name="VoiceEffectsNew">Sono disponibili nuove manipolazioni vocali.</notification>
 	<notification name="Cannot enter parcel: not a group member">Soltanto i membri di un determinato gruppo possono visitare questa zona.</notification>
 	<notification name="Cannot enter parcel: banned">Non puoi entrare nel terreno, sei stato bloccato.</notification>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 178bb90ca6..f77ab1062a 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -31,7 +31,6 @@ Distanza visualizzazione: [DRAW_DISTANCE]m
 Larghezza banda: [NET_BANDWITH]kbit/s
 Fattore livello di dettaglio: [LOD_FACTOR]
 Qualità di rendering: [RENDER_QUALITY]
-Modello illuminazione avanzato: [GPU_SHADERS]
 Memoria texture: [TEXTURE_MEMORY]MB</string>
 	<string name="AboutOSXHiDPI">Modalità display HiDPI: [HIDPI]</string>
 	<string name="AboutLibs">J2C Versione decoder: [J2C_VERSION] 
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index fbd56e118c..123e95df04 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -4663,6 +4663,17 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ�
 			voice
 		</tag>
 	</notification>
+	<notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の１つ、または複数の有効期限が[INTERVAL]日以内に終了します。
+期限を延長・更新するには[[URL] ここ]をクリックしてください。
+
+プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
+    <tag>
+			fail
+		</tag>
+		<tag>
+			voice
+		</tag>
+	</notification>
 	<notification name="VoiceEffectsNew">新しいボイスモーフィング効果が登場！
     <tag>
 			voice
diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml
index 17c11bc75f..e668c6cc20 100644
--- a/indra/newview/skins/default/xui/pl/notifications.xml
+++ b/indra/newview/skins/default/xui/pl/notifications.xml
@@ -3118,6 +3118,11 @@ Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrz
 [[URL] Kliknij tutaj] aby odnowić subskrypcję.
 Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrzymać swój perk Przekształceń Głosu.
 	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		Jedno lub więcej z Twoich Przekształceń Głosu wygaśnie za mniej niż [INTERVAL] dni.
+[[URL] Kliknij tutaj] aby odnowić subskrypcję.
+Jeśli jesteś użytkownikiem premium, to [[PREMIUM_URL] kliknij tutaj] aby otrzymać swój perk Przekształceń Głosu.
+	</notification>
 	<notification name="VoiceEffectsNew">
 		Nowe Przekształcenia Głosu są dostępne!
 	</notification>
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 26ec6cc9dc..8032443020 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -49,7 +49,6 @@ Pole widzenia (Draw Distance): [DRAW_DISTANCE]m
 Przepustowość (Bandwidth): [NET_BANDWITH]kbit/s
 Mnożnik poziomu detali (LOD Factor): [LOD_FACTOR]
 Jakość wyświetlania (Render quality): [RENDER_QUALITY]
-Zaawansowane oświetlenie (Advanced Lighting Model): [GPU_SHADERS]
 Pamięć tekstur (Texture memory): [TEXTURE_MEMORY]MB
 Pamięć podręczna dysku (Disk cache): [DISK_CACHE_INFO]
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 0390239669..a3220bca54 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -2441,6 +2441,10 @@ Se você é um Membro Premium, [[PREMIUM_URL] clique aqui] para receber o seu ap
 [[URL] Clique aqui] para renovar o serviço. 
 
 Se você é um Membro Premium, [[PREMIUM_URL] clique aqui] para receber o seu app de distorção de voz.</notification>
+	<notification name="VoiceEffectsWillExpire">Uma ou mais das suas distorções de voz tem vencimento em menos de [INTERVAL] dias. 
+[[URL] Clique aqui] para renovar o serviço. 
+
+Se você é um Membro Premium, [[PREMIUM_URL] clique aqui] para receber o seu app de distorção de voz.</notification>
 	<notification name="VoiceEffectsNew">Novas Distorções de voz!</notification>
 	<notification name="Cannot enter parcel: not a group member">Só membros de um grupo podem acessar esta área.</notification>
 	<notification name="Cannot enter parcel: banned">Você não pode entrar nessa terra, você foi banido.</notification>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 6db5da2e89..4ce1e6d2ec 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -29,7 +29,6 @@ Estabelecer a distância: [DRAW_DISTANCE]m
 Largura da banda: [NET_BANDWITH]kbit/s
 LOD fator: [LOD_FACTOR]
 Qualidade de renderização: [RENDER_QUALITY]
-Modelo avançado de luzes: [GPU_SHADERS]
 Memória de textura: [TEXTURE_MEMORY]MB</string>
 	<string name="AboutOSXHiDPI">HiDPI modo de exibição: [HIDPI]</string>
 	<string name="AboutLibs">Versão do J2C Decoder: [J2C_VERSION] 
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index bde18edc23..e75fd1fd82 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -3232,6 +3232,12 @@
 
 Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
 	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		Срок действия одного или нескольких ваших типов анимационного изменения голоса истекает через [INTERVAL] дней или раньше. 
+[[URL] Щелкните здесь], чтобы обновить подписку. 
+
+Если вы - владелец премиум-аккаунта, [[PREMIUM_URL] щелкните здесь], чтобы получить право на анимационное изменение голоса.
+	</notification>
 	<notification name="VoiceEffectsNew">
 		Появились новые типы изменения голоса!
 	</notification>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 61d836a2d1..0079309ba2 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -69,7 +69,6 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 Ширина канала: [NET_BANDWITH] кбит/с
 Коэффициент детализации: [LOD_FACTOR]
 Качество визуализации: [RENDER_QUALITY]
-Расширенная модель освещения: [GPU_SHADERS]
 Память текстур: [TEXTURE_MEMORY] МБ
 	</string>
 	<string name="AboutOSXHiDPI">
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 30aa0c0342..17d2969d19 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -3232,6 +3232,12 @@ Aboneliğinizi yenilemek için [[URL] buraya tıklayın].
 
 Özel Üye iseniz, ses dönüştürme özelliğini almak için [[PREMIUM_URL] buraya tıklayın].
 	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		Ses Dönüşümlerinizden birinin ya da daha fazlasının süresi [INTERVAL] günden daha az bir zamanda dolacak. 
+Aboneliğinizi yenilemek için [[URL] buraya tıklayın]. 
+
+Özel Üye iseniz, ses dönüştürme özelliğini almak için [[PREMIUM_URL] buraya tıklayın].
+	</notification>
 	<notification name="VoiceEffectsNew">
 		Yeni Ses Şekilleri kullanılabilir!
 	</notification>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index e709a4c5d6..fa2fd3a802 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -69,7 +69,6 @@ UI Ölçeklendirme: [UI_SCALE]
 Bant genişliği: [NET_BANDWITH]kbit/s
 LOD faktörü: [LOD_FACTOR]
 İşleme kalitesi: [RENDER_QUALITY]
-Gelişmiş Aydınlatma Modeli: [GPU_SHADERS]
 Doku belleği: [TEXTURE_MEMORY]MB
 	</string>
 	<string name="AboutOSXHiDPI">
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 3ebea7dc27..4d0f1cb85b 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3216,6 +3216,12 @@ SHA1 指紋：[MD5_DIGEST]
 
 付費用戶請[[PREMIUM_URL] 點按這裡]領取免費變聲工具。
 	</notification>
+	<notification name="VoiceEffectsWillExpire">
+		至少一個你訂用的變聲效果將在 [INTERVAL] 天後到期。
+[[URL] 點按這裡]繼續訂用。
+
+付費用戶請[[PREMIUM_URL] 點按這裡]領取免費變聲工具。
+	</notification>
 	<notification name="VoiceEffectsNew">
 		新的變聲效果上市了！
 	</notification>