Bug 455246 Change address book UI to refer to Contacts rather than Cards, second part, most of SM only changes. r=Mynromyr,sr=Neil
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 18 Dec 2008 13:38:13 +0000
changeset 6925 7839b8af35fd3c5ccb188f2ee805def4103e05fc
parent 6924 8fcb1b1c170913626a30c1373779af6e8d80ea0b
child 6926 79a652d65b8aa3f00bd6d7047629586c2dc6e516
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersMynromyr, Neil
bugs455246
Bug 455246 Change address book UI to refer to Contacts rather than Cards, second part, most of SM only changes. r=Mynromyr,sr=Neil X-Channel-Repo: comm-central X-Channel-Converted-Revision: a21dd6e6a6b2bbc7a5c0a588a1d2ae302c0f214d
suite/chrome/browser/mailNavigatorOverlay.dtd
suite/chrome/mailnews/addressbook/abMainWindow.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/mailOverlay.dtd
--- a/suite/chrome/browser/mailNavigatorOverlay.dtd
+++ b/suite/chrome/browser/mailNavigatorOverlay.dtd
@@ -1,14 +1,14 @@
 <!ENTITY newMessageCmd.label             "Message">
 <!ENTITY newMessageCmd.accesskey         "M">
 <!ENTITY newMessageCmd.key               "M">
 
-<!ENTITY newCardCmd.label                "Address Book Card…">
-<!ENTITY newCardCmd.accesskey            "C">
+<!ENTITY newContactCmd.label             "Contact…">
+<!ENTITY newContactCmd.accesskey         "C">
 
 <!ENTITY sendPage.label                  "Send Page…">
 <!ENTITY sendPage.accesskey              "S">
 
 <!ENTITY contextSendThisPage.label       "Send This Page…">
 <!ENTITY contextSendThisPage.accesskey   "d">
 <!ENTITY contextSendThisLink.label       "Send This Link…">
 <!ENTITY contextSendThisLink.accesskey   "k">
--- a/suite/chrome/mailnews/addressbook/abMainWindow.dtd
+++ b/suite/chrome/mailnews/addressbook/abMainWindow.dtd
@@ -36,45 +36,45 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!-- Title -->
 <!ENTITY addressbookWindow.title                        "Address Book">
 
 <!-- Menus:  the . means that the menu item isn't implemented yet -->
 
 <!-- File Menu -->
