MoMo try: -b o -p all -u all -t none
authoraceman <acelists@atlas.sk>
Mon, 11 Jun 2012 10:53:26 +0100
changeset 12445 b043a5de00a4053e45813279385ce28f6ff27480
parent 12442 29e0c83f32e71a512b1b2a881f59217a00a3c678
push id60
push userbugzilla@standard8.plus.com
push dateMon, 11 Jun 2012 09:53:36 +0000
treeherdertry-comm-central@b043a5de00a4 [default view] [failures only]
MoMo try: -b o -p all -u all -t none
mail/app/module.ver
mail/app/profile/all-thunderbird.js
mail/build/KEY
mail/locales/en-US/chrome/messenger/accountCreation.properties
mail/test/mozmill/composition/test-attachment.js
mail/test/mozmill/composition/test-focus.js
other-licenses/branding/thunderbird/branding.nsi
other-licenses/branding/thunderbird/thunderbird-branding.js
--- a/mail/app/module.ver
+++ b/mail/app/module.ver
@@ -1,9 +1,9 @@
 WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
 WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
 WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
 WIN32_MODULE_COPYRIGHT=ŠThunderbird and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_COMPANYNAME=Mozilla Messaging
+WIN32_MODULE_COMPANYNAME=Mozilla Corporation
 WIN32_MODULE_TRADEMARKS=Thunderbird is a Trademark of The Mozilla Foundation.
 WIN32_MODULE_COMMENT=Mozilla Thunderbird Mail and News Client
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -62,17 +62,17 @@ pref("app.update.silent", false);
 // Update service URL:
 pref("app.update.url", "https://aus3.mozilla.org/update/3/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
 
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
 pref("app.update.url.manual", "http://www.getthunderbird.com");
 // 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.mozillamessaging.com/%LOCALE%/%APP%/releases/");
+pref("app.update.url.details", "http://www.mozilla.org/%LOCALE%/%APP%/releases/");
 // User-settable override to app.update.url for testing purposes.
 //pref("app.update.url.override", "");
 
 // app.update.interval is in branding section
 // app.update.promptWaitTime is in branding section
 
 // Show the Update Checking/Ready UI when the user was idle for x seconds
 pref("app.update.idletime", 60);
@@ -459,17 +459,17 @@ pref("mail.compose.big_attachments.thres
 // True if the user should be notified that links will be inserted into
 // their message when the upload is completed
 pref("mail.compose.big_attachments.insert_notification", true);
 
 // Set this to false to prevent instrumentation from happening, e.g., user
 // has opted out, or an enterprise wants to disable it from the git go.
 pref("mail.instrumentation.askUser", true);
 pref("mail.instrumentation.userOptedIn", false);
-pref("mail.instrumentation.postUrl", "https://www.mozillamessaging.com/instrumentation");
+pref("mail.instrumentation.postUrl", "https://www.mozilla.org/instrumentation");
 // not sure how this will be formatted - would be nice to make it extensible.
 pref("mail.instrumentation.lastNotificationSent", "");
 
 pref("browser.formfill.enable", true);
 
 // Disable autoplay as we don't handle audio elements in emails very well.
 // See bug 515082.
 pref("media.autoplay.enabled", false);
deleted file mode 100644
--- a/mail/build/KEY
+++ /dev/null
@@ -1,135 +0,0 @@
-This file contains the PGP keys of various developers that work on
-Mozilla and its subprojects (such as Firefox and Thunderbird).
-
-Please don't use these keys for email unless you have asked the owner
-because some keys are only used for code signing.
-
-Please realize that this file itself or the public key servers may be
-compromised.  You are encouraged to validate the authenticity of these keys in
-an out-of-band manner.
-
-Mozilla users: pgp < KEY
-Mozilla developers: 
-        (pgpk -ll <your name> && pgpk -xa <your name>) >> KEY
-      or
-        (gpg --fingerprint --list-sigs <your name> \
-             && gpg --armor --export <your name>) >> KEY
-
-Mozilla developers: please ensure that your key is also available via the
-PGP keyservers (such as pgpkeys.mit.edu).
-
-pub   2048R/0xCB7F028BF4E9976A 2011-01-17
-      Key fingerprint = 5359 FB89 462A 570B 13BA  BAFF CB7F 028B F4E9 976A
-uid                            Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sig 3        0xCB7F028BF4E9976A 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sig          0x16E8A0CFF6C242EC 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sub   2048R/0x56B089CA32DDF8E8 2011-01-17
-sig          0xCB7F028BF4E9976A 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sub   2048R/0x572CDD8D6C3FA385 2011-01-17
-sig          0xCB7F028BF4E9976A 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-
-pub   2048R/0x16E8A0CFF6C242EC 2011-01-17
-      Key fingerprint = 699C 617E A779 238B 92C7  744D 16E8 A0CF F6C2 42EC
-uid                            Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sig 3        0x16E8A0CFF6C242EC 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sig          0xCB7F028BF4E9976A 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sub   2048R/0x26BA0C027440D658 2011-01-17
-sig          0x16E8A0CFF6C242EC 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-sub   2048R/0x22E6EE63F93BCD41 2011-01-17
-sig          0x16E8A0CFF6C242EC 2011-01-17  Mozilla Messaging Inc. (Code Signing) <build@mozillamessaging.com>
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-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
-1U+6bQ==
-=p7Uc
------END PGP PUBLIC KEY BLOCK-----
--- a/mail/locales/en-US/chrome/messenger/accountCreation.properties
+++ b/mail/locales/en-US/chrome/messenger/accountCreation.properties
@@ -13,25 +13,25 @@ default_server_tag= (default)
 # Content of server port field (usually a number), used when the user didn't
 # enter anything yet and we'll automatically detect it later.
 port_auto=Auto
 
 # config titles
 # LOCALIZATION NOTE(looking_up_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 looking_up_settings_disk=Looking up configuration: %1$S installation
 looking_up_settings_isp=Looking up configuration: Email provider
-# LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
+# LOCALIZATION NOTE(looking_up_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Corporation. The database is a generic, public domain facility usable by any client.
 looking_up_settings_db=Looking up configuration: Mozilla ISP database
 # LOCALIZATION NOTE(looking_up_settings_guess): We are checking common server names like pop., pop3., smtp., mail., without knowing whether they exist or really serve this email account. If a server responds, we try to talk to it via POP/IMAP/SMTP protocols and query its capabilities. If that succeeds, we assume we found a configuration. Of course, it may still be wrong, but it often works.
 looking_up_settings_guess=Looking up configuration: Trying common server names
 looking_up_settings_halfmanual=Looking up configuration: Probing server
 # LOCALIZATION NOTE(found_settings_disk): Referring to Thunderbird installation folder on user's harddisk. %1$S will be the brandShortName.
 found_settings_disk=Configuration found on %1$S installation
 found_settings_isp=Configuration found at email provider
-# LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Messaging. The database is a generic, public domain facility usable by any client.
+# LOCALIZATION NOTE(found_settings_db): Do not translate or replace Mozilla. It stands for the public project mozilla.org, not Mozilla Corporation. The database is a generic, public domain facility usable by any client.
 found_settings_db=Configuration found in Mozilla ISP database
 # LOCALIZATION NOTE(found_settings_guess): We tried common mail server names and we found a mail server and talked to it and it responded properly, so we think we found a suitable configuration, but we are only about 80% certain that it is the correct setting for this email address. There's a chance that email address may not actually be served by this server and it won't work, or that there is a better server.
 found_settings_guess=Configuration found by trying common server names
 found_settings_halfmanual=The following settings were found by probing the given server
 # LOCALIZATION NOTE(failed_to_find_settings): %1$S will be the brandShortName.
 failed_to_find_settings=%1$S failed to find the settings for your email account.
 manually_edit_config=Editing Config
 # LOCALIZATION NOTE(guessed_settings_offline) User is offline, so we just took a wild guess and the user will have to enter the right settings.
--- a/mail/test/mozmill/composition/test-attachment.js
+++ b/mail/test/mozmill/composition/test-attachment.js
@@ -167,17 +167,17 @@ function test_file_attachment() {
   check_total_attachment_size(cwc, 1);
 
   close_compose_window(cwc);
 }
 
 function test_webpage_attachment() {
   let cwc = open_compose_new_mail();
 
-  add_attachment(cwc, "http://www.mozillamessaging.com/");
+  add_attachment(cwc, "http://www.mozilla.org/");
   check_no_attachment_size(cwc, 0);
   check_total_attachment_size(cwc, 1);
 
   close_compose_window(cwc);
 }
 
 function test_multiple_attachments() {
   let cwc = open_compose_new_mail();
--- a/mail/test/mozmill/composition/test-focus.js
+++ b/mail/test/mozmill/composition/test-focus.js
@@ -73,25 +73,25 @@ function check_element_cycling(controlle
 function test_f6_no_attachment() {
   let cwc = open_compose_new_mail();
   check_element_cycling(cwc, false, false);
   close_compose_window(cwc);
 }
 
 function test_f6_attachment() {
   let cwc = open_compose_new_mail();
-  add_attachment(cwc, "http://www.mozillamessaging.com/");
+  add_attachment(cwc, "http://www.mozilla.org/");
   check_element_cycling(cwc, true, false);
   close_compose_window(cwc);
 }
 
 function test_ctrl_tab_no_attachment() {
   let cwc = open_compose_new_mail();
   check_element_cycling(cwc, false, true);
   close_compose_window(cwc);
 }
 
 function test_ctrl_tab_attachment() {
   let cwc = open_compose_new_mail();
-  add_attachment(cwc, "http://www.mozillamessaging.com/");
+  add_attachment(cwc, "http://www.mozilla.org/");
   check_element_cycling(cwc, true, true);
   close_compose_window(cwc);
 }
old mode 100755
new mode 100644
--- a/other-licenses/branding/thunderbird/branding.nsi
+++ b/other-licenses/branding/thunderbird/branding.nsi
@@ -35,12 +35,12 @@
 # ***** END LICENSE BLOCK *****
 
 # NSIS defines for official release builds.
 # The nightly build branding.nsi is located in mail/installer/windows/nsis
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Thunderbird"
-!define CompanyName           "Mozilla Messaging"
-!define URLInfoAbout          "http://www.mozillamessaging.com/${AB_CD}/"
-!define URLUpdateInfo         "http://www.mozillamessaging.com/${AB_CD}/thunderbird/"
+!define CompanyName           "Mozilla Corporation"
+!define URLInfoAbout          "http://www.mozilla.org/${AB_CD}/"
+!define URLUpdateInfo         "http://www.mozilla.org/${AB_CD}/thunderbird/"
 !define SurveyURL             "http://live.mozillamessaging.com/survey/uninstall/?locale=${AB_CD}&version=${AppVersion}"
--- a/other-licenses/branding/thunderbird/thunderbird-branding.js
+++ b/other-licenses/branding/thunderbird/thunderbird-branding.js
@@ -10,11 +10,11 @@ pref("app.update.interval", 86400);
 
 // The time interval between the downloading of mar file chunks in the
 // background (in seconds)
 pref("app.update.download.backgroundInterval", 600);
 
 // Give the user x seconds to react before showing the big UI. default=24 hours
 pref("app.update.promptWaitTime", 86400);
 
-pref("app.vendorURL", "http://www.mozillamessaging.com/%LOCALE%/%APP%/");
+pref("app.vendorURL", "http://www.mozilla.org/%LOCALE%/%APP%/");
 
 pref("browser.search.param.ms-pc", "MOZT");