Merge pull request #793 from mozilla/WindowsSSO

[policy-templates.git] / windows / zh-TW / firefox.adml

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index c50463b7c35a940ef3b03e3fc6d152b6db0ff1d9..bf9c38241fc1899a0bd903eebd6a6362d390ae85 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -856,6 +856,10 @@ If this policy is enabled or not configured, application updates may be installe
 If this policy is disabled or not configured, any site that invokes an external protocol will ask the user for permission.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#autolaunchprotocolsfromorigins.</string>
 If this policy is disabled or not configured, any site that invokes an external protocol will ask the user for permission.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#autolaunchprotocolsfromorigins.</string>

+      <string id="WindowsSSO">Windows SSO</string>
+      <string id="WindowsSSO_Explain">If this policy is enabled, Firefox will use credentials stored in Windows to sign in to Microsoft, work, and school accounts.
+
+If this policy is disabled or not configured, credentials must be entered manually.</string>

       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：
       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：


@@ -1039,6 +1043,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
         <textBox refId="SearchEngine_PostData">
           <label>POST 資料：</label>
         </textBox>
         <textBox refId="SearchEngine_PostData">
           <label>POST 資料：</label>
         </textBox>

+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>

       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">