Bug 351865 - zh-CN searchplugin parameters are unusual, r=pike

browser/app/firefox-branding.js

@@ -9,3 +9,8 @@ pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
 
 // Release notes URL
 pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
+
+// Search codes belong only in builds with official branding
+pref("browser.search.param.yahoo-fr", "");
+pref("browser.search.param.yahoo-fr-cjkt", "");
+pref("browser.search.param.yahoo-f-CN", "");

browser/app/profile/firefox.js

@@ -223,9 +223,6 @@ pref("browser.search.order.Yahoo.1",          "chrome://branding/content/searchc
 pref("browser.search.order.Yahoo.2",          "chrome://branding/content/searchconfig.properties");
 pref("browser.search.order.Yahoo",            "chrome://branding/content/searchconfig.properties");
 
-pref("browser.search.param.yahoo-fr", "moz2");
-pref("browser.search.param.yahoo-fr-cjkt", "fx2-moz-1");
-
 // search bar results always open in a new tab
 pref("browser.search.openintab", false);
 

other-licenses/branding/firefox/pref/firefox-branding.js

@@ -9,3 +9,7 @@ pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/r
 
 // Release notes URL
 pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
+
+pref("browser.search.param.yahoo-fr", "moz2");
+pref("browser.search.param.yahoo-fr-cjkt", "fx2-moz-1");
+pref("browser.search.param.yahoo-f-CN", "D3_g");