Merge pull request #1161 from mb/pr-fx128-proxy-dns

[policy-templates.git] / windows / en-US / firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 2661beae940b1a0a94e016b9d73aee753a2a85cd..4659b28198e2dea53526de490c1712136872d4e3 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="6.1" schemaVersion="1.0">
+<policyDefinitionResources revision="6.3" schemaVersion="1.0">

   <displayName/>
   <description/>
   <resources>
   <displayName/>
   <description/>
   <resources>


@@ -73,6 +73,7 @@
       <string id="SUPPORTED_FF128">Firefox 128 or later, Firefox 115.13 ESR or later</string>
       <string id="SUPPORTED_FF129">Firefox 129 or later, Firefox 115.14 ESR or later</string>
       <string id="SUPPORTED_FF130">Firefox 130 or later, Firefox 115.15 ESR or later</string>
       <string id="SUPPORTED_FF128">Firefox 128 or later, Firefox 115.13 ESR or later</string>
       <string id="SUPPORTED_FF129">Firefox 129 or later, Firefox 115.14 ESR or later</string>
       <string id="SUPPORTED_FF130">Firefox 130 or later, Firefox 115.15 ESR or later</string>

+      <string id="SUPPORTED_FF130_ONLY">Firefox 130 or later</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>


@@ -608,7 +609,7 @@ If this policy is disabled or not configured, sessions not cleared when the brow
       <string id="SanitizeOnShutdown_SiteSettings_Explain">If the policy is enabled, site preferences are cleared when the browser is closed.
 
 If this policy is disabled or not configured, site preferences are not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_SiteSettings_Explain">If the policy is enabled, site preferences are cleared when the browser is closed.
 
 If this policy is disabled or not configured, site preferences are not cleared when the browser is closed.</string>

-      <string id="SanitizeOnShutdown_OfflineApps">Offline Website Data</string>
+      <string id="SanitizeOnShutdown_OfflineApps">Offline Website Data (Deprecated)</string>

       <string id="SanitizeOnShutdown_OfflineApps_Explain">If the policy is enabled, offline application storage is cleared when the browser is closed.
 
 If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_OfflineApps_Explain">If the policy is enabled, offline application storage is cleared when the browser is closed.
 
 If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.</string>


@@ -867,6 +868,10 @@ If this policy is disabled or not configured, onboarding messages will be shown
       <string id="UserMessaging_MoreFromMozilla_Explain">If this policy is disabled, the More from Mozilla section will not be shown in preferences.
 
 If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences.</string>
       <string id="UserMessaging_MoreFromMozilla_Explain">If this policy is disabled, the More from Mozilla section will not be shown in preferences.
 
 If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences.</string>

+      <string id="UserMessaging_FirefoxLabs">Firefox Labs</string>
+      <string id="UserMessaging_FirefoxLabs_Explain">If this policy is disabled, the Firefox Labs section will not be shown in preferences.
+
+If this policy is enabled or not configured, the Firefox Labs section will be shown in preferences.</string>

       <string id="UserMessaging_Locked">Do not allow user messaging preferences to be changed</string>
       <string id="UserMessaging_Locked_Explain">If this policy is disabled, user messaging preferences can be changed by the user.
 
       <string id="UserMessaging_Locked">Do not allow user messaging preferences to be changed</string>
       <string id="UserMessaging_Locked_Explain">If this policy is disabled, user messaging preferences can be changed by the user.
 


@@ -1035,10 +1040,12 @@ If this policy is disabled or not configured, Firefox does not bypass the proxy.
       <string id="Proxy_AutoLogin_Explain">If this policy is enabled, Firefox will not prompt for proxy authentication when a password is saved.
 
 If this policy is disabled or not configured, Firefox will always prompt for proxy authentication.</string>
       <string id="Proxy_AutoLogin_Explain">If this policy is enabled, Firefox will not prompt for proxy authentication when a password is saved.
 
 If this policy is disabled or not configured, Firefox will always prompt for proxy authentication.</string>

-      <string id="Proxy_UseProxyForDNS">Proxy DNS when using SOCKS v5</string>
-      <string id="Proxy_UseProxyForDNS_Explain">If this policy is enabled, DNS is proxied when using SOCKS v5.
+      <string id="Proxy_UseProxyForDNS">Proxy DNS when using SOCKS</string>
+      <string id="Proxy_UseProxyForDNS_Explain">If this policy is enabled, DNS is proxied when using SOCKS.
+
+If this policy is disabled, DNS is not proxied when using SOCKS.

 
 

-If this policy is disabled or not configured, DNS is not proxied when using SOCKS v5.</string>
+If this policy not configured, DNS is not proxied when using SOCKS v4, but proxied when using SOCKS v5.</string>

       <string id="DisableThirdPartyModuleBlocking">Disable Third Party Module Blocking</string>
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
       <string id="DisableThirdPartyModuleBlocking">Disable Third Party Module Blocking</string>
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.