Add support for Encoding in SearchEngine

diff --git a/README.md b/README.md
index 50dbe0c79ff7dbfec3e13876026a97c40dc4e3cb..107ec544341002ce343f07d0e1867c9f390a99c6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5051,7 +5051,9 @@ Add new search engines (up to five). This policy is only available on the ESR. `
 
 `SuggestURLTemplate` is a search suggestions URL with {searchTerms} to substitute for the search term.
 
-**Compatibility:** Firefox ESR 60 (POST support in Firefox ESR 68)\
+`Encoding` is the query charset for the engine. It defaults to UTF-8.
+
+**Compatibility:** Firefox ESR 60 (POST support in Firefox ESR 68, Encoding support in Firefox 91)\
 **CCK2 Equivalent:** `searchplugins`\
 **Preferences Affected:** N/A
 

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index ec65d9a52cbcfecde49f416fd9e56bf444110e0b..9e26e8eefe8214285bbbbf2fb8f1ac9722908070 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 309f9843985291290883e01dfc1967ef747af41e..032be719d45078acc94400e155367eb44e525cb0 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index bb82f473dbc1ffa3dd08040250ecceebc2238784..4a4f8558eb00acda71f80d5a7ff80dfbcc485f24 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <textBox refId="SearchEngine_PostData">
           <label>Datos POST:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1c8079555aa49e0cae091461b84e7a91e02c8d47..378fb9163670ec6503965d0b2586094a2c763a6b 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2648,6 +2648,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_2" class="Both" displayName="$(string.SearchEngines_2)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\2" presentation="$(presentation.SearchEngine)" >
@@ -2673,6 +2674,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_3" class="Both" displayName="$(string.SearchEngines_3)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\3" presentation="$(presentation.SearchEngine)" >
@@ -2698,6 +2700,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_4" class="Both" displayName="$(string.SearchEngines_4)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\4" presentation="$(presentation.SearchEngine)" >
@@ -2723,6 +2726,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_5" class="Both" displayName="$(string.SearchEngines_5)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\5" presentation="$(presentation.SearchEngine)" >
@@ -2748,6 +2752,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_Default" class="Both" displayName="$(string.SearchEngines_Default)" explainText="$(string.SearchEngines_Default_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines" presentation="$(presentation.SearchEngines_Default)" >

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 234daed94d87dd8d03600c920bef53a55062a133..982e38172d8f84991ad208cbd413fb1f24ad20b1 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1040,6 +1040,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <textBox refId="SearchEngine_PostData">\r
           <label>POST data:</label>\r
         </textBox>\r
+        <textBox refId="SearchEngine_Encoding">\r
+          <label>Encoding:</label>\r
+        </textBox>\r
       </presentation>\r
       <presentation id="SearchEngines_Default">\r
         <textBox refId="SearchEngines_Default">\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index daa14fd699819a6912cfc9167d316c214d7f84f5..abb0414df6e342154489d3fde56b8298d6ed30de 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -1042,6 +1042,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <textBox refId="SearchEngine_PostData">
           <label>Dati POST:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index aecaa68a098a5b600398f3eca4b97b1a13d942b4..5b459dae6d9dff91b7a2aaa11d0188e52d849abd 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. <
          <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">

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 4489668c611b79aa9758bb48eb2aadb603d2e5d6..2e982c89f997bcc6635d47c007487dfdd66b4ac0 100644 (file)
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -1039,6 +1039,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
 <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">

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index c50463b7c35a940ef3b03e3fc6d152b6db0ff1d9..34ab41d5a0b29c8ecafe3fb09a349a585e4a40b4 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -1039,6 +1039,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
         <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">