-<!ENTITY newCard.label                                  "Address Book Card…">
-<!-- LOCALIZATION NOTE (newCard.accesskey) : DONT_TRANSLATE -->  
-<!ENTITY newCard.accesskey                              "C">  
+<!ENTITY newContact.label                               "Contact…">
+<!-- LOCALIZATION NOTE (newContact.accesskey) : DONT_TRANSLATE -->
+<!ENTITY newContact.accesskey                           "C">
 <!ENTITY newListCmd.label                               "Mailing List…">
 <!-- LOCALIZATION NOTE (newListCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY newListCmd.accesskey                           "L">  
 <!ENTITY newAddressBookCmd.label                        "Address Book…"> 
 <!ENTITY newAddressBookCmd.accesskey                    "o">  
 <!ENTITY newLDAPDirectoryCmd.label                      "LDAP Directory…">
 <!-- LOCALIZATION NOTE (newLDAPDirectoryCmd.accesskey) : DONT_TRANSLATE -->
 <!ENTITY newLDAPDirectoryCmd.accesskey                  "D">
 <!ENTITY newIM.label                                    "IM">
-<!ENTITY printCardViewCmd.label                         "Print Card…">
-<!ENTITY printCardViewCmd.accesskey                     "p">
-<!ENTITY printPreviewCardViewCmd.label                  "Print Preview Card">
-<!ENTITY printPreviewCardViewCmd.accesskey              "v">
+<!ENTITY printContactViewCmd.label                      "Print Contact…">
+<!ENTITY printContactViewCmd.accesskey                  "p">
+<!ENTITY printPreviewContactViewCmd.label               "Print Preview Contact">
+<!ENTITY printPreviewContactViewCmd.accesskey           "v">
 <!-- LOCALIZATION NOTE (printCardViewCmd.key) : DONT_TRANSLATE -->  
-<!ENTITY printCardViewCmd.key                           "P">
+<!ENTITY printContactViewCmd.key                        "P">
 <!ENTITY printAddressBook.label                         "Print Address Book…"> 
 <!ENTITY printAddressBook.accesskey                     "A"> 
 <!ENTITY printPreviewAddressBook.label                  "Print Preview Address Book"> 
 <!ENTITY printPreviewAddressBook.accesskey              "B">
 <!ENTITY printSetupCmd.label                            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey                        "u">
 
 <!-- Edit Menu -->
 <!ENTITY deleteAbCmd.label                              "Delete Address Book">  
-<!ENTITY deleteCardCmd.label                            "Delete Card">  
-<!ENTITY deleteCardsCmd.label                           "Delete Selected Cards">  
+<!ENTITY deleteContactCmd.label                         "Delete Contact">
+<!ENTITY deleteContactsCmd.label                        "Delete Selected Contacts">
 <!ENTITY deleteListCmd.label                            "Delete List">
 <!ENTITY deleteListsCmd.label                           "Delete Selected Lists">
 <!ENTITY deleteItemsCmd.label                           "Delete Selected Items">
 <!ENTITY swapFirstNameLastNameCmd.label                 "Swap First/Last Name">
 <!ENTITY swapFirstNameLastNameCmd.accesskey             "w">  
 <!ENTITY propertiesCmd.label                            "Properties…">
 <!-- LOCALIZATION NOTE (propertiesCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY propertiesCmd.accesskey                        "i">  
@@ -100,37 +100,37 @@
 <!ENTITY importCmd.label                                "Import…">
 <!ENTITY importCmd.accesskey                            "I">
 <!ENTITY exportCmd.label                                "Export…">
 <!ENTITY exportCmd.accesskey                            "E">
 <!ENTITY allowOnlineCheck.label                         "Check online presence (AOL)">
 <!ENTITY allowOnlineCheck.accesskey                     "C">
 
 <!-- Toolbar and Popup items -->  
-<!ENTITY newcardButton.label                            "New Card">  
-<!ENTITY newcardButton.accesskey                        "C">  
+<!ENTITY newContactButton.label                         "New Contact">
+<!ENTITY newContactButton.accesskey                     "C">
 <!ENTITY newlistButton.label                            "New List">  
 <!ENTITY newlistButton.accesskey                        "L">  
-<!ENTITY editButton.label                               "Properties">  
-<!ENTITY editButton.accesskey                           "P">  
+<!ENTITY editItemButton.label                           "Properties">
+<!ENTITY editItemButton.accesskey                       "P">
 <!ENTITY newmsgButton.label                             "Compose">  
 <!ENTITY newmsgButton.accesskey                         "C">  
-<!ENTITY deleteButton.label                             "Delete">  
-<!ENTITY deleteButton.accesskey                         "D">  
+<!ENTITY deleteItemButton.label                         "Delete">
+<!ENTITY deleteItemButton.accesskey                     "D">
 <!ENTITY newimButton.label                              "Instant Message">  
 <!ENTITY newimButton.accesskey                          "I">  
 
 <!-- Tooltips -->
 <!ENTITY addressbookToolbar.tooltip                     "Address Book Toolbar">
-<!ENTITY newcardButton.tooltip                          "Create a new address book card"> 
+<!ENTITY newContactButton.tooltip                       "Create a new address book contact">
 <!ENTITY newlistButton.tooltip                          "Create a new list"> 
-<!ENTITY editButton.tooltip                             "Edit the selected card"> 
+<!ENTITY editItemButton.tooltip                         "Edit the selected item">
 <!ENTITY newmsgButton.tooltip                           "Send a mail message"> 
 <!ENTITY newIM.tooltip                                  "Send an instant message or chat"> 
-<!ENTITY deleteButton.tooltip                           "Delete selected card or address book"> 
+<!ENTITY deleteItemButton.tooltip                       "Delete selected item">
 <!ENTITY throbber.tooltip                               "Go to the &vendorShortName; home page">
 <!ENTITY advancedButton.tooltip                         "Advanced address search">
 
 <!-- Status Bar -->  
 <!ENTITY statusText.label                               "">
 
 <!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
 <!-- Swap FN/LN UI  Set to "false" to show swap fn/ln UI -->
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -39,22 +39,22 @@
 
 #
 # The following are used by the Mailing list dialog
 #
 emptyListName=You must enter a list name.
 lastFirstFormat=%S, %S
 firstLastFormat=%S %S  
 
-newCardTitle=New Card  
+newContactTitle=New Contact
 # %S will be the card's display name
-newCardTitleWithDisplayName=New Card for %S
-editCardTitle=Edit Card
+newContactTitleWithDisplayName=New Contact for %S
+editContactTitle=Edit Contact
 # %S will be the card's display name
-editCardTitleWithDisplayName=Edit Card for %S
+editContactTitleWithDisplayName=Edit Contact for %S
 # don't translate vCard
 editVCardTitle=Edit vCard
 # %S will be the card's display name, don't translate vCard
 editVCardTitleWithDisplayName=Edit vCard for %S
 
 ## LOCALIZATION NOTE (cardRequiredDataMissingMessage):  do not localize \n
 cardRequiredDataMissingMessage=You must enter at least one of the following items:\nEmail Address, First Name, Last Name, Display Name, Organization.
 cardRequiredDataMissingTitle=Required Information Missing
@@ -67,17 +67,17 @@ mailListNameExistsTitle=Mailing List Alr
 mailListNameExistsMessage=A Mailing List with that name already exists. Please choose a different name.
 
 # used in the addressbook
 confirmDeleteMailingListTitle=Delete Mailing List
 confirmDeleteAddressbookTitle=Delete Address Book
 confirmDeleteAddressbook=Are you sure you want to delete the selected address book?
 confirmDeleteCollectionAddressbook=If this address book is deleted, %S will no longer collect addresses. Are you sure you want to delete the selected address book?
 confirmDeleteMailingList=Are you sure you want to delete the selected mailing list?
-confirmDeleteListsAndCards=Are you sure you want to delete the selected cards and mailing lists?
+confirmDeleteListsAndContacts=Are you sure you want to delete the selected contacts and mailing lists?
 confirmDeleteMailingLists=Are you sure you want to delete the selected mailing lists?
 
 propertyPrimaryEmail=Email
 propertyListName=List Name
 propertySecondaryEmail=Additional Email
 propertyScreenName=Screen Name
 propertyNickname=Nickname
 propertyDisplayName=Display Name
@@ -124,17 +124,17 @@ ldap_2.servers.history.description=Colle
 ## LOCALIZATION NOTE (ldap_2.servers.oe.description is only used on Windows)
 ldap_2.servers.oe.description=OE Contacts
 ## LOCALIZATION NOTE (ldap_2.servers.osx.description is only used on Mac OS X)
 ldap_2.servers.osx.description=Mac OS X Address Book
 
 # status bar stuff
 ## LOCALIZATION NOTE (totalCardStatus): 
 ## %1$S is address book name, %2$S is card count
-totalCardStatus=Total Cards in %1$S: %2$S
+totalContactStatus=Total contacts in %1$S: %2$S
 ## LOCALIZATION NOTE (matchesFound):  do not localize %S
 noMatchFound=No matches found
 matchFound=1 match found
 matchesFound=%S matches found
 
 cardsCopied=%S cards copied
 cardCopied=1 card copied
 cardsMoved=%S cards moved
--- a/suite/chrome/mailnews/mailOverlay.dtd
+++ b/suite/chrome/mailnews/mailOverlay.dtd
@@ -1,8 +1,8 @@
 
 <!ENTITY  newMessageCmd.key               "M">
 <!ENTITY  newMessageCmd.label             "Message">
 <!ENTITY  newMessageCmd.accesskey         "m">
  
-<!ENTITY  newCardCmd.label                "Address Book Card…">
-<!ENTITY  newCardCmd.accesskey            "c">
+<!ENTITY  newContactCmd.label             "Contact…">
+<!ENTITY  newContactCmd.accesskey         "C">