Merge pull request #252 from MS-PC/master

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 4806946df9b4f365aff2e763593e0fe95d6dc42c..6038b7bea15f0fc6344595f9b5da3e7cbfa16912 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="1.1" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.2" schemaVersion="1.0" >

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


@@ -194,6 +194,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>
 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.
 
       <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.
 


@@ -341,11 +345,26 @@ 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>
 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="Bookmark1">Bookmark 01</string>
+      <string id="Bookmark2">Bookmark 02</string>
+      <string id="Bookmark3">Bookmark 03</string>
+      <string id="Bookmark4">Bookmark 04</string>
+      <string id="Bookmark5">Bookmark 05</string>
+      <string id="Bookmark6">Bookmark 06</string>
+      <string id="Bookmark7">Bookmark 07</string>
+      <string id="Bookmark8">Bookmark 08</string>
+      <string id="Bookmark9">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="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>
       <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>


@@ -417,6 +436,10 @@ 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_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">
     </stringTable>
     <presentationTable>
       <presentation id="AppUpdateURL">


@@ -510,6 +533,9 @@ If this policy is disabled or not configured, search engines can be installed fr
           <label/>
         </textBox>
       </presentation>
           <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>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>