Merge branch 'master' into patch-2

diff --cc windows/en-US/firefox.adml
index e750ee04693f4d5dc4af7b87334ba4ef11357b1d,8ff464a1f228b7af200c8e6e5d61c9841fd1ffb2..541156a0a5594f0025b368cae24ce1412338454e
--- 1/windows/en-US/firefox.adml
--- 2/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -245,66 -334,25 +334,70 @@@ Starting with Firefox 62, this policy w
  
  If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
        <string id="WebsiteFilter_Block">Blocked websites</string>
-       <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.",
+       <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
+ 
+ If this policy is disabled or not configured, no websites are blocked.
  
- If this policy is disabled or not configured, no websites are blocked.</string>
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="WebsiteFilter_Exceptions">Exceptions to blocked websites</string>
-       <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.",
+       <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
  
- If this policy is disabled or not configured, there are no exceptions to the website filter.</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="Bookmark01">Bookmark One</string>
 +      <string id="Bookmark02">Bookmark Two</string>
 +      <string id="Bookmark03">Bookmark Three</string>
 +      <string id="Bookmark04">Bookmark Four</string>
 +      <string id="Bookmark05">Bookmark Five</string>
 +      <string id="Bookmark06">Bookmark Six</string>
 +      <string id="Bookmark07">Bookmark Seven</string>
 +      <string id="Bookmark08">Bookmark Eight</string>
 +      <string id="Bookmark09">Bookmark Nine</string>
 +      <string id="Bookmark10">Bookmark Ten</string>
 +      <string id="Bookmark11">Bookmark Eleven</string>
 +      <string id="Bookmark12">Bookmark Twelve</string>
 +      <string id="Bookmark13">Bookmark Thirteen</string>
 +      <string id="Bookmark14">Bookmark Fourteen</string>
 +      <string id="Bookmark15">Bookmark Fifteen</string>
 +      <string id="Bookmark16">Bookmark Sixteen</string>
 +      <string id="Bookmark17">Bookmark Seventeen</string>
 +      <string id="Bookmark18">Bookmark Eighteen</string>
 +      <string id="Bookmark19">Bookmark Nineteen</string>
 +      <string id="Bookmark20">Bookmark Twenty</string>
 +      <string id="Bookmark21">Bookmark Twenty-one</string>
 +      <string id="Bookmark22">Bookmark Twenty-two</string>
 +      <string id="Bookmark23">Bookmark Twenty-three</string>
 +      <string id="Bookmark24">Bookmark Twenty-four</string>
 +      <string id="Bookmark25">Bookmark Twenty-five</string>
 +      <string id="Bookmark26">Bookmark Twenty-six</string>
 +      <string id="Bookmark27">Bookmark Twenty-seven</string>
 +      <string id="Bookmark28">Bookmark Twenty-eight</string>
 +      <string id="Bookmark29">Bookmark Twenty-nine</string>
 +      <string id="Bookmark30">Bookmark Thirty</string>
 +      <string id="Bookmark31">Bookmark Thirty-one</string>
 +      <string id="Bookmark32">Bookmark Thirty-two</string>
 +      <string id="Bookmark33">Bookmark Thirty-three</string>
 +      <string id="Bookmark34">Bookmark Thirty-four</string>
 +      <string id="Bookmark35">Bookmark Thirty-five</string>
 +      <string id="Bookmark36">Bookmark Thirty-six</string>
 +      <string id="Bookmark37">Bookmark Thirty-seven</string>
 +      <string id="Bookmark38">Bookmark Thirty-eight</string>
 +      <string id="Bookmark39">Bookmark Thirty-nine</string>
 +      <string id="Bookmark40">Bookmark Forty</string>
 +      <string id="Bookmark41">Bookmark Forty-one</string>
 +      <string id="Bookmark42">Bookmark Forty-two</string>
 +      <string id="Bookmark43">Bookmark Forty-three</string>
 +      <string id="Bookmark44">Bookmark Forty-four</string>
 +      <string id="Bookmark45">Bookmark Forty-five</string>
 +      <string id="Bookmark46">Bookmark Forty-six</string>
 +      <string id="Bookmark47">Bookmark Forty-seven</string>
 +      <string id="Bookmark48">Bookmark Forty-eight</string>
 +      <string id="Bookmark49">Bookmark Forty-nine</string>
 +      <string id="Bookmark50">Bookmark Fifty</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 not configured or disabled, a new bookmark is not added.</string>
+ If this policy is disabled or not configured, a new bookmark is not added.</string>
        <string id="BookmarkPlacementToolbar">Toolbar</string>
        <string id="BookmarkPlacementMenu">Menu</string>
        <string id="NoDefaultBookmarks">No Default Bookmarks</string>

diff --cc windows/firefox.admx
Simple merge