1 # HG changeset patch

     2 # User Wolfgang Rosenauer <wr@rosenauer.org>

     3 # Parent 099312626f5f7c9cb5573a61d0230574ee12a660

     4 # Parent  3d1dbfbdfa41b433352fadf3efe4a21cb45a468f

     5 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value

     6 

     7 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js

     8 --- a/browser/app/profile/firefox.js

     9 +++ b/browser/app/profile/firefox.js

    10 @@ -219,17 +219,17 @@ pref("browser.uitour.requireSecure", tru

    11  pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");

    12  pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");

    13  // How long to show a Hearbeat survey (two hours, in seconds)

    14  pref("browser.uitour.surveyDuration", 7200);

    15  

    16  pref("keyword.enabled", true);

    17  pref("browser.fixup.domainwhitelist.localhost", true);

    18  

    19 -pref("general.useragent.locale", "@AB_CD@");

    20 +pref("general.useragent.locale", "chrome://global/locale/intl.properties");

    21  pref("general.skins.selectedSkin", "classic/1.0");

    22  

    23  pref("general.smoothScroll", true);

    24  #ifdef UNIX_BUT_NOT_MAC

    25  pref("general.autoScroll", false);

    26  #else

    27  pref("general.autoScroll", true);

    28  #endif