# HG changeset patch # User Wolfgang Rosenauer # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 # Parent 3d1dbfbdfa41b433352fadf3efe4a21cb45a468f Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -219,17 +219,17 @@ pref("browser.uitour.requireSecure", tru pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/"); pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/"); // How long to show a Hearbeat survey (two hours, in seconds) pref("browser.uitour.surveyDuration", 7200); pref("keyword.enabled", true); pref("browser.fixup.domainwhitelist.localhost", true); -pref("general.useragent.locale", "@AB_CD@"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.skins.selectedSkin", "classic/1.0"); pref("general.smoothScroll", true); #ifdef UNIX_BUT_NOT_MAC pref("general.autoScroll", false); #else pref("general.autoScroll", true); #endif