X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/0c664cdcee6e136b719da55f7f2c004c8b9702e3..24980c2056a99b798320157ebd395018c512f125:/windows/en-US/firefox.adml?ds=inline

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 8460bb0..e52cd96 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -12,6 +12,8 @@
       <string id="Cookies_group">Cookies</string>
       <string id="Addons_group">Addons</string>
       <string id="Flash_group">Flash</string>
+      <string id="Homepage_group">Home page</string>
+      <string id="Proxy_group">Proxy server</string>
       <string id="Allow">Allow</string>
       <string id="Block">Block</string>
       <string id="BlockAboutAddons">Block About Addons</string>
@@ -28,8 +30,12 @@
       <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
       <string id="DisableAppUpdate_Explain">Prevent the browser from updating.</string>
+      <string id="DisableBuiltinPDFViewer">Disable Builtin PDF Viewer</string>
+      <string id="DisableBuiltinPDFViewer_Explain">Disables PDF.js, which displays PDFs within Firefox.</string>
       <string id="DisableDeveloperTools">Disable Developer Tools</string>
       <string id="DisableDeveloperTools_Explain">Prevents access to developer tools.</string>
+      <string id="DisableFeedbackCommands">Disable Feedback Commands</string>
+      <string id="DisableFeedbackCommands_Explain">Prevents ability to send feedback from the help menu (&quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot;).</string>
       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>
       <string id="DisableFirefoxAccounts_Explain">Disables Firefox Account based services, including Sync.</string>
       <string id="DisableFirefoxScreenshots">Disable Firefox Screenshots</string>
@@ -42,13 +48,17 @@
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
+      <string id="DisableSafeMode">Disable Safe Mode</string>
+      <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>
+      <string id="DisableSysAddonUpdate">Disable System Addon Updates</string>
+      <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
       <string id="DisplayBookmarksToolbar_Explain">Causes the bookmarks toolbar to be displayed by default.</string>
       <string id="DisplayMenuBar">Display Menu Bar</string>
       <string id="DisplayMenuBar_Explain">Causes the menu bar to be displayed by default.</string>
       <string id="DontCheckDefaultBrowser">Don't Check Default Browser</string>
       <string id="DontCheckDefaultBrowser_Explain">Don't check for the default browser on startup.</string>
-      <string id="RememberPasswords">Rember Passwords</string>
+      <string id="RememberPasswords">Remember Passwords</string>
       <string id="RememberPasswords_Explain">Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted.</string>
       <string id="PopupsAllow_Explain">URLs to allow popups.</string>
       <string id="AddonsAllow_Explain">URLs to allow addons.</string>
@@ -64,8 +74,31 @@
       <string id="Bookmark_Explain">Bookmark Explanation</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
       <string id="BookmarkPlacementFolder">Folder</string>
-      <string id="Homepage">Homepage</string>
-      <string id="Homepage_Explain">Homepage Settings</string>
+      <string id="HomepageURL">URL for Home page</string>
+      <string id="HomepageURL_Explain">Homepage Settings</string>
+      <string id="HomepageAdditional">Additional Homepages</string>
+      <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
+      <string id="HTTPProxy">HTTP Proxy Settings</string>
+      <string id="HTTPProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SSLProxy">SSL Proxy Settings</string>
+      <string id="SSLProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="FTPProxy">FTP Proxy Settings</string>
+      <string id="FTPProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SOCKSProxy">SOCKS Host Settings</string>
+      <string id="SOCKSProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SOCKSVersion4">SOCKS v4</string>
+      <string id="SOCKSVersion5">SOCKS v5</string>
+      <string id="AutoConfigURL">Automatic proxy configuration URL</string>
+      <string id="AutoConfigURL_Explain">These should only be set if you selected autoConfig</string>
+      <string id="Passthrough">Proxy bypass URLs</string>
+      <string id="Passthrough_Explain">These should only be set if you selected manual proxy</string>
+      <string id="NoProxy">No Proxy</string>
+      <string id="SystemProxy">Use system proxy settings</string>
+      <string id="ManualProxy">Manual proxy configuration</string>
+      <string id="AutoDetectProxy">Auto-detect proxy settings</string>
+      <string id="AutoConfigProxy">Automatic proxy configuration</string>
+      <string id="ProxyMode">Proxy Mode</string>
+      <string id="ProxyMode_Explain">Select the proxy mode</string>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
@@ -74,13 +107,15 @@
       <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
-      <presentation id="Homepage">
+      <presentation id="HomepageURL">
         <text>URL:</text>
         <textBox refId="HomepageURL">
           <label/>
         </textBox>
         <checkBox refId="HomepageLocked">Don't allow the homepage to be changed.</checkBox>
-        <listBox refId="HomepageAdditional">Additional homepages (optional)</listBox>
+      </presentation>
+      <presentation id="HomepageAdditional">
+        <listBox refId="HomepageAdditional">Additional homepages</listBox>
       </presentation>
       <presentation id="Bookmark">
         <text>Title:</text>
@@ -102,6 +137,51 @@
           <label/>
         </textBox>
       </presentation>
+      <presentation id="HTTPProxy">
+        <text>HTTP Proxy:</text>
+        <textBox refId="HTTPProxy">
+          <label/>
+        </textBox>
+        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
+	  </presentation>
+      <presentation id="SSLProxy">
+        <text>SSL Proxy:</text>
+        <textBox refId="SSLProxy">
+          <label/>
+        </textBox>
+	  </presentation>
+      <presentation id="FTPProxy">
+        <text>FTP Proxy:</text>
+        <textBox refId="FTPProxy">
+          <label/>
+        </textBox>
+	  </presentation>
+      <presentation id="SOCKSProxy">
+        <text>SOCKS Host:</text>
+        <textBox refId="SOCKSProxy">
+          <label/>
+        </textBox>
+        <dropdownList refId="SOCKSVersion"/>
+      </presentation>
+      <presentation id="Passthrough">
+        <text>No proxy for</text>
+        <textBox refId="Passthrough">
+          <label/>
+        </textBox>
+        <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
+	  </presentation>
+      <presentation id="AutoConfigURL">
+        <text>Automatic proxy configuration URL:</text>
+        <textBox refId="AutoConfigURL">
+          <label/>
+        </textBox>
+	  </presentation>
+      <presentation id="ProxyMode">
+        <dropdownList refId="ProxyMode"/>
+        <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
+        <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
+        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>