diff -p -up comm-beta/suite/browser/browser-prefs.js.branding comm-beta/suite/browser/browser-prefs.js --- comm-beta/suite/browser/browser-prefs.js.branding 2012-07-21 19:49:40.000000000 +0200 +++ comm-beta/suite/browser/browser-prefs.js 2012-07-25 03:06:15.532531361 +0200 @@ -80,7 +80,7 @@ pref("browser.findbar.enabled", true); pref("browser.doorhanger.enabled", true); // search engines URL -pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/"); +pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); @@ -416,7 +416,7 @@ pref("app.support.baseURL", "http://www. // App-specific update preferences // Whether or not app updates are enabled -pref("app.update.enabled", true); +pref("app.update.enabled", false); // This preference turns on app.update.mode and allows automatic download and // install to take place. We use a separate boolean toggle for this to make @@ -536,7 +536,7 @@ pref("extensions.blocklist.interval", 86 pref("extensions.blocklist.level", 2); pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); -pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); +pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/blocked/%blockID%"); // Update preferences for installed Extensions and Themes. // Symmetric (can be overridden by individual extensions), @@ -560,11 +560,11 @@ pref("extensions.autoDisableScopes", 15) // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); +pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%"); +pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/discovery/pane/%VERSION%/%OS%"); // getMoreThemes is used by our UI under our switch theme menu pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); diff -p -up comm-beta/suite/installer/package-manifest.in.branding comm-beta/suite/installer/package-manifest.in --- comm-beta/suite/installer/package-manifest.in.branding 2012-07-21 19:49:40.000000000 +0200 +++ comm-beta/suite/installer/package-manifest.in 2012-07-25 03:06:13.598544042 +0200 @@ -512,7 +512,7 @@ @BINPATH@/chrome/icons/default/places.png @BINPATH@/chrome/icons/default/places16.png @BINPATH@/chrome/icons/default/places48.png -@BINPATH@/chrome/icons/default/seamonkey.png +@BINPATH@/chrome/icons/default/iceape.png #ifdef MOZ_UPDATER @BINPATH@/icons/updater.png #endif diff -p -up comm-beta/suite/locales/en-US/chrome/branding/brand.dtd.branding comm-beta/suite/locales/en-US/chrome/branding/brand.dtd --- comm-beta/suite/locales/en-US/chrome/branding/brand.dtd.branding 2012-07-21 19:49:40.000000000 +0200 +++ comm-beta/suite/locales/en-US/chrome/branding/brand.dtd 2012-07-25 03:06:13.603544009 +0200 @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandFullName "SeaMonkey"> -<!ENTITY brandShortName "SeaMonkey"> -<!ENTITY vendorShortName "SeaMonkey"> +<!ENTITY brandFullName "Iceape"> +<!ENTITY brandShortName "Iceape"> +<!ENTITY vendorShortName "Mageia"> <!ENTITY sidebarName "Sidebar"> diff -p -up comm-beta/suite/locales/en-US/chrome/branding/brand.properties.branding comm-beta/suite/locales/en-US/chrome/branding/brand.properties --- comm-beta/suite/locales/en-US/chrome/branding/brand.properties.branding 2012-07-21 19:49:40.000000000 +0200 +++ comm-beta/suite/locales/en-US/chrome/branding/brand.properties 2012-07-25 03:06:13.608543976 +0200 @@ -2,9 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandFullName=SeaMonkey -brandShortName=SeaMonkey -vendorShortName=SeaMonkey +brandFullName=Iceape +brandShortName=Iceape +vendorShortName=Mageia sidebarName=Sidebar extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas diff -p -up comm-beta/suite/locales/en-US/chrome/browser/navigator.properties.branding comm-beta/suite/locales/en-US/chrome/browser/navigator.properties --- comm-beta/suite/locales/en-US/chrome/browser/navigator.properties.branding 2012-07-21 19:49:40.000000000 +0200 +++ comm-beta/suite/locales/en-US/chrome/browser/navigator.properties 2012-08-03 01:22:39.141696108 +0200 @@ -69,9 +69,9 @@ editBookmark.removeBookmarks.label=Remov # Used as the bookmark name when saving a keyword for a search field. addKeywordTitleAutoFill=Search %S -extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=SeaMonkey Default Theme +extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=Iceape Default Theme extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=This theme uses styles and colors from the system to fit in with other applications. -extensions.modern@themes.mozilla.org.name=SeaMonkey Modern +extensions.modern@themes.mozilla.org.name=Iceape Modern extensions.modern@themes.mozilla.org.description=A contemporary theme for all components. diff -p -up comm-beta/suite/themes/classic/install.rdf.branding comm-beta/suite/themes/classic/install.rdf --- comm-beta/suite/themes/classic/install.rdf.branding 2012-07-21 19:49:41.000000000 +0200 +++ comm-beta/suite/themes/classic/install.rdf 2012-07-25 03:06:13.613543944 +0200 @@ -25,7 +25,7 @@ </em:targetApplication> <!-- Front End MetaData --> - <em:name>SeaMonkey Default Theme</em:name> + <em:name>Iceape Default Theme</em:name> <em:description>This theme uses styles and colors from the system to fit in with other applications.</em:description> <!-- EXTENSION AUTHORS! diff -p -up comm-beta/suite/themes/modern/install.rdf.branding comm-beta/suite/themes/modern/install.rdf --- comm-beta/suite/themes/modern/install.rdf.branding 2012-07-21 19:49:41.000000000 +0200 +++ comm-beta/suite/themes/modern/install.rdf 2012-07-25 03:06:13.617543917 +0200 @@ -24,7 +24,7 @@ </em:targetApplication> <!-- Front End MetaData --> - <em:name>SeaMonkey Modern</em:name> + <em:name>Iceape Modern</em:name> <em:description>A contemporary theme for all components.</em:description> <!-- EXTENSION AUTHORS!