diff -urN mozilla-1.9.1.orig/browser/app/application.ini mozilla-1.9.1/browser/app/application.ini --- mozilla-1.9.1.orig/browser/app/application.ini 2009-06-24 10:20:27.000000000 +0200 +++ mozilla-1.9.1/browser/app/application.ini 2009-06-28 14:11:09.000000000 +0200 @@ -37,8 +37,8 @@ #filter substitution [App] -Vendor=Mozilla -Name=Firefox +Vendor= +Name=Iceweasel Version=@APP_VERSION@ BuildID=@GRE_BUILDID@ #ifdef MOZ_SOURCE_REPO diff -urN mozilla-1.9.1.orig/browser/app/firefox-branding.js mozilla-1.9.1/browser/app/firefox-branding.js --- mozilla-1.9.1.orig/browser/app/firefox-branding.js 2009-06-24 10:20:27.000000000 +0200 +++ mozilla-1.9.1/browser/app/firefox-branding.js 2009-06-28 14:12:51.000000000 +0200 @@ -1,17 +1,18 @@ -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); +pref("browser.startup.homepage_override.mstone", "ignore"); +pref("startup.homepage_override_url",""); +pref("startup.homepage_welcome_url",""); // The time interval between checks for a new version (in seconds) // nightly=8 hours, official=24 hours pref("app.update.interval", 28800); // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); +pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); +pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/"); // Release notes URL -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); +pref("app.releaseNotesURL", "") // Search codes belong only in builds with official branding pref("browser.search.param.yahoo-fr", ""); diff -urN mozilla-1.9.1.orig/browser/app/profile/firefox.js mozilla-1.9.1/browser/app/profile/firefox.js --- mozilla-1.9.1.orig/browser/app/profile/firefox.js 2009-06-24 10:20:27.000000000 +0200 +++ mozilla-1.9.1/browser/app/profile/firefox.js 2009-06-28 14:15:29.000000000 +0200 @@ -70,12 +70,12 @@ // Preferences for the Get Add-ons pane pref("extensions.getAddons.showPane", true); -pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%"); +pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox"); pref("extensions.getAddons.maxResults", 5); -pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/recommended"); -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); -pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/search?q=%TERMS%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); +pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/recommended"); +pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%"); +pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/search?q=%TERMS%"); +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%"); // Blocklist preferences pref("extensions.blocklist.enabled", true); @@ -161,9 +161,9 @@ pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day // Non-symmetric (not shared by extensions) extension-specific [update] preferences -pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/"); -pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/"); -pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/"); +pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/extensions/"); +pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/themes/"); +pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/plugins/"); pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next // restart. @@ -728,10 +728,8 @@ pref("browser.rights.version", 3); pref("browser.rights.3.shown", false); -#ifdef DEBUG // Don't show the about:rights notification in debug builds. pref("browser.rights.override", true); -#endif pref("browser.sessionstore.resume_from_crash", true); pref("browser.sessionstore.resume_session_once", false); @@ -831,7 +829,7 @@ pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/"); // base URL for web-based support pages -pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/"); +pref("app.support.baseURL", "http://support.mozilla.com/1/firefox/%VERSION%/%OS%/%LOCALE%/"); // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror) pref("security.alternate_certificate_error_page", "certerror"); diff -urN mozilla-1.9.1.orig/browser/base/content/aboutDialog.xul mozilla-1.9.1/browser/base/content/aboutDialog.xul --- mozilla-1.9.1.orig/browser/base/content/aboutDialog.xul 2009-06-24 10:20:27.000000000 +0200 +++ mozilla-1.9.1/browser/base/content/aboutDialog.xul 2009-06-28 17:29:14.000000000 +0200 @@ -87,7 +87,6 @@ ©rightInfo1;&licenseLinkText;©rightInfo2; - &logoCopyright; diff -urN mozilla-1.9.1.orig/browser/base/content/baseMenuOverlay.xul mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul --- mozilla-1.9.1.orig/browser/base/content/baseMenuOverlay.xul 2009-06-24 10:20:27.000000000 +0200 +++ mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul 2009-06-28 14:24:47.000000000 +0200 @@ -92,11 +92,6 @@ accesskey="&helpForIEUsers.accesskey;" oncommand="openHelpLink('ieusers');"/> #endif - #ifdef MOZ_UPDATER - &brandFullName;™ + &brandFullName; &brandMotto; @@ -622,20 +622,13 @@ &credit.poweredByGeckoReg; - &brandFullName;™ &license.part0; ©1998-2009 &license.part1; + &brandFullName; &license.part0; ©1998-2009 &license.part1; &license.contrib;, &license.part2; about:license &license.part3; - Mozilla Firefox® and the Firefox logo are registered trademarks of the - Mozilla Foundation. You are not granted rights or licenses to the trademarks - of the Mozilla Foundation or any party, including without limitation the - Firefox name or logo. Gecko® is a registered trademark of Netscape - Communications Corporation. - - U.S. GOVERNMENT END USERS. The Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” and “commercial computer software diff -urN mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js --- mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js 2009-06-24 10:20:28.000000000 +0200 +++ mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js 2009-06-28 14:19:26.000000000 +0200 @@ -1,17 +1,17 @@ -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); +pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/"); +pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/") // The time interval between checks for a new version (in seconds) // nightly=8 hours, official=24 hours pref("app.update.interval", 28800); // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); +pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); +pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/"); // Release notes URL -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); +pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/"); // Search codes belong only in builds with official branding pref("browser.search.param.yahoo-fr", ""); diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js mozilla-1.9.1/browser/components/nsBrowserContentHandler.js --- mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js 2009-06-24 10:20:28.000000000 +0200 +++ mozilla-1.9.1/browser/components/nsBrowserContentHandler.js 2009-06-28 14:19:54.000000000 +0200 @@ -818,7 +818,7 @@ }, // XXX localize me... how? - helpInfo : "Usage: firefox [-flags] []\n", + helpInfo : "Usage: iceweasel [-flags] []\n", /* nsIFactory */ createInstance: function dch_CI(outer, iid) { diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js mozilla-1.9.1/browser/components/nsBrowserGlue.js --- mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js 2009-06-24 10:20:28.000000000 +0200 +++ mozilla-1.9.1/browser/components/nsBrowserGlue.js 2009-06-28 14:20:10.000000000 +0200 @@ -994,7 +994,7 @@ // for XPCOM - classDescription: "Firefox Browser Glue Service", + classDescription: "Iceweasel Browser Glue Service", classID: Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"), contractID: "@mozilla.org/browser/browserglue;1", diff -urN mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp --- mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp 2009-06-28 14:25:50.000000000 +0200 @@ -181,7 +181,7 @@ char* valueData; } SETTING; -#define APP_REG_NAME L"Firefox" +#define APP_REG_NAME L"Iceweasel" #define DI "\\DefaultIcon" #define SOP "\\shell\\open\\command" diff -urN mozilla-1.9.1.orig/browser/confvars.sh mozilla-1.9.1/browser/confvars.sh --- mozilla-1.9.1.orig/browser/confvars.sh 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/confvars.sh 2009-06-28 14:26:12.000000000 +0200 @@ -36,7 +36,7 @@ # # ***** END LICENSE BLOCK ***** -MOZ_APP_NAME=firefox +MOZ_APP_NAME=iceweasel MOZ_UPDATER=1 MOZ_PHOENIX=1 diff -urN mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties --- mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties 2009-06-28 14:30:14.000000000 +0200 @@ -35,23 +35,23 @@ # ***** END LICENSE BLOCK ***** malformedURI=The URL is not valid and cannot be loaded. -fileNotFound=Firefox can't find the file at %S. -dnsNotFound=Firefox can't find the server at %S. -protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program. -connectionFailure=Firefox can't establish a connection to the server at %S. +fileNotFound=Iceweasel can't find the file at %S. +dnsNotFound=Iceweasel can't find the server at %S. +protocolNotFound=Iceweasel doesn't know how to open this address, because the protocol (%S) isn't associated with any program. +connectionFailure=Iceweasel can't establish a connection to the server at %S. netInterrupt=The connection to %S was interrupted while the page was loading. netTimeout=The server at %S is taking too long to respond. -redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete. +redirectLoop=Iceweasel has detected that the server is redirecting the request for this address in a way that will never complete. ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S" confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. resendButton.label=Resend -unknownSocketType=Firefox doesn't know how to communicate with the server. +unknownSocketType=Iceweasel doesn't know how to communicate with the server. netReset=The connection to the server was reset while the page was loading. -netOffline=Firefox is currently in offline mode and can't browse the Web. +netOffline=Iceweasel is currently in offline mode and can't browse the Web. isprinting=The document cannot change while Printing or in Print Preview. -deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection. -proxyResolveFailure=Firefox is configured to use a proxy server that can't be found. -proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections. +deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Iceweasel has canceled the request for your protection. +proxyResolveFailure=Iceweasel is configured to use a proxy server that can't be found. +proxyConnectFailure=Iceweasel is configured to use a proxy server that is refusing connections. contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. externalProtocolTitle=External Protocol Request diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml --- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml 2009-06-28 14:30:42.000000000 +0200 @@ -8,6 +8,6 @@ + template="http://www.answers.com/main/startswith?output=json&client=iceweasel&s={searchTerms}"/> http://www.answers.com/ diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml --- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml 2009-06-28 14:31:31.000000000 +0200 @@ -3,7 +3,7 @@ Google Search UTF-8 data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA - + @@ -11,7 +11,7 @@ - + -http://www.google.com/firefox +http://www.google.com/ diff -urN mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul --- mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2009-06-24 10:20:52.000000000 +0200 +++ mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2009-06-28 14:45:04.000000000 +0200 @@ -55,7 +55,7 @@ diff -urN mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp --- mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp 2009-06-24 10:22:27.000000000 +0200 +++ mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp 2009-06-28 14:45:56.000000000 +0200 @@ -1231,8 +1231,7 @@ static inline void DumpVersion() { - printf("%s %s %s", - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version); + printf("%s %s", gAppData->name, gAppData->version); if (gAppData->copyright) printf(", %s", gAppData->copyright); printf("\n");
&credit.poweredByGeckoReg;
- &brandFullName;™ &license.part0; ©1998-2009 &license.part1; + &brandFullName; &license.part0; ©1998-2009 &license.part1; &license.contrib;, &license.part2; about:license &license.part3;
- Mozilla Firefox® and the Firefox logo are registered trademarks of the - Mozilla Foundation. You are not granted rights or licenses to the trademarks - of the Mozilla Foundation or any party, including without limitation the - Firefox name or logo. Gecko® is a registered trademark of Netscape - Communications Corporation.
U.S. GOVERNMENT END USERS. The Software is a “commercial item,” as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of “commercial computer software” and “commercial computer software diff -urN mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js --- mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js 2009-06-24 10:20:28.000000000 +0200 +++ mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js 2009-06-28 14:19:26.000000000 +0200 @@ -1,17 +1,17 @@ -pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); +pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/"); +pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/") // The time interval between checks for a new version (in seconds) // nightly=8 hours, official=24 hours pref("app.update.interval", 28800); // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/"); +pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/"); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard. -pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); +pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/"); // Release notes URL -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); +pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/"); // Search codes belong only in builds with official branding pref("browser.search.param.yahoo-fr", ""); diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js mozilla-1.9.1/browser/components/nsBrowserContentHandler.js --- mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js 2009-06-24 10:20:28.000000000 +0200 +++ mozilla-1.9.1/browser/components/nsBrowserContentHandler.js 2009-06-28 14:19:54.000000000 +0200 @@ -818,7 +818,7 @@ }, // XXX localize me... how? - helpInfo : "Usage: firefox [-flags] []\n", + helpInfo : "Usage: iceweasel [-flags] []\n", /* nsIFactory */ createInstance: function dch_CI(outer, iid) { diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js mozilla-1.9.1/browser/components/nsBrowserGlue.js --- mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js 2009-06-24 10:20:28.000000000 +0200 +++ mozilla-1.9.1/browser/components/nsBrowserGlue.js 2009-06-28 14:20:10.000000000 +0200 @@ -994,7 +994,7 @@ // for XPCOM - classDescription: "Firefox Browser Glue Service", + classDescription: "Iceweasel Browser Glue Service", classID: Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"), contractID: "@mozilla.org/browser/browserglue;1", diff -urN mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp --- mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp 2009-06-28 14:25:50.000000000 +0200 @@ -181,7 +181,7 @@ char* valueData; } SETTING; -#define APP_REG_NAME L"Firefox" +#define APP_REG_NAME L"Iceweasel" #define DI "\\DefaultIcon" #define SOP "\\shell\\open\\command" diff -urN mozilla-1.9.1.orig/browser/confvars.sh mozilla-1.9.1/browser/confvars.sh --- mozilla-1.9.1.orig/browser/confvars.sh 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/confvars.sh 2009-06-28 14:26:12.000000000 +0200 @@ -36,7 +36,7 @@ # # ***** END LICENSE BLOCK ***** -MOZ_APP_NAME=firefox +MOZ_APP_NAME=iceweasel MOZ_UPDATER=1 MOZ_PHOENIX=1 diff -urN mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties --- mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties 2009-06-28 14:30:14.000000000 +0200 @@ -35,23 +35,23 @@ # ***** END LICENSE BLOCK ***** malformedURI=The URL is not valid and cannot be loaded. -fileNotFound=Firefox can't find the file at %S. -dnsNotFound=Firefox can't find the server at %S. -protocolNotFound=Firefox doesn't know how to open this address, because the protocol (%S) isn't associated with any program. -connectionFailure=Firefox can't establish a connection to the server at %S. +fileNotFound=Iceweasel can't find the file at %S. +dnsNotFound=Iceweasel can't find the server at %S. +protocolNotFound=Iceweasel doesn't know how to open this address, because the protocol (%S) isn't associated with any program. +connectionFailure=Iceweasel can't establish a connection to the server at %S. netInterrupt=The connection to %S was interrupted while the page was loading. netTimeout=The server at %S is taking too long to respond. -redirectLoop=Firefox has detected that the server is redirecting the request for this address in a way that will never complete. +redirectLoop=Iceweasel has detected that the server is redirecting the request for this address in a way that will never complete. ## LOCALIZATION NOTE (confirmRepostPrompt): In this item, don't translate "%S" confirmRepostPrompt=To display this page, %S must send information that will repeat any action (such as a search or order confirmation) that was performed earlier. resendButton.label=Resend -unknownSocketType=Firefox doesn't know how to communicate with the server. +unknownSocketType=Iceweasel doesn't know how to communicate with the server. netReset=The connection to the server was reset while the page was loading. -netOffline=Firefox is currently in offline mode and can't browse the Web. +netOffline=Iceweasel is currently in offline mode and can't browse the Web. isprinting=The document cannot change while Printing or in Print Preview. -deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has canceled the request for your protection. -proxyResolveFailure=Firefox is configured to use a proxy server that can't be found. -proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections. +deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Iceweasel has canceled the request for your protection. +proxyResolveFailure=Iceweasel is configured to use a proxy server that can't be found. +proxyConnectFailure=Iceweasel is configured to use a proxy server that is refusing connections. contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. externalProtocolTitle=External Protocol Request diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml --- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml 2009-06-28 14:30:42.000000000 +0200 @@ -8,6 +8,6 @@ + template="http://www.answers.com/main/startswith?output=json&client=iceweasel&s={searchTerms}"/> http://www.answers.com/ diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml --- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml 2009-06-24 10:20:29.000000000 +0200 +++ mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml 2009-06-28 14:31:31.000000000 +0200 @@ -3,7 +3,7 @@ Google Search UTF-8 data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA - + @@ -11,7 +11,7 @@ - + -http://www.google.com/firefox +http://www.google.com/ diff -urN mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul --- mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2009-06-24 10:20:52.000000000 +0200 +++ mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul 2009-06-28 14:45:04.000000000 +0200 @@ -55,7 +55,7 @@ diff -urN mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp --- mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp 2009-06-24 10:22:27.000000000 +0200 +++ mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp 2009-06-28 14:45:56.000000000 +0200 @@ -1231,8 +1231,7 @@ static inline void DumpVersion() { - printf("%s %s %s", - gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version); + printf("%s %s", gAppData->name, gAppData->version); if (gAppData->copyright) printf(", %s", gAppData->copyright); printf("\n");