Bug 535349 - Message header pane says "to You" but search filters says "To Me"; r=bwinton

mail/base/content/msgHdrViewOverlay.js

@@ -1202,13 +1202,13 @@ function FormatDisplayName(aEmailAddress, aHeaderDisplayName, aContext, aCard)
   // If this address is one of the user's identities...
   if (aEmailAddress == identity.email) {
     var bundle = document.getElementById("bundle_messenger");
-    // ...pick a localized version of the word "You" appropriate to this
+    // ...pick a localized version of the word "Me" appropriate to this
     // specific header; fall back to the version used by the "to" header
     // if nothing else is available.
     try {
-      displayName = bundle.getString("header" + aContext + "FieldYou");
+      displayName = bundle.getString("header" + aContext + "FieldMe");
     } catch (ex) {
-      displayName = bundle.getString("headertoFieldYou");
+      displayName = bundle.getString("headertoFieldMe");
     }
 
     // Make sure we have an unambiguous name if there are multiple identities

mail/locales/en-US/chrome/messenger/messenger.properties

@@ -549,27 +549,27 @@ fileEmptyMsg = The file %S is empty.
 # on this mechanism.
 headerMoreAddrs=#1 more;#1 more
 
-# LOCALIZATION NOTE (headertoFieldYou): second person prepositional object
+# LOCALIZATION NOTE (headertoFieldMe): first person prepositional object
 # pronoun used in the "to" header of the message header pane.  This is also
 # used for the fallback case if a header-specific localization is not
 # available.
-headertoFieldYou=You
+headertoFieldMe=Me
 
-# LOCALIZATION NOTE (headerfromFieldYou): second person prepositional object
+# LOCALIZATION NOTE (headerfromFieldMe): first person prepositional object
 # pronoun used in the "from" header of the message header pane.
-headerfromFieldYou=You
+headerfromFieldMe=Me
 
-# LOCALIZATION NOTE (headerreply-toFieldYou): second person prepositional
+# LOCALIZATION NOTE (headerreply-toFieldMe): first person prepositional
 # object pronoun used in the "reply-to" header of the message header pane.
-headerreply-toFieldYou=You
+headerreply-toFieldMe=Me
 
-# LOCALIZATION NOTE (headerccFieldYou): second person prepositional object
+# LOCALIZATION NOTE (headerccFieldMe): first person prepositional object
 # pronoun used in the "cc" header of the message header pane.
-headerccFieldYou=You
+headerccFieldMe=Me
 
-# LOCALIZATION NOTE (headerbccFieldYou): second person prepositional object
+# LOCALIZATION NOTE (headerbccFieldMe): first person prepositional object
 # pronoun used in the "bcc" header of the message header pane.
-headerbccFieldYou=You
+headerbccFieldMe=Me
 
 # Shown when content tabs are being loaded.
 loadingTab=Loading…

mail/test/mozmill/multiple-identities/test-display-names.js

@@ -52,7 +52,7 @@ var secondIdentity;
 var myEmail = "sender@nul.nul"; // Dictated by messagerInjector.js
 var friendEmail = "carl@sagan.com";
 var friendName = "Carl Sagan";
-var headertoFieldYou;
+var headertoFieldMe;
 var collectedAddresses;
 
 function setupModule(module) {
@@ -99,7 +99,7 @@ function setupModule(module) {
   let bundle = Cc["@mozilla.org/intl/stringbundle;1"]
                  .getService(Ci.nsIStringBundleService).createBundle(
                    "chrome://messenger/locale/messenger.properties");
-  headertoFieldYou = bundle.GetStringFromName("headertoFieldYou");
+  headertoFieldMe = bundle.GetStringFromName("headertoFieldMe");
 }
 
 function ensure_single_identity() {
@@ -137,7 +137,7 @@ function help_test_display_name(message, field, expectedValue) {
 function test_single_identity() {
   ensure_no_card_exists(myEmail);
   ensure_single_identity();
-  help_test_display_name(0, "to", headertoFieldYou);
+  help_test_display_name(0, "to", headertoFieldMe);
 }
 
 function test_single_identity_in_abook() {
@@ -149,7 +149,7 @@ function test_single_identity_in_abook() {
 function test_single_identity_in_abook_no_pdn() {
   ensure_card_exists(myEmail, "President Frankenstein");
   ensure_single_identity();
-  help_test_display_name(0, "to", headertoFieldYou);
+  help_test_display_name(0, "to", headertoFieldMe);
 }
 
 
@@ -157,7 +157,7 @@ function test_single_identity_in_abook_no_pdn() {
 function test_multiple_identities() {
   ensure_no_card_exists(myEmail);
   ensure_multiple_identities();
-  help_test_display_name(0, "to", headertoFieldYou+" <"+myEmail+">");
+  help_test_display_name(0, "to", headertoFieldMe+" <"+myEmail+">");
 }
 
 function test_multiple_identities_in_abook() {
@@ -169,7 +169,7 @@ function test_multiple_identities_in_abook() {
 function test_multiple_identities_in_abook_no_pdn() {
   ensure_card_exists(myEmail, "President Frankenstein");
   ensure_multiple_identities();
-  help_test_display_name(0, "to", headertoFieldYou+" <"+myEmail+">");
+  help_test_display_name(0, "to", headertoFieldMe+" <"+myEmail+">");
 }