Supplemental patch to Bug 408613, put back the 'None' options on the LDAP address book selection menulists. r/sr=Neil
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 09 Sep 2008 12:07:44 +0100
changeset 297 dd785a9c110711b63325d8e14fd42b7dd66d773b
parent 296 9c411f661785160e87c1df366afc1fa7ccd4dc31
child 298 adbb63fc38c90af90cccc6dbc18c32d532ac5f13
push idunknown
push userunknown
push dateunknown
bugs408613
Supplemental patch to Bug 408613, put back the 'None' options on the LDAP address book selection menulists. r/sr=Neil
mailnews/addrbook/prefs/resources/content/pref-addressing.xul
mailnews/base/prefs/resources/content/am-addressingOverlay.xul
suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
suite/locales/en-US/chrome/mailnews/pref/am-addressing.dtd
suite/locales/en-US/chrome/mailnews/pref/pref-addressing.dtd
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -108,16 +108,17 @@
       <hbox align="center">
         <checkbox id="autocompleteLDAP" label="&directories.label;"
                   preference="ldap_2.autoComplete.useDirectory"
                   accesskey="&directories.accesskey;"/>
         <menulist id="directoriesList" flex="1"
                   aria-labelledby="autocompleteLDAP"
                   preference="ldap_2.autoComplete.directoryServer">
           <menupopup id="directoriesListPopup" class="addrbooksPopup"
+                     none="&directoriesNone.label;"
                      remoteonly="true" value="dirPrefId"/>
         </menulist>
         <button id="editButton" label="&editDirectories.label;"
                 oncommand="onEditDirectories();"
                 accesskey="&editDirectories.accesskey;"
                 preference="pref.ldap.disable_button.edit_directories"/>
       </hbox>
     </groupbox>
--- a/mailnews/base/prefs/resources/content/am-addressingOverlay.xul
+++ b/mailnews/base/prefs/resources/content/am-addressingOverlay.xul
@@ -124,16 +124,17 @@
         <radio id="useGlobalPref" value="0" label="&useGlobal.label;"
                accesskey="&useGlobal.accesskey;"/>
         <radio id="directories" value="1" label="&directories.label;"
                accesskey="&directories.accesskey;"/>
         <hbox class="indent">
           <menulist id="directoriesList" wsm_persist="true"
                     style="min-width: 16em;" aria-labelledby="directories">
             <menupopup id="directoriesListPopup" class="addrbooksPopup"
+                       none="&directoriesNone.label;"
                        remoteonly="true" value="dirPrefId"/>
           </menulist>
           <button id="editButton" label="&editDirectories.label;"
                   accesskey="&editDirectories.accesskey;"
                   oncommand="onEditDirectories();"/>
         </hbox>
       </radiogroup>      
     </groupbox>
--- a/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/locales/en-US/chrome/mailnews/addressbook/addressBook.properties
@@ -130,17 +130,16 @@ matchFound=1 match found
 matchesFound=%S matches found
 
 cardsCopied=%S cards copied
 cardCopied=1 card copied
 cardsMoved=%S cards moved
 cardMoved=1 card moved
 
 # LDAP directory stuff
-directoriesListItemNone=None
 invalidName=Please enter a valid Name.
 invalidHostname=Please enter a valid Hostname.
 invalidPortNumber=Please enter a valid Port Number.
 invalidResults=Please enter a valid number in the results field.
 abReplicationOfflineWarning=You must be online to perform LDAP replication.
 abReplicationSaveSettings=Settings must be saved before a directory may be downloaded.
 
 # For importing / exporting
--- a/suite/locales/en-US/chrome/mailnews/pref/am-addressing.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/am-addressing.dtd
@@ -8,16 +8,17 @@
 <!-- LOCALIZATION NOTE (override.label) : do not translate "LDAP" in below line -->
 <!ENTITY useGlobal.label           "Use my global LDAP server preferences for this account">
 <!ENTITY useGlobal.accesskey       "U">
 <!ENTITY editDirectories.label     "Edit Directories…">
 <!ENTITY editDirectories.accesskey "E">
 <!-- LOCALIZATION NOTE (directories.label) : do not translate "LDAP" in below line -->
 <!ENTITY directories.label         "Use a different LDAP server:">
 <!ENTITY directories.accesskey     "d">
+<!ENTITY directoriesNone.label     "None">
 
 <!-- am-addressing.xul -->
 
 <!ENTITY compositionGroupTitle.label "Composition">
 <!-- LOCALIZATION NOTE (useHtml.label) : do not translate "html" in below line -->
 <!ENTITY useHtml.label                        "Compose messages in HTML format">
 <!ENTITY useHtml.accesskey                    "C">
 <!ENTITY autoQuote.label                      "Automatically quote the original message when replying">
--- a/suite/locales/en-US/chrome/mailnews/pref/pref-addressing.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-addressing.dtd
@@ -45,12 +45,13 @@
 <!ENTITY addressingTitle.label                 "Address Autocompletion">
 <!ENTITY highlightNonMatches.label             "Highlight addresses that do not autocomplete">
 <!ENTITY highlightNonMatches.accesskey         "a">
 <!ENTITY addressingEnable.label                "Local Address Books">
 <!ENTITY addressingEnable.accesskey            "L">
 <!ENTITY autocompleteText.label                "When addressing messages, look for matching entries in:">
 <!ENTITY directories.label                     "Directory Server:">
 <!ENTITY directories.accesskey                 "D">
+<!ENTITY directoriesNone.label                 "None">
 <!ENTITY editDirectories.label                 "Edit Directories…">
 <!ENTITY editDirectories.accesskey             "E">
 <!ENTITY matchText.label                       "If there is a match in your local address books:">
 <!ENTITY skipDirectory.label                   "Do not search in the directory">