Merge pull request #273 from mozilla/fix_l10n_bookmarks

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index f6e6722dbdede0a6abac47a65dd7ac48832c2c97..6e5f4ba29b351bfcabde32163a0af1641045784c 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"?>
-<policyDefinitionResources revision="1.1" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.2" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -7,6 +7,7 @@
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
       <string id="SUPPORTED_FF60">Firefox 60 or later, Firefox 60 ESR or later</string>
       <string id="SUPPORTED_FF62">Firefox 62 or later, Firefox 60.2 ESR or later</string>
+      <string id="SUPPORTED_FF63">Firefox 63 or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
@@ -26,6 +27,10 @@
       <string id="Search_group">Search</string>
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
+      <string id="AppUpdateURL">Custom Update URL</string>
+      <string id="AppUpdateURL_Explain">If this policy is enabled, you can set a URL to an update server other than the default. This could be helpful if you run your own update server on your network.
+
+If this policy is disabled or not configured, the default update URL is used.</string>
       <string id="Authentication_SPNEGO">SPNEGO</string>
       <string id="Authentication_SPNEGO_Explain">If this policy is enabled, the specified websites are permitted to engage in SPNEGO authentication with the browser. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
 
@@ -72,6 +77,10 @@ If this policy is disabled or not configured, users can set images as their desk
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>
+      <string id="DNSOverHTTPS">Configure DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_Explain">If this policy is enabled, the default configuration for DNS over HTTPS can be changed.
+
+If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration.</string>
       <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
       <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
 
@@ -190,6 +199,10 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 If this policy is disabled or not configured, no extensions are locked
 
 Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
+      <string id="HardwareAcceleration">Hardware Acceleration</string>
+      <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
+
+If this policy is enabled or not configured, hardware acceleration is enabled.</string>
       <string id="OfferToSaveLogins">Offer to save logins</string>
       <string id="OfferToSaveLogins_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
 
@@ -337,11 +350,56 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 If this policy is disabled or not configured, there are no exceptions to the website filter.
 
 Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
-      <string id="Bookmark1">Bookmark One</string>
-      <string id="Bookmark2">Bookmark Two</string>
-      <string id="Bookmark3">Bookmark Three</string>
-      <string id="Bookmark4">Bookmark Four</string>
-      <string id="Bookmark5">Bookmark Five</string>
+      <string id="Bookmark01">Bookmark 01</string>
+      <string id="Bookmark02">Bookmark 02</string>
+      <string id="Bookmark03">Bookmark 03</string>
+      <string id="Bookmark04">Bookmark 04</string>
+      <string id="Bookmark05">Bookmark 05</string>
+      <string id="Bookmark06">Bookmark 06</string>
+      <string id="Bookmark07">Bookmark 07</string>
+      <string id="Bookmark08">Bookmark 08</string>
+      <string id="Bookmark09">Bookmark 09</string>
+      <string id="Bookmark10">Bookmark 10</string>
+      <string id="Bookmark11">Bookmark 11</string>
+      <string id="Bookmark12">Bookmark 12</string>
+      <string id="Bookmark13">Bookmark 13</string>
+      <string id="Bookmark14">Bookmark 14</string>
+      <string id="Bookmark15">Bookmark 15</string>
+      <string id="Bookmark16">Bookmark 16</string>
+      <string id="Bookmark17">Bookmark 17</string>
+      <string id="Bookmark18">Bookmark 18</string>
+      <string id="Bookmark19">Bookmark 19</string>
+      <string id="Bookmark20">Bookmark 20</string>
+      <string id="Bookmark21">Bookmark 21</string>
+      <string id="Bookmark22">Bookmark 22</string>
+      <string id="Bookmark23">Bookmark 23</string>
+      <string id="Bookmark24">Bookmark 24</string>
+      <string id="Bookmark25">Bookmark 25</string>
+      <string id="Bookmark26">Bookmark 26</string>
+      <string id="Bookmark27">Bookmark 27</string>
+      <string id="Bookmark28">Bookmark 28</string>
+      <string id="Bookmark29">Bookmark 29</string>
+      <string id="Bookmark30">Bookmark 30</string>
+      <string id="Bookmark31">Bookmark 31</string>
+      <string id="Bookmark32">Bookmark 32</string>
+      <string id="Bookmark33">Bookmark 33</string>
+      <string id="Bookmark34">Bookmark 34</string>
+      <string id="Bookmark35">Bookmark 35</string>
+      <string id="Bookmark36">Bookmark 36</string>
+      <string id="Bookmark37">Bookmark 37</string>
+      <string id="Bookmark38">Bookmark 38</string>
+      <string id="Bookmark39">Bookmark 39</string>
+      <string id="Bookmark40">Bookmark 40</string>
+      <string id="Bookmark41">Bookmark 41</string>
+      <string id="Bookmark42">Bookmark 42</string>
+      <string id="Bookmark43">Bookmark 43</string>
+      <string id="Bookmark44">Bookmark 44</string>
+      <string id="Bookmark45">Bookmark 45</string>
+      <string id="Bookmark46">Bookmark 46</string>
+      <string id="Bookmark47">Bookmark 47</string>
+      <string id="Bookmark48">Bookmark 48</string>
+      <string id="Bookmark49">Bookmark 49</string>
+      <string id="Bookmark50">Bookmark 50</string>
       <string id="Bookmark_Explain">If this policy is enabled, you can configure a bookmark be added to Firefox.  Due to a bug, you must select the location. Note that you must specify the bookmarks in order.
 
 If this policy is disabled or not configured, a new bookmark is not added.</string>
@@ -413,8 +471,17 @@ If this policy is disabled or not configured, the Firefox default engine is used
       <string id="SearchEngines_PreventInstalls_Explain">If this policy is enabled, the user cannot install search engines from web page.
 
 If this policy is disabled or not configured, search engines can be installed from web pages.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>
@@ -501,6 +568,9 @@ If this policy is disabled or not configured, search engines can be installed fr
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>
@@ -536,6 +606,14 @@ If this policy is disabled or not configured, search engines can be installed fr
         <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
         <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
       </presentation>
+      <presentation id="DNSOverHTTPS">
+        <text>Provider URL:</text>
+        <textBox refId="ProviderURL">
+          <label/>
+        </textBox>
+        <checkBox refId="DNSOverHTTPSEnabled">Enable DNS over HTTPS.</checkBox>
+        <checkBox refId="DNSOverHTTPSLocked">Don't allow DNS over HTTPS preferences to be changed.</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>