From 30491f76f3557040181691b7159ca58ae7194f8b Mon Sep 17 00:00:00 2001 From: putterman Date: Thu, 21 May 1998 18:06:21 +0000 Subject: [PATCH] Merging into Normandy git-svn-id: svn://10.0.0.236/branches/NORMANDY_BRANCH@2114 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/winfe/mozilla.rc | 854 ++++++++++++++++-------------- mozilla/cmd/winfe/res/mozilla.rc2 | 575 +++++++++++++------- 2 files changed, 838 insertions(+), 591 deletions(-) diff --git a/mozilla/cmd/winfe/mozilla.rc b/mozilla/cmd/winfe/mozilla.rc index 94845afcf93..87bafaaf113 100644 --- a/mozilla/cmd/winfe/mozilla.rc +++ b/mozilla/cmd/winfe/mozilla.rc @@ -147,6 +147,7 @@ IDB_BUTTON_FOLDER BITMAP DISCARDABLE "res\\button_f.bmp" IDB_BACK BITMAP DISCARDABLE "res\\msgback.bmp" IDB_USERBTN BITMAP DISCARDABLE "res\\defuser.bmp" IDB_SECURE_STATUS BITMAP DISCARDABLE "res\\ssecure.bmp" +IDB_OFFLINE_STATUS BITMAP DISCARDABLE "res\\offline.bmp" LANGDOWND BITMAP DISCARDABLE "RES\\DOWND.BMP" IDB_NAV_BAR BITMAP DISCARDABLE "res\\hdrgbar.bmp" IDB_NAV_BAR1 BITMAP DISCARDABLE "res\\vdrgbar.bmp" @@ -747,149 +748,149 @@ BEGIN LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP END -IDD_SEARCH DIALOG DISCARDABLE 0, 0, 324, 140 +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 294, 166 STYLE WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_COMBO_SCOPE,71,6,173,61,CBS_DROPDOWNLIST | + LTEXT "Search for items in:",IDC_STATIC,7,7,61,8 + COMBOBOX IDC_COMBO_SCOPE,7,18,173,235,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_AND_OR,10,26,155,45,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_ATTRIB1,45,45,67,60,CBS_DROPDOWNLIST | + CONTROL "Match an&y of the following",IDC_RADIO_ANY,"Button", + BS_AUTORADIOBUTTON,7,53,99,10 + CONTROL "Match al&l of the following",IDC_RADIO_ALL,"Button", + BS_AUTORADIOBUTTON,115,53,94,10 + COMBOBOX IDC_COMBO_ATTRIB1,7,70,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP1,116,45,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP1,74,70,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE1,195,45,64,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB2,45,60,67,57,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE1,141,70,86,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB2,7,84,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP2,116,60,75,63,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP2,74,84,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE2,195,60,64,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB3,45,75,67,60,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE2,141,84,86,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB3,7,98,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP3,116,75,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP3,74,98,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE3,195,75,64,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB4,45,90,67,60,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE3,141,98,86,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB4,7,112,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP4,116,90,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE4,195,90,64,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB5,45,105,67,60,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_OP4,74,112,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP5,116,105,75,60,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE4,141,112,86,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB5,7,126,65,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE5,141,126,86,12,ES_AUTOHSCROLL + PUSHBUTTON "&More",IDC_MORE,7,145,35,14 + PUSHBUTTON "&Fewer",IDC_FEWER,45,145,35,14 + DEFPUSHBUTTON "&Search",IDC_FIND,237,7,50,14 + PUSHBUTTON "&Clear Search",IDC_NEW,237,24,50,14 + PUSHBUTTON "&Options...",IDC_ADVANCED_OPTIONS,237,42,50,14 + PUSHBUTTON "Save &As...",IDC_SAVE,237,60,50,14 + PUSHBUTTON "&Help",IDC_SEARCHHELP,237,78,50,14 + COMBOBOX IDC_COMBO_OP5,74,126,65,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE5,195,105,64,12,ES_AUTOHSCROLL - PUSHBUTTON "&More",IDC_MORE,45,121,29,13 - PUSHBUTTON "&Fewer",IDC_FEWER,82,121,29,13 - DEFPUSHBUTTON "&Search",IDC_FIND,267,6,47,12 - PUSHBUTTON "&Clear Search",IDC_NEW,196,121,48,13 - PUSHBUTTON "Save &As...",IDC_SAVE,267,36,48,12 - RTEXT "Search for items in",IDC_STATIC,6,9,62,9 - RTEXT "the",IDC_STATIC_THE1,30,48,11,8 - PUSHBUTTON "&Help",IDC_SEARCHHELP,267,51,48,12 - RTEXT "the",IDC_STATIC_THE2,13,62,28,9 - RTEXT "the",IDC_STATIC_THE3,13,77,28,9 - RTEXT "the",IDC_STATIC_THE4,13,89,28,9 - RTEXT "the",IDC_STATIC_THE5,13,103,28,9 - PUSHBUTTON "&Options...",IDC_ADVANCED_SEARCH,267,21,48,12 END -IDD_MAILFILTER DIALOG DISCARDABLE 0, 0, 376, 207 +IDD_MAILFILTER DIALOG DISCARDABLE 0, 0, 376, 225 STYLE DS_MODALFRAME | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION CAPTION "Filter Rules" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_EDIT_NAME,50,7,83,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_AND_OR,50,25,130,45,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_ATTRIB1,50,43,73,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP1,183,43,72,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE1,256,43,107,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB2,50,57,73,59,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP2,183,57,72,59,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE2,256,57,107,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB3,50,71,73,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP3,183,71,72,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE3,256,71,107,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB4,50,85,73,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP4,183,85,72,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE4,256,85,107,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB5,50,99,73,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP5,183,99,72,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE5,256,99,107,12,ES_AUTOHSCROLL - PUSHBUTTON "More",IDC_MORE,50,115,30,14 - PUSHBUTTON "Fewer",IDC_FEWER,93,115,30,14 - COMBOBOX IDC_COMBO_ACTION,50,132,96,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_DEST,150,132,162,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_DESC,49,152,314,27,ES_AUTOHSCROLL - CONTROL "Off",IDC_RADIO_OFF,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,51,188,24,10 - CONTROL "On",IDC_RADIO_ON,"Button",BS_AUTORADIOBUTTON,76,188,25, - 10 - DEFPUSHBUTTON "OK",IDOK,206,184,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,259,184,50,14 RTEXT "Filter name:",IDC_STATIC,7,9,39,10 - RTEXT "the",IDC_STATIC_THE1,7,45,39,8 + EDITTEXT IDC_EDIT_NAME,50,7,135,12,ES_AUTOHSCROLL + CONTROL "Match an&y of the following",IDC_RADIO_ANY,"Button", + BS_AUTORADIOBUTTON,50,37,99,10 + CONTROL "Match al&l of the following",IDC_RADIO_ALL,"Button", + BS_AUTORADIOBUTTON,158,37,94,10 + PUSHBUTTON "&Advanced...",IDC_ADVANCED_OPTIONS,319,7,50,14 + RTEXT "the",IDC_STATIC_THE1,7,55,39,8 + COMBOBOX IDC_COMBO_ATTRIB1,50,53,73,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP CONTROL "of the message",IDC_STATIC_OF1,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,128,46,51,8 - RTEXT "the",IDC_STATIC_THE2,7,59,39,8 + SS_LEFTNOWORDWRAP | WS_GROUP,128,56,51,8 + COMBOBOX IDC_COMBO_OP1,183,53,72,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE1,256,53,113,12,ES_AUTOHSCROLL + RTEXT "the",IDC_STATIC_THE2,7,69,39,8 + COMBOBOX IDC_COMBO_ATTRIB2,50,67,73,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP CONTROL "of the message",IDC_STATIC_OF2,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,128,60,51,8 - RTEXT "the",IDC_STATIC_THE3,7,73,39,8 + SS_LEFTNOWORDWRAP | WS_GROUP,128,70,51,8 + COMBOBOX IDC_COMBO_OP2,183,67,72,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE2,256,67,113,12,ES_AUTOHSCROLL + RTEXT "the",IDC_STATIC_THE3,7,83,39,8 + COMBOBOX IDC_COMBO_ATTRIB3,50,81,73,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP CONTROL "of the message",IDC_STATIC_OF3,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,128,74,51,8 - RTEXT "the",IDC_STATIC_THE4,7,87,39,8 + SS_LEFTNOWORDWRAP | WS_GROUP,128,84,51,8 + COMBOBOX IDC_COMBO_OP3,183,81,72,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE3,256,81,113,12,ES_AUTOHSCROLL + RTEXT "the",IDC_STATIC_THE4,7,97,39,8 + COMBOBOX IDC_COMBO_ATTRIB4,50,95,73,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP CONTROL "of the message",IDC_STATIC_OF4,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,128,88,51,8 - RTEXT "the",IDC_STATIC_THE5,7,102,39,8 + SS_LEFTNOWORDWRAP | WS_GROUP,128,98,51,8 + COMBOBOX IDC_COMBO_OP4,183,95,72,100,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE4,256,95,113,12,ES_AUTOHSCROLL + RTEXT "the",IDC_STATIC_THE5,7,112,39,8 + COMBOBOX IDC_COMBO_ATTRIB5,50,109,73,101,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP CONTROL "of the message",IDC_STATIC_OF5,"Static", - SS_LEFTNOWORDWRAP | WS_GROUP,128,102,51,8 - RTEXT "then",IDC_STATIC1,7,134,39,8 - RTEXT "Description:",IDC_STATIC2,7,153,41,8 - RTEXT "Filter is:",IDC_STATIC3,7,188,41,10 - PUSHBUTTON "&Help",IDC_NETHELP,313,184,50,14 - PUSHBUTTON "&New Folder",IDC_BUTTON_NEW_FOLDER,315,132,48,14 + SS_LEFTNOWORDWRAP | WS_GROUP,128,112,51,8 + COMBOBOX IDC_COMBO_OP5,183,109,72,101,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE5,256,109,113,12,ES_AUTOHSCROLL + PUSHBUTTON "&More",IDC_MORE,50,125,35,14 + PUSHBUTTON "&Fewer",IDC_FEWER,88,125,35,14 + RTEXT "then",IDC_STATIC1,7,152,39,8 + COMBOBOX IDC_COMBO_ACTION,50,150,96,112,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_DEST,150,150,167,176,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New Folder...",IDC_BUTTON_NEW_FOLDER,319,150,50,14 + RTEXT "Description:",IDC_STATIC2,7,171,41,8 + EDITTEXT IDC_EDIT_DESC,49,170,320,27,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,212,204,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,265,204,50,14 + PUSHBUTTON "&Help",IDC_NETHELP,319,204,50,14 END -IDD_FILTER_PICKER DIALOG DISCARDABLE 0, 0, 263, 193 +IDD_FILTER_PICKER DIALOG DISCARDABLE 0, 0, 263, 226 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Mail Filters" FONT 8, "MS Sans Serif" BEGIN - LISTBOX IDC_LIST_FILTERS,6,26,145,91,LBS_OWNERDRAWFIXED | + LISTBOX IDC_LIST_FILTERS,5,50,154,91,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_VSCROLL | WS_TABSTOP CONTROL "LANGUP",IDC_UP,"Button",BS_OWNERDRAW | WS_DISABLED | - WS_TABSTOP,153,47,20,20 + WS_TABSTOP,165,71,20,20 CONTROL "LANGDOWN",IDC_DOWN,"Button",BS_OWNERDRAW | WS_DISABLED | - WS_TABSTOP,153,70,20,20 - PUSHBUTTON "&New...",IDC_NEW,206,7,50,14 - PUSHBUTTON "&Edit...",IDC_EDIT,206,24,50,14 - PUSHBUTTON "&Delete",IDC_DELETE,206,42,50,14 + WS_TABSTOP,165,94,20,20 + PUSHBUTTON "&New...",IDC_NEW,206,50,50,14 + PUSHBUTTON "&Edit...",IDC_EDIT,206,68,50,14 + PUSHBUTTON "&Delete",IDC_DELETE,206,86,50,14 CONTROL "&Log Filter Use",IDC_CHECK_LOG,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,6,121,59,10 - PUSHBUTTON "&View Log",IDC_VIEW,206,116,50,14 - DEFPUSHBUTTON "OK",IDOK,94,172,50,14 - PUSHBUTTON "Cancel",IDCANCEL,150,172,50,14 - PUSHBUTTON "&Help",IDC_FILTER_HELP,206,172,50,14 - LTEXT "No Way! Filters Rule!",IDC_STATIC_DESCRIPTION,6,137,250, + WS_TABSTOP,5,145,59,10 + PUSHBUTTON "&View Log",IDC_VIEW,206,145,50,14 + DEFPUSHBUTTON "OK",IDOK,97,205,50,14 + PUSHBUTTON "Cancel",IDCANCEL,151,205,50,14 + PUSHBUTTON "&Help",IDC_FILTER_HELP,206,205,50,14 + LTEXT "No Way! Filters Rule!",IDC_STATIC_DESCRIPTION,5,166,251, 29,SS_NOPREFIX | WS_BORDER - LTEXT "Filters will be applied to mail in the following order:", - IDC_STATIC,6,7,146,17 + COMBOBOX IDC_COMBO_SERVER_SCOPE,5,17,154,91,CBS_DROPDOWNLIST | + CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + LTEXT "Filters for:",IDC_FILTERSFORSTATIC,5,7,31,8 + PUSHBUTTON "Filters on Server...",IDC_BUTTON_SERVER_FILTERS,191,17, + 65,14 + LTEXT "Filters will be applied in the following order:", + IDC_STATIC,5,39,134,8 END IDD_LDAPSEARCH DIALOG DISCARDABLE 0, 0, 322, 28 @@ -917,20 +918,20 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "All Groups" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_COMBO_SERVER,71,6,201,112,CBS_DROPDOWNLIST | + RTEXT "&Newsgroup:",IDC_STATIC,7,25,43,9 + EDITTEXT IDC_EDIT_NEWSGROUP,56,24,214,12,ES_AUTOHSCROLL + CONTROL "",IDC_NEWSGROUPS,"Static",SS_BLACKFRAME,7,45,263,163 + PUSHBUTTON "&Add Server...",IDC_ADD_SERVER,294,7,59,14 + PUSHBUTTON "S&ubscribe",IDC_SUBSCRIBE,294,54,59,14 + PUSHBUTTON "U&nsubscribe",IDC_UNSUBSCRIBE,294,72,59,14 + PUSHBUTTON "&Refresh List",IDC_GET_DELETE,294,90,59,14 + PUSHBUTTON "&Expand",IDC_EXPAND_ALL,294,126,59,14 + PUSHBUTTON "&Collapse All",IDC_COLLAPSE_ALL,294,144,59,14 + PUSHBUTTON "S&top",IDC_STOP,294,194,59,14 + RTEXT "&Server:",IDC_STATIC,7,8,43,9 + COMBOBOX IDC_COMBO_SERVER,56,7,214,112,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Add Server...",IDC_ADD_SERVER,288,7,59,12 - EDITTEXT IDC_EDIT_NEWSGROUP,70,24,202,12,ES_AUTOHSCROLL - PUSHBUTTON "S&ubscribe",IDC_SUBSCRIBE,288,55,59,13 - PUSHBUTTON "U&nsubscribe",IDC_UNSUBSCRIBE,288,75,59,12 - PUSHBUTTON "&Refresh List",IDC_GET_DELETE,288,95,59,12 - PUSHBUTTON "&Expand",IDC_EXPAND_ALL,288,115,59,12 - PUSHBUTTON "&Collapse All",IDC_COLLAPSE_ALL,288,135,59,12 - PUSHBUTTON "S&top",IDC_STOP,288,190,59,12 - CONTROL "",IDC_NEWSGROUPS,"Static",SS_BLACKFRAME,7,48,265,160 - RTEXT "&Discussion Group:",IDC_STATIC,3,24,62,9 - RTEXT "&Server:",IDC_STATIC,3,9,62,9 END IDD_NEWSGROUP_NEW DIALOG DISCARDABLE 0, 0, 360, 215 @@ -938,19 +939,18 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "New Groups" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_COMBO_SERVER,39,6,234,112,CBS_DROPDOWNLIST | + RTEXT "&Server:",IDC_STATIC,7,8,43,12 + COMBOBOX IDC_COMBO_SERVER,56,7,214,112,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Add Server...",IDC_ADD_SERVER,288,7,59,12 - PUSHBUTTON "S&ubscribe",IDC_SUBSCRIBE,288,55,59,12 - PUSHBUTTON "U&nsubscribe",IDC_UNSUBSCRIBE,288,75,59,12 - PUSHBUTTON "&Refresh List",IDC_GET_NEW,288,95,59,12 - PUSHBUTTON "&Clear List",IDC_CLEAR_NEW,288,115,59,12 - PUSHBUTTON "S&top",IDC_STOP,288,190,59,12 - CONTROL "",IDC_NEWSGROUPS,"Static",SS_BLACKFRAME,7,41,266,164 - LTEXT "This list shows all new discussion groups since you last clicked Clear New.", - IDC_STATIC,7,28,264,10 - LTEXT "&Server:",IDC_STATIC,7,7,30,12 + LTEXT "This list shows all new Newsgroups since you last clicked Clear List", + IDC_STATIC,7,35,264,10 + CONTROL "",IDC_NEWSGROUPS,"Static",SS_BLACKFRAME,7,45,263,163 + PUSHBUTTON "S&ubscribe",IDC_SUBSCRIBE,294,54,59,14 + PUSHBUTTON "U&nsubscribe",IDC_UNSUBSCRIBE,294,72,59,14 + PUSHBUTTON "&Refresh List",IDC_GET_NEW,294,90,59,14 + PUSHBUTTON "&Clear List",IDC_CLEAR_NEW,294,108,59,14 + PUSHBUTTON "S&top",IDC_STOP,294,194,59,14 END IDD_NEWSGROUP_SEARCH DIALOG DISCARDABLE 0, 0, 360, 215 @@ -958,49 +958,50 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Search for a Group" FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_COMBO_SERVER,52,4,218,112,CBS_DROPDOWNLIST | + RTEXT "S&earch for:",-1,7,25,43,9 + EDITTEXT IDC_EDIT_NEWSGROUP,56,24,214,12,ES_AUTOHSCROLL + CONTROL "",IDC_NEWSGROUPS,"Static",SS_BLACKFRAME,7,45,263,163 + PUSHBUTTON "Sea&rch Now",IDC_SEARCH_NOW,294,24,59,14 + PUSHBUTTON "S&ubscribe",IDC_SUBSCRIBE,294,54,59,14 + PUSHBUTTON "U&nsubscribe",IDC_UNSUBSCRIBE,294,72,59,14 + PUSHBUTTON "S&top",IDC_STOP,294,194,59,14 + RTEXT "&Server:",-1,7,8,43,9 + COMBOBOX IDC_COMBO_SERVER,56,7,214,112,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_NEWSGROUP,51,24,219,12,ES_AUTOHSCROLL - PUSHBUTTON "&Add Server...",IDC_ADD_SERVER,288,7,59,12 - PUSHBUTTON "Sea&rch Now",IDC_SEARCH_NOW,288,24,59,12 - PUSHBUTTON "S&ubscribe",IDC_SUBSCRIBE,288,55,59,12 - PUSHBUTTON "U&nsubscribe",IDC_UNSUBSCRIBE,288,75,59,12 - PUSHBUTTON "S&top",IDC_STOP,288,190,59,12 - CONTROL "",IDC_NEWSGROUPS,"Static",SS_BLACKFRAME,7,46,264,163 - RTEXT "S&earch for:",-1,7,24,39,9 - RTEXT "&Server:",-1,7,6,39,9 +END + +IDD_NEWSGROUP_SERVERTYPE DIALOG DISCARDABLE 0, 0, 209, 76 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Add Server" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Select the type of server:",IDC_STATIC,8,6,82,8 + CONTROL "&News Server (NNTP)",IDC_RADIO_NNTP,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,9,22,169,10 + CONTROL "&IMAP Server",IDC_RADIO_IMAP,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,9,38,173,10 + DEFPUSHBUTTON "Continue...",IDOK,98,55,50,14 + PUSHBUTTON "Cancel",IDCANCEL,152,55,50,14 END IDD_NEWSGROUP_ADDSERVER DIALOG DISCARDABLE 0, 0, 186, 101 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "New Discussion Groups Server" +CAPTION "New Newsgroups Server" FONT 8, "MS Sans Serif" BEGIN + LTEXT "Server:",IDC_STATIC,7,10,25,10 + LTEXT "Static",IDC_STATIC_HOST,35,10,140,12 LTEXT "&Port:",IDC_STATIC,7,29,25,10 EDITTEXT IDC_EDIT_PORT,35,28,83,12,ES_AUTOHSCROLL CONTROL "Se&cure",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,35,47,49,13 - DEFPUSHBUTTON "OK",IDOK,21,79,50,14 - PUSHBUTTON "Cancel",IDCANCEL,76,79,50,14 CONTROL "&Always use name and password",IDC_USE_NAME,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,35,62,143,13 - PUSHBUTTON "Help",ID_HELP,129,79,50,14 - LTEXT "Server:",IDC_STATIC,7,10,25,10 - LTEXT "Static",IDC_STATIC_HOST,36,10,140,12 - EDITTEXT IDC_EDIT_HOST,34,8,142,14,ES_AUTOHSCROLL -END - -IDD_ADDRESSBOOK DIALOG DISCARDABLE 0, 0, 332, 34 -STYLE WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Select a directory and type in the name you are looking for:", - IDC_STATIC,0,5,203,8 - COMBOBOX IDC_DIRECTORIES,0,16,130,80,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_ADDRNAME,134,16,133,13,ES_AUTOHSCROLL - PUSHBUTTON "Search...",IDC_DIRSEARCH,277,16,50,13 + DEFPUSHBUTTON "OK",IDOK,21,80,50,14 + PUSHBUTTON "Cancel",IDCANCEL,75,80,50,14 + PUSHBUTTON "Help",ID_HELP,129,80,50,14 + EDITTEXT IDC_EDIT_HOST,35,8,142,14,ES_AUTOHSCROLL END 1536 DIALOG DISCARDABLE 0, 0, 181, 132 @@ -1033,7 +1034,7 @@ BEGIN WS_VISIBLE | WS_GROUP | WS_TABSTOP,123,97,50,12 END -IDD_PREF_LDAP_SERVER DIALOG DISCARDABLE 0, 0, 313, 87 +IDD_PREF_LDAP_SERVER DIALOG DISCARDABLE 0, 0, 303, 87 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "LDAP Server Properties" FONT 8, "MS Sans Serif" @@ -1054,31 +1055,33 @@ BEGIN CONTROL "S&ave Password",IDC_SAVE_PASSWORD,"Button", BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,155,68,75, 10 - DEFPUSHBUTTON "OK",IDOK,251,10,50,14 - PUSHBUTTON "Cancel",IDCANCEL,251,27,50,14 - PUSHBUTTON "Help",ID_HELP,251,46,50,14 + DEFPUSHBUTTON "OK",IDOK,246,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,246,25,50,14 + PUSHBUTTON "Help",ID_HELP,246,43,50,14 END -IDD_PP_FOLDER DIALOG DISCARDABLE 0, 0, 204, 157 +IDD_PP_FOLDER DIALOG DISCARDABLE 0, 0, 204, 133 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Name: ",IDC_STATIC,9,11,27,8 - EDITTEXT IDC_EDIT1,44,9,147,12,ES_AUTOHSCROLL - LTEXT "Location:",IDC_STATIC,9,28,34,9 - LTEXT "Mail Server",IDC_MAIL_SERVER_NAME,44,29,137,10 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,9,41,189,1 - LTEXT "Unread Messages:",IDC_STATIC,9,47,60,8 - LTEXT "Total Messages:",IDC_STATIC,9,60,52,8 - LTEXT "?",IDC_STATIC_UNREAD,77,48,113,8 - LTEXT "???",IDC_STATIC_TOTAL,77,61,113,8 - CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,9,75,191,1 - LTEXT "Space Wasted:",IDC_STATIC,9,81,49,9 - LTEXT "Total Space Used:",IDC_STATIC,9,92,59,9 - LTEXT "???",IDC_PERCENT_WASTED,77,82,113,8 - LTEXT "???",IDC_USED_SPACE,77,93,113,8 - PUSHBUTTON "&Clean Up Wasted Space",IDC_BUTTON1,111,140,91,15 + RTEXT "Folder Name: ",IDC_STATIC,6,10,60,8 + EDITTEXT IDC_EDIT1,70,7,127,12,ES_AUTOHSCROLL + RTEXT "Location:",IDC_STATIC,6,24,60,8 + LTEXT "Mail Server",IDC_MAIL_SERVER_NAME,70,24,111,8 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,47,189,1 + LTEXT "Unread Messages:",IDC_STATIC,6,53,60,8 + RTEXT "Total Messages:",IDC_STATIC,6,65,60,8 + LTEXT "?",IDC_STATIC_UNREAD,70,53,119,8 + LTEXT "???",IDC_STATIC_TOTAL,70,66,119,8 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,6,80,190,1 + RTEXT "Space Wasted:",IDC_STATIC,6,88,60,8 + LTEXT "Total Space Used:",IDC_STATIC,6,101,60,8 + LTEXT "???",IDC_PERCENT_WASTED,70,89,119,8 + LTEXT "???",IDC_USED_SPACE,70,100,119,8 + PUSHBUTTON "&Compact Folder",IDC_BUTTON1,122,112,75,14 + RTEXT "Type:",IDC_STATIC,6,35,60,8 + LTEXT "Mail Folder",IDC_STATIC_TYPE,70,35,121,8 END IDD_SETUPWIZARD_NAMEEMAIL DIALOG DISCARDABLE 0, 0, 229, 156 @@ -1125,18 +1128,18 @@ BEGIN IDC_TEXT1,19,54,208,19 END -IDD_NEWFOLDER DIALOG DISCARDABLE 0, 0, 255, 62 +IDD_NEWFOLDER DIALOG DISCARDABLE 0, 0, 218, 70 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "New Folder" FONT 8, "MS Sans Serif" BEGIN - EDITTEXT IDC_EDIT1,47,7,112,14,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO1,47,43,112,82,CBS_DROPDOWNLIST | + LTEXT "Name:",IDC_STATIC,7,7,22,8 + EDITTEXT IDC_EDIT1,7,18,131,14,ES_AUTOHSCROLL + LTEXT "Create as subfolder of:",IDC_STATIC,7,39,72,8 + COMBOBOX IDC_COMBO1,7,50,131,133,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,198,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,198,24,50,14 - LTEXT "Name: ",IDC_STATIC,7,7,36,8 - LTEXT "Create as sub-folder of: ",IDC_STATIC,7,28,91,8 + DEFPUSHBUTTON "OK",IDOK,161,7,50,14 + PUSHBUTTON "Cancel",IDCANCEL,161,24,50,14 END IDD_HISTORYBAR DIALOG DISCARDABLE 0, 0, 330, 129 @@ -1207,7 +1210,7 @@ BEGIN LTEXT "Headers",IDC_STATIC,97,49,28,8 CONTROL "&Mark remaining headers as read",IDC_CHECK1,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,19,63,114,10 - DEFPUSHBUTTON "Download",IDOK,71,85,50,14 + DEFPUSHBUTTON "Download",IDOK,75,85,50,14 PUSHBUTTON "Cancel",IDCANCEL,129,85,50,14 END @@ -1232,7 +1235,7 @@ BEGIN PUSHBUTTON "&More...",IDC_BNT_MORE,142,81,50,15 LTEXT "When it's time to clean up messages:",IDC_STATIC,8,8, 151,8 - PUSHBUTTON "&Download Now",IDC_DOWNLOAD_NOW,52,139,102,15 + PUSHBUTTON "&Download Now",IDC_DOWNLOAD_NOW,52,137,102,15 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,191,1 END @@ -1268,9 +1271,10 @@ BEGIN LTEXT "Enables network connections",IDC_STATIC,33,49,120,15 LTEXT "Disables network connections until you say so.", IDC_STATIC,33,86,146,19 - CONTROL "Set as &default",IDC_CHECK_ASKME_DEFAULT,"Button", - BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,21,114,105,14 - LTEXT "Changes the ""Ask Me"" preference to the above option so you won't be asked again.", + CONTROL "&Remember Previous State",IDC_CHECK_ASKME_DEFAULT, + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,21,114, + 139,14 + LTEXT "Communicator will remember what state it was in last and start in that mode.", IDC_STATIC,33,129,141,20 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,10,109,177,1 END @@ -1280,9 +1284,8 @@ STYLE WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Download Settings" FONT 8, "MS Sans Serif" BEGIN - CONTROL "&Select this discussion for download", - IDC_CHECK_DOWNLOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 16,9,168,11 + CONTROL "&Select this newsgroup for download",IDC_CHECK_DOWNLOAD, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,9,168,11 CONTROL "Use &default settings from preferences", IDC_CHECK_DEFAULT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 16,31,168,9 @@ -1292,7 +1295,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,34,70,73,10 CONTROL "&from",IDC_RADIO_FROM,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,44,87,31,9 - COMBOBOX IDC_COMBO2,83,84,57,32,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO2,82,84,57,32,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "sin&ce",IDC_RADIO_SINCE,"Button",BS_AUTORADIOBUTTON,44, 104,31,11 @@ -1322,8 +1325,8 @@ BEGIN PUSHBUTTON "Help",IDC_HELP_GO_OFFLINE,125,139,55,13 CONTROL "Download &Mail",IDC_CHECK_DOWNLOAD_MAIL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,40,47,64,11 - CONTROL "Dow&nload Discussion Groups",IDC_CHECK_DOWNLOAD_DISC, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,40,64,109,14 + CONTROL "Dow&nload Newsgroups",IDC_CHECK_DOWNLOAD_DISC,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,40,64,109,14 PUSHBUTTON "Select &Items For Download...",IDC_BUTTON_SELECT,40,88, 105,16 CONTROL "&Send Messages",IDC_CHECK_SEND_MESSAGES,"Button", @@ -1384,7 +1387,7 @@ END IDD_SELECT_DISCUSSIONS DIALOG DISCARDABLE 0, 0, 274, 263 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Discussion Groups" +CAPTION "Newsgroups" FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "Choose &All",IDC_BUTTON_SELECT_ALL,6,242,50,14 @@ -1405,7 +1408,8 @@ STYLE WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "&Go to Message Folder",IDC_TO,7,7,85,15 - PUSHBUTTON "F&ile Message ",IDC_BUTTON_FILE_MESSAGE,98,7,85,15 + PUSHBUTTON "F&ile Message...",IDC_BUTTON_FILE_MESSAGE,97,7,66,15 + PUSHBUTTON "&Delete Message",IDC_BUTTON_DELETE_MESSAGE,168,7,66,15 END IDD_PP_NEWS_GENERAL DIALOG DISCARDABLE 0, 0, 206, 159 @@ -1417,7 +1421,7 @@ BEGIN LTEXT "Pretty Name??",IDC_PRETTY_NAME,40,9,152,8 LTEXT "(ugly.group.name)???",IDC_UGLY_NAME,40,19,152,8 LTEXT "Location:",IDC_STATIC,8,32,31,8 - LTEXT "Discussion Host",IDC_NEWS_SERVER,40,32,149,8 + LTEXT "Newsgroup Host",IDC_NEWS_SERVER,40,32,149,8 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,43,192,1 LTEXT "Unread Messages:",IDC_STATIC,7,48,59,8 LTEXT "?",IDC_STATIC_UNREAD,73,49,72,9 @@ -1428,7 +1432,7 @@ BEGIN CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,82,192,1 CONTROL "Can Receive HTML",IDC_CHECK_RECEIVE_HTML,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,8,89,84,8 - LTEXT "Unchecking this option will cause this discussion group and all discussion groups above it in the hierarchy to turn off the ability to receive HTML.", + LTEXT "Unchecking this option will cause this Newsgroup and all Newsgroups above it in the hierarchy to turn off the ability to receive HTML.", IDC_STATIC,21,103,171,28 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,131,192,1 PUSHBUTTON "&Download Now",IDC_DOWNLOAD_NOW,52,137,102,15 @@ -1569,24 +1573,15 @@ BEGIN LTEXT "Description",IDC_STATIC3,67,38,157,27 END -IDD_ADVANCED_SEARCH DIALOG DISCARDABLE 0, 0, 187, 106 +IDD_ADVANCED_SEARCH DIALOG DISCARDABLE 0, 0, 212, 117 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Sans Serif" BEGIN - CONTROL "&Search Subfolders",IDC_CHECK_SUBFOLDERS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,8,8,120,10 - CONTROL "on &your local system",IDC_RADIO_SEARCH_LOCAL,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,12,39,140,8 - CONTROL "on the s&pecified server",IDC_RADIO_SEARCH_SERVER, - "Button",BS_AUTORADIOBUTTON,12,50,140,8 - DEFPUSHBUTTON "OK",IDOK,129,86,50,14 - PUSHBUTTON "Cancel",IDCANCEL,75,86,50,14 - PUSHBUTTON "Help",IDC_ADVANCED_SEARCH_HELP,21,86,50,14 - GROUPBOX "When online, search for messages",IDC_STATIC,7,26,172, - 49,WS_GROUP - LTEXT "In offline mode, all searches are done locally.", - IDC_STATIC,24,64,150,10 + CONTROL "Search &subfolders",IDC_CHECK_SUBFOLDERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,15,73,10 + CONTROL "Search &locally only",IDC_CHECK_SEARCH_LOCALLY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,30,75,10 END IDD_NETPROFILE_LOGIN DIALOG DISCARDABLE 0, 0, 234, 162 @@ -1607,22 +1602,18 @@ BEGIN PUSHBUTTON "Advanced >>",IDC_ADVANCED,162,102,50,14 END -IDD_HEADER_LIST DIALOG DISCARDABLE 0, 0, 182, 116 +IDD_HEADER_LIST DIALOG DISCARDABLE 0, 0, 212, 117 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Customize" +CAPTION "Customize Headers" FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Customize the message headers that you can search for and filter on.", - IDC_STATIC,9,6,161,18 - LISTBOX IDC_HEADER_LIST,8,24,107,65,LBS_SORT | LBS_USETABSTOPS | - LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | - WS_TABSTOP - DEFPUSHBUTTON "&New",IDC_ADD_HEADER,123,24,50,14 - PUSHBUTTON "&Edit",IDC_EDIT_HEADER_NAME,123,43,50,14 - PUSHBUTTON "&Delete",IDC_REMOVE_HEADER,123,62,50,14 - PUSHBUTTON "OK",IDOK,123,94,50,14 - PUSHBUTTON "Cancel",IDCANCEL,70,94,50,14 - PUSHBUTTON "Help",IDC_HEADER_HELP,17,94,50,14 + LTEXT "New message header:",IDC_STATIC,7,7,72,8 + EDITTEXT IDC_EDIT_NEW_HEADER,7,18,136,14,ES_AUTOHSCROLL + LISTBOX IDC_HEADER_LIST,7,33,136,77,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "&Add",IDC_ADD_HEADER,155,18,50,14 + PUSHBUTTON "&Remove",IDC_REMOVE_HEADER,155,35,50,14 + PUSHBUTTON "Re&place",IDC_REPLACE_HEADER,155,53,50,14 END IDD_EXPORTRDF DIALOG DISCARDABLE 0, 0, 249, 82 @@ -1643,51 +1634,51 @@ FONT 8, "MS Sans Serif" BEGIN END -IDD_ADVANCED_LDAP_SEARCH DIALOG DISCARDABLE 0, 0, 298, 144 +IDD_ADVANCED_LDAP_SEARCH DIALOG DISCARDABLE 0, 0, 298, 157 STYLE WS_CHILD | WS_DISABLED | WS_BORDER FONT 8, "MS Sans Serif" BEGIN - COMBOBOX IDC_COMBO_AND_OR,39,17,146,45,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_ATTRIB1,39,34,67,60,CBS_DROPDOWNLIST | + COMBOBOX IDC_COMBO_ATTRIB1,39,46,67,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP1,110,34,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP1,110,46,75,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE1,189,34,105,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB2,39,49,67,57,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE1,189,46,105,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB2,39,61,67,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP2,110,49,75,63,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP2,110,61,75,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE2,189,49,105,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB3,39,64,67,60,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE2,189,61,105,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB3,39,76,67,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP3,110,64,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP3,110,76,75,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE3,189,64,105,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB4,39,79,67,60,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE3,189,76,105,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB4,39,91,67,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP4,110,79,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_OP4,110,91,75,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE4,189,79,105,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO_ATTRIB5,39,94,67,60,CBS_DROPDOWNLIST | + EDITTEXT IDC_EDIT_VALUE4,189,91,105,12,ES_AUTOHSCROLL + COMBOBOX IDC_COMBO_ATTRIB5,39,106,67,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO_OP5,110,94,75,60,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - EDITTEXT IDC_EDIT_VALUE5,189,94,105,12,ES_AUTOHSCROLL - PUSHBUTTON "&More",IDC_MORE,39,110,29,12 - PUSHBUTTON "&Fewer",IDC_FEWER,76,110,29,12 - RTEXT "Search for items in",IDC_STATIC,4,4,58,9 - LTEXT "where",IDC_STATIC,189,4,29,9 - RTEXT "the",IDC_STATIC_THE1,24,36,11,8 - RTEXT "the",IDC_STATIC_THE2,7,51,28,9 - RTEXT "the",IDC_STATIC_THE3,7,66,28,9 - RTEXT "the",IDC_STATIC_THE4,7,81,28,9 - RTEXT "the",IDC_STATIC_THE5,7,95,28,9 - LTEXT "matches",IDC_STATIC,189,20,30,8 + COMBOBOX IDC_COMBO_OP5,110,106,75,80,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_EDIT_VALUE5,189,106,105,12,ES_AUTOHSCROLL + PUSHBUTTON "&More",IDC_MORE,39,122,29,12 + PUSHBUTTON "&Fewer",IDC_FEWER,76,122,29,12 + RTEXT "Searching:",IDC_STATIC,4,4,58,9 + RTEXT "the",IDC_STATIC_THE1,24,48,11,8 + RTEXT "the",IDC_STATIC_THE2,7,63,28,9 + RTEXT "the",IDC_STATIC_THE3,7,78,28,9 + RTEXT "the",IDC_STATIC_THE4,7,93,28,9 + RTEXT "the",IDC_STATIC_THE5,7,107,28,9 LTEXT "Server Name",IDC_STATIC1,66,4,114,8 - PUSHBUTTON "&Clear Search",IDC_CLEAR_SEARCH,231,110,48,12 + PUSHBUTTON "&Clear Search",IDC_CLEAR_SEARCH,231,122,48,12 CTEXT "Search results will appear in the address book window.", - IDC_STATIC_DESC,4,126,290,8 + IDC_STATIC_DESC,4,138,290,8 + CONTROL "Match all items below (And)",IDC_RADIO_ALL,"Button", + BS_AUTORADIOBUTTON,13,15,102,10 + CONTROL "Match one or more of the items below (Or)", + IDC_RADIO_ANY,"Button",BS_AUTORADIOBUTTON,13,30,147,10 END IDD_BASIC_SEARCH DIALOG DISCARDABLE 0, 0, 298, 85 @@ -1741,14 +1732,14 @@ BEGIN WS_TABSTOP,23,205,81,10 CONTROL "Address Book",IDC_ADDBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,218,81,10 - CONTROL "Navigation Center",IDC_SELECTEDBOOKMARKS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,109,179,81,10 - CONTROL "User Preferences",IDC_SUGGESTIONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,109,192,81,10 + CONTROL "Navigation Center",IDC_SELECTEDBOOKMARKS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,109,179,81,10 + CONTROL "User Preferences",IDC_SUGGESTIONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,109,192,81,10 CONTROL "Java Security",IDC_JAVA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,205,81,10 - CONTROL "Certificates",IDC_SECURITY_TYPE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,109,218,81,10 + CONTROL "Certificates",IDC_SECURITY_TYPE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,109,218,81,10 END IDD_XPPROGRESS DIALOG DISCARDABLE 0, 0, 287, 95 @@ -1763,24 +1754,24 @@ BEGIN CTEXT "Line 2 Text",IDC_LINE2,7,21,273,8 END -IDD_PREF_CHOOSE_FOLDER DIALOG DISCARDABLE 0, 0, 230, 90 +IDD_PREF_CHOOSE_FOLDER DIALOG DISCARDABLE 0, 0, 251, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Choose Folder" FONT 8, "MS Sans Serif" BEGIN LTEXT "Choose where you would like your sent mail messages to be stored:", - IDC_STATIC,5,9,218,12 + IDC_STATIC_TITLE,5,7,239,12 + COMBOBOX IDC_COMBO_SERVERS,93,25,145,70,CBS_DROPDOWNLIST | + CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP CONTROL "&Folder ""Sent"" on",IDC_RADIO_SENT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,25,82,12 CONTROL "&Other:",IDC_RADIO_OTHER,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,45,40,12 - COMBOBOX IDC_COMBO_SERVERS,93,25,124,70,CBS_DROPDOWNLIST | - CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_GROUP | WS_TABSTOP - COMBOBOX IDC_COMBO_FOLDERS,51,45,112,72,CBS_DROPDOWNLIST | - CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&New Folder",IDC_NEW_FOLDER,168,44,49,14 - DEFPUSHBUTTON "OK",IDOK,106,68,50,14 - PUSHBUTTON "Cancel",IDCANCEL,167,68,50,14 + COMBOBOX IDC_COMBO_FOLDERS,51,45,128,72,CBS_DROPDOWNLIST | + CBS_OWNERDRAWFIXED | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&New Folder",IDC_NEW_FOLDER,190,45,49,14 + DEFPUSHBUTTON "OK",IDOK,129,69,50,14 + PUSHBUTTON "Cancel",IDCANCEL,189,69,50,14 END IDD_MAILSERVER_GENERAL DIALOG DISCARDABLE 0, 0, 240, 110 @@ -1792,8 +1783,8 @@ BEGIN EDITTEXT IDC_EDIT_SERVER,57,9,147,12,ES_AUTOHSCROLL LTEXT "Server name",IDC_STATIC_SERVER,57,9,145,12 LTEXT "&Server Type:",IDC_STATIC,10,25,45,12 - COMBOBOX IDC_COMBO_TYPE,57,24,147,38,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_COMBO_TYPE,57,24,147,38,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP LTEXT "&User Name:",IDC_STATIC,10,45,45,10 EDITTEXT IDC_EDIT_USERNAME,57,43,147,12,ES_AUTOHSCROLL CONTROL "Remember my mail &password.",IDC_CHECK_PASSWORD,"Button", @@ -1821,12 +1812,21 @@ FONT 8, "MS Sans Serif" BEGIN CONTROL "Set &new folders for offline download", IDC_CHECK_IMAP_LOCAL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,10,10,200,10 - CONTROL "Move &deleted messages into Trash",IDC_CHECK_IMAP_TRASH, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,200,10 + WS_TABSTOP,11,7,200,10 CONTROL "&Server supports encrypted connections (SSL)", IDC_CHECK_IMAP_SSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 10,50,200,10 + 11,22,200,10 + CONTROL "&Empty Trash on exit",IDC_CHECK_EMPTY_TRASH,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,11,36,212,13 + CONTROL "&Clean up Inbox on exit",IDC_CHECK_EMPTY_INBOX,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,11,52,212,13 + CONTROL "Use IMAP Delete Model",IDC_RADIO_IMAP_DELETE,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,68,188,10 + CONTROL "Move delete messages into Trash", + IDC_RADIO_MOVE_TO_TRASH,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,10,79,188,10 + CONTROL "Delete the messages from server",IDC_RADIO_REAL_DELETE, + "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,90,188,10 END IDD_MAILSERVER_ADVANCED DIALOG DISCARDABLE 0, 0, 240, 110 @@ -1847,20 +1847,38 @@ BEGIN 5,91,220,13 END -IDD_NEWSGROUP_SERVERTYPE DIALOG DISCARDABLE 0, 0, 209, 76 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add Server" +IDD_PP_SHARING DIALOG DISCARDABLE 0, 0, 204, 133 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Sharing" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "Continue...",IDOK,76,55,50,14 - PUSHBUTTON "Cancel",IDCANCEL,144,55,50,14 - LTEXT "Select the type of server:",IDC_STATIC,8,6,168,12 - CONTROL "&News Server (NNTP)",IDC_RADIO_NNTP,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,9,22,169,11 - CONTROL "&IMAP Server",IDC_RADIO_IMAP,"Button", - BS_AUTORADIOBUTTON | WS_TABSTOP,9,38,173,12 + LTEXT "Folder Type:",IDC_STATIC,6,8,44,10 + CONTROL "",IDC_STATIC4,"Static",SS_ETCHEDHORZ,7,65,189,1 + LTEXT "Share this and other folders with network users and display and set access privileges.", + IDC_STATIC5,7,71,160,18 + PUSHBUTTON "&Privileges",IDC_PRIVILEGES,9,94,58,14 + LTEXT "Mail Folder",IDC_STATIC_TYPE,54,8,64,9 + LTEXT "This is a personal folder. It is not shared.", + IDC_STATIC_DESCRIPTION,6,19,184,10 + LTEXT "You have the following permissions:",IDC_STATIC2,6,36, + 187,10 + LTEXT "read, write, append, delete",IDC_STATIC_ACLRIGHTS,23,47, + 166,10 END +IDD_SYNCHRONIZE_EXIT DIALOG DISCARDABLE 0, 0, 218, 71 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Exit Communicator" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "&Yes",IDYES,14,49,50,14 + PUSHBUTTON "&No",IDNO,75,49,50,14 + PUSHBUTTON "&Cancel",IDCANCEL,136,49,50,14 + CONTROL "&Don't ask me again",IDC_DONTASKAGAIN,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,14,31,77,10 + LTEXT "Do you want to Synchronize before you exit Communicator? ", + IDC_STATIC,14,15,195,8 +END ///////////////////////////////////////////////////////////////////////////// // @@ -1970,15 +1988,15 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 369 TOPMARGIN, 7 - BOTTOMMARGIN, 200 + BOTTOMMARGIN, 218 END IDD_FILTER_PICKER, DIALOG BEGIN - LEFTMARGIN, 6 + LEFTMARGIN, 5 RIGHTMARGIN, 256 TOPMARGIN, 7 - BOTTOMMARGIN, 186 + BOTTOMMARGIN, 219 END IDD_LDAPSEARCH, DIALOG @@ -2010,12 +2028,12 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 353 TOPMARGIN, 7 - BOTTOMMARGIN, 209 + BOTTOMMARGIN, 208 END IDD_NEWSGROUP_SEARCH, DIALOG BEGIN - LEFTMARGIN, 6 + LEFTMARGIN, 7 RIGHTMARGIN, 353 TOPMARGIN, 7 BOTTOMMARGIN, 208 @@ -2029,17 +2047,10 @@ BEGIN BOTTOMMARGIN, 94 END - IDD_ADDRESSBOOK, DIALOG - BEGIN - RIGHTMARGIN, 330 - TOPMARGIN, 7 - BOTTOMMARGIN, 30 - END - IDD_PREF_LDAP_SERVER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 306 + RIGHTMARGIN, 296 TOPMARGIN, 7 BOTTOMMARGIN, 80 END @@ -2047,9 +2058,9 @@ BEGIN IDD_PP_FOLDER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 198 + RIGHTMARGIN, 197 TOPMARGIN, 7 - BOTTOMMARGIN, 149 + BOTTOMMARGIN, 126 END IDD_NEWMAIL, DIALOG @@ -2063,9 +2074,9 @@ BEGIN IDD_NEWFOLDER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 248 + RIGHTMARGIN, 211 TOPMARGIN, 7 - BOTTOMMARGIN, 55 + BOTTOMMARGIN, 63 END IDD_HISTORYBAR, DIALOG @@ -2094,7 +2105,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 198 TOPMARGIN, 7 - BOTTOMMARGIN, 154 + BOTTOMMARGIN, 152 END IDD_MORE_DISK_CHOICES, DIALOG @@ -2197,14 +2208,31 @@ BEGIN BOTTOMMARGIN, 99 END - IDD_ADVANCED_SEARCH, DIALOG + IDD_ADVANCED_SEARCH, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 180 + RIGHTMARGIN, 205 TOPMARGIN, 7 - BOTTOMMARGIN, 99 + BOTTOMMARGIN, 110 END + IDD_PP_SHARING, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 197 + TOPMARGIN, 7 + BOTTOMMARGIN, 126 + END + + IDD_SYNCHRONIZE_EXIT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 211 + TOPMARGIN, 7 + BOTTOMMARGIN, 64 + END +END + IDD_NETPROFILE_LOGIN, DIALOG BEGIN LEFTMARGIN, 7 @@ -2216,9 +2244,17 @@ BEGIN IDD_HEADER_LIST, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 175 + RIGHTMARGIN, 205 TOPMARGIN, 7 - BOTTOMMARGIN, 109 + BOTTOMMARGIN, 110 + END + + IDD_SEARCH, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 287 + TOPMARGIN, 7 + BOTTOMMARGIN, 159 END IDD_NOTIFY, DIALOG @@ -2237,7 +2273,7 @@ BEGIN BOTTOMMARGIN, 140 END - IDD_BASIC_SEARCH, DIALOG + IDD_BASIC_SEARCH, DIALOG BEGIN LEFTMARGIN, 4 RIGHTMARGIN, 294 @@ -2264,7 +2300,7 @@ BEGIN IDD_PREF_CHOOSE_FOLDER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 223 + RIGHTMARGIN, 244 TOPMARGIN, 7 BOTTOMMARGIN, 83 END @@ -2338,12 +2374,6 @@ BEGIN IDC_COMBO_SCOPE, 0x403, 24, 0 0x6e69, 0x5320, 0x6c65, 0x6365, 0x6574, 0x2064, 0x654e, 0x7377, 0x7267, 0x756f, 0x7370, 0x0020, - IDC_COMBO_AND_OR, 0x403, 33, 0 -0x614d, 0x6374, 0x2068, 0x6c61, 0x206c, 0x666f, 0x7420, 0x6568, 0x6620, -0x6c6f, 0x6f6c, 0x6977, 0x676e, 0x7720, 0x6568, 0x6572, "\000" - IDC_COMBO_AND_OR, 0x403, 33, 0 -0x614d, 0x6374, 0x2068, 0x6e61, 0x2079, 0x666f, 0x7420, 0x6568, 0x6620, -0x6c6f, 0x6f6c, 0x6977, 0x676e, 0x7720, 0x6568, 0x6572, "\000" 0 END @@ -2359,38 +2389,15 @@ BEGIN IDC_COMBO_SCOPE, 0x403, 24, 0 0x6e69, 0x5320, 0x6c65, 0x6365, 0x6574, 0x2064, 0x654e, 0x7377, 0x7267, 0x756f, 0x7370, 0x0020, - IDC_COMBO_AND_OR, 0x403, 33, 0 + 1503, 0x403, 33, 0 0x614d, 0x6374, 0x2068, 0x6c61, 0x206c, 0x666f, 0x7420, 0x6568, 0x6620, 0x6c6f, 0x6f6c, 0x6977, 0x676e, 0x7720, 0x6568, 0x6572, "\000" - IDC_COMBO_AND_OR, 0x403, 33, 0 + 1503, 0x403, 33, 0 0x614d, 0x6374, 0x2068, 0x6e61, 0x2079, 0x666f, 0x7420, 0x6568, 0x6620, 0x6c6f, 0x6f6c, 0x6977, 0x676e, 0x7720, 0x6568, 0x6572, "\000" 0 END -IDD_MAILFILTER DLGINIT -BEGIN - IDC_COMBO_AND_OR, 0x403, 33, 0 -0x614d, 0x6374, 0x2068, 0x6c61, 0x206c, 0x666f, 0x7420, 0x6568, 0x6620, -0x6c6f, 0x6f6c, 0x6977, 0x676e, 0x7720, 0x6568, 0x6572, "\000" - IDC_COMBO_AND_OR, 0x403, 33, 0 -0x614d, 0x6374, 0x2068, 0x6e61, 0x2079, 0x666f, 0x7420, 0x6568, 0x6620, -0x6c6f, 0x6f6c, 0x6977, 0x676e, 0x7720, 0x6568, 0x6572, "\000" - 0 -END - -IDD_ADVANCED_LDAP_SEARCH DLGINIT -BEGIN - IDC_COMBO_AND_OR, 0x403, 30, 0 -0x6c41, 0x206c, 0x666f, 0x7420, 0x6568, 0x6620, 0x6c6f, 0x6f6c, 0x6977, -0x676e, 0x6320, 0x6972, 0x6574, 0x6972, 0x0061, - IDC_COMBO_AND_OR, 0x403, 30, 0 -0x6e41, 0x2079, 0x666f, 0x7420, 0x6568, 0x6620, 0x6c6f, 0x6f6c, 0x6977, -0x676e, 0x6320, 0x6972, 0x6574, 0x6972, 0x0061, - 0 -END - - ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -2401,6 +2408,7 @@ BEGIN IDS_TRANSFER_STATUS " " IDS_SECURITY_STATUS " " IDS_SIGNED_STATUS " " + IDS_ONLINE_STATUS " " END STRINGTABLE DISCARDABLE @@ -2509,11 +2517,14 @@ BEGIN IDS_PROFILE_DELETED "The profile has been deleted from the profile list.\r\nNote that this does NOT remove the files from your disk." IDS_CONFIRM_DELETE "Delete profile: %s?" IDS_BAD_DIRECTORY2 "Error: The profile directory: \n%s\ndoesn't exist.\n\nPress OK to run the SetupWizard or Cancel to Quit" + IDS_NEWADDRESSBOOK "New Address Book..." + IDS_NEWDIRECTORY "New Directory..." + IDS_DELETEFROMALL "Delete &From All Lists" IDS_INSUFFICIENT_DISKSPACE_MOVE "Insufficient disk space!\n\nUnable to move %s:\n %s\nto directory:\n %s\n\nPlease free up %s MB of disk space and then press O.K.\n\nIf you press Cancel, this directory will not get moved and you will not be able to access your old data files." IDS_INSUFFICIENT_DISKSPACE_COPY "Insufficient disk space!\n\nUnable to copy %s:\n %s\nto directory:\n %s\n\nPlease free up %s MB of disk space and then press O.K.\n\nIf you press Cancel, this directory will not get copied and you will not be able to access your old data files." - IDS_PROFDIR_EXISTS "The selected profile directory already exists and may contain data files. To continue creating the new profile, choose Continue. To change the profile directory, choose Cancel and then use Back to return and change the profile directory." + IDS_PROFDIR_EXISTS "The selected profile directory already exists and may contain data files. To continue creating the new profile, choose OK. To change the profile directory, choose Cancel and then use Back to return and change the profile directory." IDS_PROFILE_SELECTOR_TITLE "Select Profile" IDS_PE_INTROPAGE_TEXT "If you are the only person using this copy of Communicator, you may create several profiles for yourself. If you are sharing this copy of Communicator with other users, each user should create his or her own profile." END @@ -2528,6 +2539,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_STATBAR_SECURITY "Show security information for this page" + IDS_STATBAR_ONLINE "Show online/offline state" END STRINGTABLE DISCARDABLE @@ -2585,6 +2597,8 @@ END STRINGTABLE DISCARDABLE BEGIN + ID_MESSAGE_FORWARDBUTTON + "Forward the selected message\nForward selected message\nForward" ID_MESSAGE_REPLYBUTTON "Reply to one or more recipients\nReply to the message\nReply" ID_MESSAGE_MARKBUTTON "Mark message\nMark Messages\nMark" ID_WINDOW_NETCASTER "Netcaster" @@ -2643,14 +2657,14 @@ BEGIN ID_PERSONAL_TOOLBAR "Personal Toolbar" ID_LOCATION_TOOLBAR "Location Toolbar" IDS_TOOLBARFOLDER "Personal Toolbar Folder" - IDS_MENU_DELETENEWSGROUP "&Delete Discussion Group" + IDS_MENU_DELETENEWSGROUP "Unsu&bscribe" END STRINGTABLE DISCARDABLE BEGIN IDS_POPUP_HIGH "&High" IDS_POPUP_HIGHEST "Highes&t" - IDS_MSGSTODOWNLOAD "There are %ld new message headers to download for this discussion:" + IDS_MSGSTODOWNLOAD "There are %ld new message headers to download for this newsgroup:" IDS_PROGRESS "Progress" IDS_SET_PERSONALTOOLBAR "Set as Toolbar &Folder" IDS_TURNOFF_PERSONALTOOLBAR "Turn Off Toolbar &Folder" @@ -2693,8 +2707,10 @@ END STRINGTABLE DISCARDABLE BEGIN + IDS_SYNCHRONIZING "Synchronizing" IDS_NETCASTER_MENU "N&etcaster\tCtrl+8" IDS_OPENING_FILE "Opening:\n%s using %s." + IDS_MULTIPLE_MATCHES "" END STRINGTABLE DISCARDABLE @@ -2744,7 +2760,7 @@ BEGIN IDS_JSAPP "[JavaScript Application]" IDS_IS_ENCRYPTED "ENCRYPTED" IDS_NOT_ENCRYPTED "NOT ENCRYPTED" - IDS_NOTHING_SUBSCRIBED "You must first subscribe to one or more discussion groups before\nyou can select anything for downloading. Goto ""Join\nDiscussions"" under the main ""File"" menu option, and\nsubrscribe to the desired discussion groups." + IDS_NOTHING_SUBSCRIBED "You must first subscribe to one or more Newsgroups before\nyou can select anything for downloading. Goto ""Subscribe\nto Newsgroups"" under the main ""File"" menu option, and\nsubscribe to the desired Newsgroups." IDS_NO_TEMP_DIRECTORY "No default temp directory exists!" IDS_STUB_PREFIX "cmd" END @@ -2820,7 +2836,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_TASKBAR "(TASKBAR)" IDS_NOTIFY_MAIL1_TIP "Mailbox" - IDS_NOTIFY_NEWS_TIP "Discussion Groups" + IDS_NOTIFY_NEWS_TIP "Newsgroups" IDS_NOTIFY_WEB_TIP "Navigator" ID_OPTIONS_TITLELOCATION_BAR "Show or hide the location bar" ID_FILE_VIEWSOURCE "View the source of the current page" @@ -2940,7 +2956,7 @@ BEGIN ID_FILE_SAVEAS "Save this address book to a file\nSave As" IDS_POPUP_COPYEMBEDDATA "&Copy " ID_OPTIONS_SHOWJAVACONSOLE "Open the Java Console" - ID_FILE_MAILNEW "Create a new mail or discussion message\nCompose (Ctrl+M)\nCompose" + ID_FILE_MAILNEW "Create a new mail or newsgroup message\nCompose (Ctrl+M)\nCompose" END STRINGTABLE DISCARDABLE @@ -3048,7 +3064,7 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_NEWS_POSTNEW "Create a new mail or discussion message\nNew Message (Ctrl+N)\nNew Msg" + ID_NEWS_POSTNEW "Create a new mail or newsgroup message\nNew Message (Ctrl+N)\nNew Msg" ID_MESSAGE_MARKASREAD "Mark selected messages as read\nMark Read" ID_MESSAGE_MARKASUNREAD "Mark selected messages as unread\nMark Unread" ID_MESSAGE_MARK "Flag the current message" @@ -3064,13 +3080,13 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_ADD_MAIL_SERVER "Add Mail Server" - IDS_MAIL_SERVER_PROPERTY "Mail Server Property" + IDS_MAIL_SERVER_PROPERTY "Mail Server Properties" + IDS_NO_ACLSHARING "This server does not support shared folders." IDS_SERVER_POP3_STATIC "POP3 Server" IDS_SERVER_IMAP_STATIC "IMAP Server" IDS_POP3_ONLY_ONE "You cannot add another server, because you are using POP." IDS_REMOVE_MAILHOST_CONFIRM - "Are you sure you want to delete this server? All mail downloaded from this server will be erased from your hard drive, and you cannot undo." + "Are you sure you want to delete this server?" IDS_MAIL_SERVER "Mail Server:" IDS_HELP_BUTTON "Help" IDS_BROWSE_BUTTON "Browse..." @@ -3081,9 +3097,9 @@ BEGIN ID_FILE_OPENFOLDER "Open selected folder or group" ID_FILE_OPENFOLDERNEW "Open selected folder or group in new window" ID_FILE_OPENFOLDERREUSE "Open selected folder or group in existing window if possible" - ID_FILE_GETNEWMAIL "Gets mail and discussion group messages\nGet messages (Ctrl+T)\nGet Msg" + ID_FILE_GETNEWMAIL "Gets mail and Newsgroup messages\nGet messages (Ctrl+T)\nGet Msg" ID_FILE_DELIVERMAILNOW "Send messages in outbox folder now" - ID_FILE_NEWFOLDER "Create a new mail folder or a new discussion group\nNew mail folder\nNew Folder" + ID_FILE_NEWFOLDER "Create a new mail folder or a new Newsgroup\nNew mail folder\nNew Folder" ID_FILE_COMPRESSTHISFOLDER "Remove deleted messages from folder\nCompress Folder" ID_FILE_COMPRESSALLFOLDERS "Compress all mail folders" @@ -3092,6 +3108,11 @@ END STRINGTABLE DISCARDABLE BEGIN + ID_EDIT_DELETE_3PANE "Delete the selected message\nDelete selected message\nDelete" + IDS_DELETEMESSAGE_STATUS "Delete the selected message" + IDS_DELETEFOLDER_STATUS "Delete the selected folder" + IDS_DELETEMESSAGE_TOOLTIP "Delete selected message" + IDS_DELETEFOLDER_TOOLTIP "Delete selected folder" ID_EDIT_DELETEMESSAGE "Delete the selected message\nDelete selected message \nDelete" ID_EDIT_SELECTTHREAD "Select all messages in this thread or folder" ID_EDIT_SELECTMARKEDMESSAGES "Select all flagged messages in this folder" @@ -3112,10 +3133,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_MENU_DELETENEWSHOST "&Delete Discussion Group Server" + IDS_MENU_DELETENEWSHOST "&Delete Newsgroup Server" IDS_MENU_DELETESELECTION "&Delete Selection" - IDS_STATUS_DELETENEWSGROUP "Unsubscribe from this discussion" - IDS_STATUS_DELETENEWSHOST "Remove this discussion group server" + IDS_STATUS_DELETENEWSGROUP "Unsubscribe from this newsgroup" + IDS_STATUS_DELETENEWSHOST "Remove this Newsgroup server" IDS_STATUS_DELETESELECTION "Delete the currently selected items" IDS_CREATEDON "Created On" IDS_SEARCHING "Searching..." @@ -3149,6 +3170,20 @@ BEGIN IDS_SPECIAL_FOLDER "&Folder ""%s"" on" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_READNEWS_STATIC5 "You do not have to enter this information now. Click Finish when you are done." + IDS_SERVER_EXISTS "This server is already added to the list. " + IDS_INVALID_EMAIL "Please enter a valid email address. (e.g. jdoe@company.com)" + IDS_READNEWS_STATIC2 "&Port" + IDS_PE_ACCT_SETUP "Acct. Setup" + IDS_CREATING_FOLDER "Creating Mail Folder" + IDS_DEFAULT_STRING " (Default)" + IDS_COPY_NEWS_MSG "Choose where you would like your sent newsgroup messages to be stored:" + IDS_COPY_DRAFTS "Choose where you would like your drafts to be stored:" + IDS_COPY_TEMPLATES "Choose where you would like your templates to be stored:" +END + STRINGTABLE DISCARDABLE BEGIN IDS_SENDNOW "Sen&d Now" @@ -3175,13 +3210,13 @@ BEGIN IDS_ADD_LDAP_SERVER "Add Directory Server" IDS_LDAP_SERVER_PROPERTY "Directory Server Property" IDS_ADD_NEWS_SERVER "Add News Server" - IDS_NEWS_SERVER_PROPERTY "News Server Property" + IDS_NEWS_SERVER_PROPERTY "Newsgroup Server Properties" END STRINGTABLE DISCARDABLE BEGIN IDS_TEXT_FOLDERS_SELECTED "Mail Folder(s)" - IDS_TEXT_DISCUSSIONS_SELECTED "Discussion Group(s)" + IDS_TEXT_DISCUSSIONS_SELECTED "Newsgroup(s)" IDS_NO_RUN_WHILE_PROFILING "Cannot restart Communicator while ""Profile Manager"" is running. Either exit or complete ""Profile Manger"" and then try again." IDS_SENDINGMESSAGE "Sending Message" @@ -3192,7 +3227,9 @@ BEGIN IDS_BOTTOMMARGINERROR "Bottom Margin" IDS_RIGHTMARGINERROR "Right Margin" IDS_LEFTMARGINERROR "Left Margin" - IDS_VIRTUALNEWSGROUP "Virtual Discussion Group" + IDS_VIRTUALNEWSGROUP "Virtual Newsgroup" + IDS_VIRTUALNEWSGROUPDESC + "Saving search criteria will create a Virtual Newsgroup based on that criteria. The Virtual Newsgroup will be available from the Message Center" IDS_PHONE "Phone" IDS_CHECKING "Checking..." IDS_DEFAULTSAVEAS "untitled.txt" @@ -3235,7 +3272,7 @@ BEGIN ID_VIEW_SHOWSUBJECT "Show the Subject field" ID_VIEW_SHOWATTACHMENT "Show the attachments field" ID_FILE_ADDNEWSGROUP "Add and subsribe to discussions\nAdd a discussions\nAdd Group" - ID_FILE_GETMOREMESSAGES "Get mail and discussion messages\nGet messages (Ctrl+T)\nGet Msg" + ID_FILE_GETMOREMESSAGES "Get mail and newsgroup messages\nGet messages (Ctrl+T)\nGet Msg" ID_EDIT_CANCELMESSAGE "Remove the selected message from the newsgroup" ID_MESSAGE_FORWARDQUOTED "Forward the current message as quoted text\nForward Quoted" @@ -3295,6 +3332,7 @@ BEGIN IDS_MENU_POSTMAILREPLY "Reply to Sender and Gro&up" IDS_MENU_FORWARD "&Forward" IDS_MENU_FORWARDQUOTED "Forward &Quoted" + IDS_MENU_FORWARDINLINE "Forward &Inline" IDS_MENU_REPLY "&Reply to Sender\tCtrl+R" IDS_MENU_REPLYALL "Reply to Sender and &All Recipients\tCtrl+Shift+R" IDS_CLOSEWINDOWS_EXIT "Close all windows and exit Mozilla?" @@ -3433,7 +3471,7 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_EDIT_SEARCH "Search mail and discussion group messages" + ID_EDIT_SEARCH "Search mail and Newsgroup messages" ID_VIEW_ATTACHINLINE "Message attachments are viewed as inline objects" ID_VIEW_ATTACHLINKS "Attachments are presented as links" ID_OPTIONS_IMMEDIATEDELIVERY "Send Now" @@ -3489,8 +3527,8 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_MESSAGE_POSTREPLY "Post a reply to the discussion group\nPost reply\nRe:Msg" - ID_MESSAGE_POSTANDREPLY "Post reply to the discussion group and mail a reply to the author\nPost and reply\nRe:Both" + ID_MESSAGE_POSTREPLY "Post a reply to the Newsgroup\nPost reply\nRe:Msg" + ID_MESSAGE_POSTANDREPLY "Post reply to the Newsgroup and mail a reply to the author\nPost and reply\nRe:Both" ID_FILE_SAVEMESSAGES "Save selected message(s) to a file\nSave As" ID_MESSAGE_STOP "Interrupt the current transfer\nStop loading (ESC)\nStop" ID_MESSAGE_PREVIOUSUNREAD "Go to the previous unread message" @@ -3498,7 +3536,7 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEWMESSAGE "Create a new mail or discussion message\nNew Message (Ctrl+M)\nNew Msg" + ID_FILE_NEWMESSAGE "Create a new mail or newsgroup message\nNew Message (Ctrl+M)\nNew Msg" ID_FILE_OPENMESSAGE "Open the selected messages\nOpen Message\nOpen" ID_FILE_OPENMESSAGENEW "Open the selected message in a new window" ID_FILE_OPENMESSAGEREUSE @@ -3527,7 +3565,7 @@ END STRINGTABLE DISCARDABLE BEGIN ID_TOOLS_MAIL "Access mail folders" - ID_TOOLS_NEWS "Access Discussion Groups" + ID_TOOLS_NEWS "Access Newsgroups" END STRINGTABLE DISCARDABLE @@ -3541,7 +3579,7 @@ STRINGTABLE DISCARDABLE BEGIN ID_DIRECTORY "Search for a directory entry\nLook up an address\nDirectory" ID_FILE_NEWNEWSGROUP "Create a new newsgroup" - ID_FILE_SUBSCRIBE "Subscribe to discussion groups\nAdd a discussion group\nSubscribe" + ID_FILE_SUBSCRIBE "Subscribe to Newsgroups\nAdd a Newsgroup\nSubscribe" ID_MESSAGE_MARKALLREAD "Mark all messages read\nMark all read\nAll Read" END @@ -3576,6 +3614,7 @@ BEGIN ID_VIEW_NEWTHREADS "View threads with new messages" ID_VIEW_KILLEDTHREADS "Show all ignored threads" ID_EDIT_LDAPSEARCH "Search for a directory entry" + ID_MESSAGE_FIRSTUNREAD "Go to the first unread message" ID_MESSAGE_KILLCATEGORY "Ignore this category" END @@ -3629,10 +3668,10 @@ STRINGTABLE DISCARDABLE BEGIN IDS_BREADCRUMB_QF_TIP "Breadcrumb QuickFile" ID_CUSTOMIZE_TOOLBAR "Customize Toolbar" - IDS_NEWSGROUP_NAME "Discussion group name" + IDS_NEWSGROUP_NAME "Newsgroup name" IDS_SUBSCRIBE "S&ubscribe" IDS_POSTINGS "Messages" - IDS_SUBSCRIBE_GROUP "Communicator: Subscribe to Folders and Discussion Groups" + IDS_SUBSCRIBE_GROUP "Communicator: Subscribe to Newsgroups" IDS_MAIL_THISFOLDER "This Folder" IDS_HIDE_COMMANDTOOLBAR "Hide &Navigation Toolbar" IDS_SHOW_COMMANDTOOLBAR "Show &Navigation Toolbar" @@ -3661,7 +3700,7 @@ BEGIN ID_CREATE_CARD "Create and edit your address book card" ID_WINDOW_CALENDAR "Calendar" ID_BIG_SWITCH "Switch network connectedness mode\nBig Switch\nBig Switch" - ID_EDIT_SERVER "Go to discussion group server administration page" + ID_EDIT_SERVER "Go to Newsgroup server administration page" END STRINGTABLE DISCARDABLE @@ -3679,7 +3718,7 @@ BEGIN IDS_PORT_RANGE "Port number should be between 0 and 65535." IDS_WIZARD_SENDMAIL "The information below is needed before you can send mail. If you do not know the information requested, please contact your system administrator or Internet Service Provider." IDS_WIZARD_READMAIL "The information below is needed before you can receive mail. If you do not know the information requested, please contact your system administrator or Internet Service Provider." - IDS_WIZARD_READNEWS "The information below is needed before you can read discussion groups. If you do not know the information requested, please contact your system administrator or Internet Service Provider." + IDS_WIZARD_READNEWS "The information below is needed before you can read newsgroups. If you do not know the information requested, please contact your system administrator or Internet Service Provider." END STRINGTABLE DISCARDABLE @@ -3702,13 +3741,13 @@ BEGIN IDS_READMAIL_EG1 "(e.g. jsmith)" IDS_FINISH "Finish" IDS_NEXT "Next >" - IDS_WIZARD_COVER "This wizard will help you set up Preferences information that is needed so you can send and receive mail and discussion group messages. To edit this information in the future, change the preferences for Mail && Groups, which are found in the Edit menu." + IDS_WIZARD_COVER "This wizard will help you set up Preferences information that is needed so you can send and receive mail and newsgroup messages. To edit this information in the future, change the preferences for Mail && Groups, which are found in the Edit menu." IDS_COVER_STATIC1 "To begin entering information, click Next." IDS_SENDMAIL_STATIC2 "E&mail Address:" IDS_SENDMAIL_EG1 "(e.g. John Smith)" IDS_SENDMAIL_EG2 "(e.g. jsmith@company.com)" IDS_SENDMAIL_STATIC3 "O&utgoing mail (SMTP) server:" - IDS_READNEWS_STATIC1 "&Discussion groups (news) server:" + IDS_READNEWS_STATIC1 "&Newsgroups (news) server:" IDS_SENDREADMAIL_STATIC5 "You do not have to enter this information now. Click next to continue." END @@ -3740,15 +3779,6 @@ BEGIN ID_POPUP_MAILTO "Send the current page to a recipient" END -STRINGTABLE DISCARDABLE -BEGIN - IDS_READNEWS_STATIC5 "You do not have to enter this information now. Click Finish when you are done." - IDS_SERVER_EXISTS "This server is already added to the list. " - IDS_INVALID_EMAIL "Please enter a valid email address. (e.g. jsmith@company.com)" - IDS_READNEWS_STATIC2 "&Port" - IDS_PE_ACCT_SETUP "Acct. Setup" -END - STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEWCATEGORY "Create a new category" @@ -3759,14 +3789,15 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_POPUP_OPENNEWSGROUP "&Open Discussion Group" - IDS_POPUP_OPENNEWSGROUPNEWWINDOW "Open Discussion Group in New Windo&w" - IDS_POPUP_REMOVENEWSGROUP "&Remove Discussion Group" + IDS_POPUP_PROPERTIES "&Properties" + IDS_POPUP_OPENNEWSGROUP "&Open Newsgroup" + IDS_POPUP_OPENNEWSGROUPNEWWINDOW "Open Newsgroup in New Windo&w" + IDS_POPUP_REMOVENEWSGROUP "&Remove Newsgroup" IDS_OPENACCEL "\tCtrl+O" - IDS_POPUP_MARKNEWSGROUPREAD "Mar&k Discussion Group Read" + IDS_POPUP_MARKNEWSGROUPREAD "Mar&k Newsgroup Read" IDS_POPUP_UPDATEMESSAGECOUNT "&Update Message Count" - IDS_POPUP_JOINNEWSGROUP "&Subscribe to Discussion Groups..." - IDS_POPUP_REMOVENEWSHOST "&Remove Discussion Group Server" + IDS_POPUP_JOINNEWSGROUP "&Subscribe to Newsgroups..." + IDS_POPUP_REMOVENEWSHOST "&Remove Newsgroup Server" IDS_POPUP_NEWFOLDER "&New Folder" IDS_POPUP_OPENMESSAGE "&Open Message" IDS_POPUP_OPENMESSAGENEWWINDOW "Open Message in New Windo&w" @@ -3795,7 +3826,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_MAILSERVERPROP "Mail Server Properties" - IDS_NEWSHOSTPROP "Discussion Group Server Properties" + IDS_NEWSHOSTPROP "Newgroup Server Properties" IDS_CATEGORYPROP "Category Properties" IDS_SEARCHMESSAGES "Search Messages" IDS_SEARCHLDAP "Search Directory" @@ -3804,8 +3835,8 @@ BEGIN IDS_MENU_ALLCATEGORIES "&All Categories\tCtrl+A" IDS_POPUP_FOLDERPROP "Folder Propertie&s" IDS_POPUP_MAILSERVERPROP "Mail Server Propertie&s" - IDS_POPUP_NEWSHOSTPROP "Discussion Group Server Propertie&s" - IDS_POPUP_NEWSGROUPPROP "Discussion Group Propertie&s" + IDS_POPUP_NEWSHOSTPROP "Newsgroup Server Propertie&s" + IDS_POPUP_NEWSGROUPPROP "Newsgroup Propertie&s" IDS_POPUP_SETTOTOOLBAR "Set as Toolbar Folde&r" IDS_POPUP_UNSETTOOLBAR "Remove as Toolbar Folde&r" IDS_POPUP_SAVEAS "&Save As..." @@ -3856,7 +3887,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_PATHNAME "PathName" IDS_SIZE "Size" - IDS_MENU_GETNEXT "Ne&xt %d" + IDS_MENU_GETNEXT "Get Ne&xt %d" IDS_UNKNOWN_DOCTYPE "Unknown Document Type" IDS_SAVE_VIEWER "Viewer:" IDS_UNKNOWN_TIMELEFT "Unknown" @@ -3865,7 +3896,15 @@ BEGIN IDS_CANT_CLOSE "Error while closing file." IDS_CANT_CLEANUP "Error removing interrupted download from disk." IDS_FOLDERPROP "Folder Properties" - IDS_NEWSGROUPPROP "Discussion Group Properties" + IDS_NEWSGROUPPROP "Newsgroup Properties" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DOWNLOAD "&Download" + IDS_DOWNLOAD_LIST "Offline Item Name" + IDS_ADDSENDER "Add Sender to Address Book" + IDS_ADDALL "Add All to AddressBook" END STRINGTABLE DISCARDABLE @@ -3884,7 +3923,7 @@ END STRINGTABLE DISCARDABLE BEGIN ID_SORT_BYSTATUS "Sort message by status" - ID_FILE_NEWNEWSHOST "Add a discussion group server (news host)" + ID_FILE_NEWNEWSHOST "Add a Newsgroup server (news host)" ID_SORT_BYSIZE "Sort messages by message size" ID_SORT_BYUNREAD "Sort message by unread status" ID_EDIT_MANAGEMAILACCOUNT @@ -3941,7 +3980,7 @@ BEGIN IDS_FINDINPAGE "&Find in Page...\tCtrl+F" IDS_FINDINFRAME "&Find in Frame...\tCtrl+F" IDS_BROWSER_STOP_TIP "Stop loading this page" - IDS_MENU_NEWNEWSGROUP "Ne&w Discussion Group" + IDS_MENU_NEWNEWSGROUP "Ne&w Newsgroup" IDS_POPUP_OPENSELECTION "&Open Selection" IDS_MENU_IGNORETHREAD "Ignor&e Thread\tK" IDS_MENU_IGNORECATEGORY "Ignor&e Category\tK" @@ -3974,8 +4013,10 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_VIRTUALNEWSGROUPDESC - "Saving search criteria will create a Virtual Discussion Group based on that criteria. The Virtual Discussion Group will be available from the Message Center" + IDS_MENU_COMPRESSFOLDERS "Compress Fol&ders" + IDS_MENU_COMPRESSFOLDER "Compress Fol&der" + IDS_SEARCHRESULTS "" + IDS_GETINFO "Get Info" END STRINGTABLE DISCARDABLE @@ -4000,6 +4041,21 @@ BEGIN IDS_ADRSEARCH "Search" IDS_ADVSEARCH_TITLE "Advanced Search" IDS_BASICSEARCH_TITLE "Basic Search" + IDS_ADVSEARCH_PROPERTY_SHEET "Search Options" + IDS_ADVFILTER_PROPERTY_SHEET "Advanced Options" + IDS_ITEMSMATCHING "Items Matching" + IDS_CONFERENCE_MENU "Conference\tCtrl+5" + IDS_WINDOW_MENU "Window" + IDS_NAMECOMPLETIONON "Autocomplete Address\tCtrl+D" + IDS_NAMECOMPLETIONOFF "Do Not Autcomplete Address\tCtrl+D" + ID_MIGRATION_TOOLS "Migrate from other applications such as Eudora and Outlook" + IDS_SENDONLINE "Send unsent message when going online?" + IDS_GOONLINE "Go Online" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_SYNCHRONIZE "Synchronize\nSetup offline items and synchronize\nSetup offine items and synchronize" END STRINGTABLE DISCARDABLE diff --git a/mozilla/cmd/winfe/res/mozilla.rc2 b/mozilla/cmd/winfe/res/mozilla.rc2 index 2244eaf00e7..8ec84b2a6c4 100644 --- a/mozilla/cmd/winfe/res/mozilla.rc2 +++ b/mozilla/cmd/winfe/res/mozilla.rc2 @@ -85,7 +85,7 @@ BEGIN #ifdef MOZ_MAIL_NEWS IDR_MAILFRAME "Mozilla Message Center\nMozilla\nMozilla Document" IDR_MAILTHREAD "Mozilla Folder\nMozilla\nMozilla Document" - IDR_NEWSTHREAD "Mozilla Discussion\nMozilla\nMozilla Document" + IDR_NEWSTHREAD "Mozilla Newsgroup\nMozilla\nMozilla Document" IDR_MESSAGEFRAME "Mozilla Message\nMozilla\nMozilla Document" IDR_NEWSMSGFRAME "Mozilla Message\nMozilla\nMozilla Document" IDR_CATEGORYFRAME "Mozilla Category\nMozilla\nMozilla Document" @@ -442,8 +442,7 @@ BEGIN BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB #ifdef MOZ_MAIL_NEWS - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX #endif /* MOZ_MAIL_NEWS */ #ifdef EDITOR MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR @@ -474,6 +473,9 @@ BEGIN END MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY +#ifdef MOZ_MAIL_NEWS + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS +#endif MENUITEM SEPARATOR END POPUP "&Help" @@ -626,8 +628,7 @@ BEGIN BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB #ifdef MOZ_MAIL_NEWS - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX #endif /* MOZ_MAIL_NEWS */ #ifdef EDITOR MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR @@ -663,6 +664,9 @@ BEGIN MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE #endif MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY +#ifdef MOZ_MAIL_NEWS + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS +#endif //MOZ_MAIL_NEWS MENUITEM SEPARATOR #ifdef XP_WIN16 MENUITEM "New Window" ID_WINDOW_WINDOW_0 @@ -723,6 +727,7 @@ BEGIN MENUITEM "&Upload File...", ID_FILE_UPLOADFILE #ifdef MOZ_OFFLINE MENUITEM SEPARATOR + MENUITEM "Synchronize..." ID_SYNCHRONIZE MENUITEM "Go Offl&ine...", ID_BIG_SWITCH #endif /* MOZ_OFFLINE */ MENUITEM SEPARATOR @@ -855,6 +860,7 @@ BEGIN MENUITEM "&Upload File...", ID_FILE_UPLOADFILE MENUITEM SEPARATOR #ifdef MOZ_OFFLINE + MENUITEM "Synchronize..." ID_SYNCHRONIZE MENUITEM "Go Offl&ine...", ID_BIG_SWITCH MENUITEM SEPARATOR #endif /* MOZ_OFFLINE */ @@ -952,8 +958,7 @@ BEGIN BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB #ifdef MOZ_MAIL_NEWS - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX #endif // MOZ_MAIL_NEWS #ifdef EDITOR MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR @@ -1049,7 +1054,7 @@ END IDD_WIZARD_COVERPAGE DIALOG DISCARDABLE 0, 0, 240, 160 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU -CAPTION "Mail and Discussion Groups Setup" +CAPTION "Mail and Newsgroups Setup" FONT 8, "MS Sans Serif" BEGIN LTEXT "title",IDC_STATIC_TITLE,0,0,216,39 @@ -1060,7 +1065,7 @@ END #ifdef MOZ_MAIL_NEWS IDD_WIZARD_READNEWS DIALOG DISCARDABLE 0, 0, 240, 159 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU -CAPTION "Mail and Discussion Groups Setup" +CAPTION "Mail and Newsgroups Setup" FONT 8, "MS Sans Serif" BEGIN LTEXT "title",IDC_STATIC_TITLE,0,0,229,25 @@ -1076,7 +1081,7 @@ END IDD_WIZARD_RECEIVEMAIL DIALOG DISCARDABLE 0, 0, 240, 160 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU -CAPTION "Mail and Discussion Groups Setup" +CAPTION "Mail and Newsgroups Setup" FONT 8, "MS Sans Serif" BEGIN LTEXT "title",IDC_STATIC_TITLE,0,0,229,25 @@ -1096,7 +1101,7 @@ END IDD_WIZARD_SENDMAIL DIALOG DISCARDABLE 0, 0, 240, 160 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION | WS_SYSMENU -CAPTION "Mail and Discussion Groups Setup" +CAPTION "Mail and Newsgroups Setup" FONT 8, "MS Sans Serif" BEGIN LTEXT "title",IDC_STATIC_TITLE,0,0,229,25 @@ -1120,7 +1125,7 @@ END IDD_WIZARD_MAILNEWS_WIN16 DIALOG DISCARDABLE 0, 0, 279, 207 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Mail and Discussion Groups Setup" +CAPTION "Mail and Newsgroups Setup" FONT 8, "MS Sans Serif" BEGIN LTEXT "title",IDC_STATIC_TITLE,10,6,215,34 @@ -1765,7 +1770,7 @@ BEGIN END MENUITEM "Ne&w Folder...", ID_FILE_NEWFOLDER - MENUITEM "New Discussion &Group Server...", ID_FILE_NEWNEWSHOST + MENUITEM "New News&group Server...", ID_FILE_NEWNEWSHOST MENUITEM "&Open Folder\tCtrl+O", ID_FILE_OPENFOLDER MENUITEM SEPARATOR MENUITEM "&Rename Folder...", ID_FOLDER_RENAME @@ -1779,9 +1784,12 @@ BEGIN END MENUITEM "Send Unsent &Messages", ID_FILE_DELIVERMAILNOW MENUITEM "&Update Message Count", ID_FILE_UPDATECOUNTS - MENUITEM "Su&bscribe to Discussion Groups...", ID_FILE_SUBSCRIBE - MENUITEM SEPARATOR + MENUITEM "Su&bscribe to Newsgroups...", ID_FILE_SUBSCRIBE +#ifdef MOZ_OFFLINE + MENUITEM SEPARATOR + MENUITEM "Synchronize..." ID_SYNCHRONIZE MENUITEM "Go Offl&ine...", ID_BIG_SWITCH +#endif //MOZ_OFFLINE MENUITEM SEPARATOR MENUITEM "&Close\tCtrl+W", ID_FILE_CLOSE MENUITEM "E&xit\tCtrl+Q", ID_APP_EXIT @@ -1800,9 +1808,6 @@ BEGIN MENUITEM "Search &Messages", ID_EDIT_SEARCH MENUITEM "Search Director&y", ID_EDIT_LDAPSEARCH MENUITEM SEPARATOR - MENUITEM "Ma&nage Mail Account", ID_EDIT_MANAGEMAILACCOUNT - MENUITEM "Manage Discussion Gr&oup", ID_EDIT_SERVER - MENUITEM SEPARATOR MENUITEM "Mai&l Filters...", ID_EDIT_FILTER MENUITEM "Propertie&s\tAlt+Enter", ID_VIEW_PROPERTIES MENUITEM "Pr&eferences...", ID_OPTIONS_MAILANDNEWS @@ -1822,8 +1827,7 @@ BEGIN POPUP "&Communicator" BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL MENUITEM SEPARATOR @@ -1853,6 +1857,12 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS + POPUP "Server Tools" + BEGIN + MENUITEM "Ma&nage Mail Account", ID_EDIT_MANAGEMAILACCOUNT + MENUITEM "&Manage Newsgroups", ID_EDIT_SERVER + END MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END @@ -1862,6 +1872,117 @@ BEGIN END END +#define MOZ_NEWADDR 1 +#ifdef MOZ_NEWADDR +IDR_ADDRESS_MENU MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + POPUP "&New" + BEGIN + MENUITEM "&Navigator Window\tCtrl+N", ID_NEW_FRAME + MENUITEM "&Message\tCtrl+M", ID_FILE_NEWMESSAGE + MENUITEM SEPARATOR + MENUITEM "Blank &Page\tCtrl+Shift+N", ID_EDT_NEW_DOC_BLANK + MENUITEM "Page From &Template", ID_EDT_NEW_DOC_FROM_TEMPLATE + + MENUITEM "Page From &Wizard...", ID_COMMAND_PAGE_FROM_WIZARD + MENUITEM SEPARATOR + MENUITEM "&Card...\tCtrl+N", ID_ITEM_ADDUSER + MENUITEM "&List...", ID_ITEM_ADDLIST + MENUITEM "&Address &Book..." ID_FILE_NEWAB + MENUITEM "&Directory..." ID_FILE_NEWDIR + END + MENUITEM SEPARATOR + MENUITEM "&Import...", ID_FILE_IMPORT + MENUITEM "&Export...\tCtrl+S", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "C&all", ID_LIVE_CALL + MENUITEM SEPARATOR + MENUITEM "&Close\tCtrl+W", ID_FILE_CLOSE + MENUITEM "E&xit\tCtrl+Q", ID_APP_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Redo\tCtrl+E", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Delete\tDel", ID_EDIT_DELETE + MENUITEM "Delete &From All Lists", ID_EDIT_DELETEALL + MENUITEM "&Select All\tCtrl+A", ID_EDIT_SELECT_ALL + MENUITEM SEPARATOR + MENUITEM "&HTML Domains...", ID_EDIT_DOMAINS + MENUITEM "Card &Properties", ID_ITEM_PROPERTIES + MENUITEM "P&references...", ID_OPTIONS_MAILANDNEWS + END + POPUP "&View" + BEGIN + MENUITEM "Address &Book Toolbar ", ID_VIEW_ABTOOLBAR + MENUITEM "&Directory Pane", ID_VIEW_DIRPANE + MENUITEM SEPARATOR + POPUP "S&ort" + BEGIN + MENUITEM "By &Type", ID_SORT_COL0 + MENUITEM "By &Name", ID_SORT_COL1 + MENUITEM "By &Email Address", ID_SORT_COL2 + MENUITEM "By &Company", ID_SORT_COL3 + MENUITEM "By C&ity", ID_SORT_COL4 + MENUITEM "By &Phone", ID_SORT_COL5 + MENUITEM "By Nic&kname", ID_SORT_COL6 + MENUITEM SEPARATOR + MENUITEM "Sort &Ascending", ID_ASCENDING + MENUITEM "Sort &Descending", ID_DECENDING + END + MENUITEM SEPARATOR + MENUITEM "S&earch...", ID_DIRSEARCH + MENUITEM "S&top\tESC", ID_NAVIGATE_INTERRUPT + MENUITEM SEPARATOR + MENUITEM "My Address B&ook Card", ID_CREATE_CARD + END + POPUP "&Communicator" + BEGIN + MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX + MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR + MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL + MENUITEM SEPARATOR + MENUITEM "Show Componen&t Bar", ID_WINDOW_TASKBAR + MENUITEM "Messa&ge Center\tCtrl+Shift+1", ID_TOOLS_MAIL + MENUITEM "&Address Book\tCtrl+Shift+2", ID_TOOLS_ADDRESSBOOK + POPUP "&Bookmarks" + BEGIN + MENUITEM "Add Bookmar&k\tCtrl+D", ID_HOTLIST_ADDCURRENTTOHOTLIST + + POPUP "&File Bookmark" + BEGIN + MENUITEM "Root", ID_BOOKMARKS_FILEROOT + + END + MENUITEM "Edit &Bookmarks...\tCtrl+B", ID_HOTLIST_VIEW + MENUITEM SEPARATOR + POPUP "&Guide" + BEGIN + MENUITEM "PLACEHOLDER", IDC_FIRST_PLACES_MENU_ID + + END + MENUITEM SEPARATOR + END + MENUITEM "&History\tCtrl+H", ID_GO_HISTORY + MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE + MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS + MENUITEM SEPARATOR + MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 + END + POPUP "&Help" + BEGIN + MENUITEM "PLACEHOLDER", IDC_FIRST_HELP_MENU_ID + END +END +#else IDR_ADDRESS_MENU MENU DISCARDABLE BEGIN POPUP "&File" @@ -1902,8 +2023,9 @@ BEGIN POPUP "&View" BEGIN MENUITEM "Address &Book Toolbar ", ID_VIEW_ABTOOLBAR - MENUITEM SEPARATOR - MENUITEM "By &Type", ID_SORT_TYPE + MENUITEM "&Directory Pane", ID_VIEW_DIRPANE + MENUITEM SEPARATOR + MENUITEM "By &Type", ID_SORT_TYPE MENUITEM "By &Name", ID_SORT_NAME MENUITEM "By &Email Address", ID_SORT_EMAILADDRESS MENUITEM "By &Company", ID_SORT_COMPANY @@ -1920,8 +2042,7 @@ BEGIN POPUP "&Communicator" BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL MENUITEM SEPARATOR @@ -1949,6 +2070,7 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END @@ -1957,6 +2079,7 @@ BEGIN MENUITEM "PLACEHOLDER", IDC_FIRST_HELP_MENU_ID END END +#endif IDR_MESSAGEFRAME MENU DISCARDABLE BEGIN @@ -1971,37 +2094,46 @@ BEGIN MENUITEM "Page From &Template", ID_EDT_NEW_DOC_FROM_TEMPLATE MENUITEM "Page From &Wizard...", ID_COMMAND_PAGE_FROM_WIZARD - + MENUITEM SEPARATOR + MENUITEM "Ne&w Folder...", ID_FILE_NEWFOLDER END - MENUITEM "Ne&w Folder...", ID_FILE_NEWFOLDER POPUP "Open &Attachments" BEGIN MENUITEM "&Replace Me", FIRST_ATTACH_MENU_ID END + POPUP "&Save As" + BEGIN + MENUITEM "&File...\tCtrl+S", ID_FILE_SAVEMESSAGES + END MENUITEM SEPARATOR - MENUITEM "&Save As...\tCtrl+S", ID_FILE_SAVEMESSAGES - MENUITEM "&Edit Message", ID_FILE_EDITMESSAGE + MENUITEM "Get New Messages\tCtrl+T", ID_FILE_GETNEWMAIL + MENUITEM "Send Unsent &Messages", ID_FILE_DELIVERMAILNOW + MENUITEM "Su&bscribe...", ID_FILE_SUBSCRIBE + MENUITEM SEPARATOR + MENUITEM "Empt&y Trash Folder", ID_FILE_EMPTYTRASHFOLDER + MENUITEM "Compact Fol&ders", ID_FILE_COMPRESSALLFOLDERS MENUITEM SEPARATOR - MENUITEM "&Rename Folder...", ID_FOLDER_RENAME - MENUITEM "Empt&y Trash Folder", ID_FILE_EMPTYTRASHFOLDER - MENUITEM "Compress Fol&ders", ID_FILE_COMPRESSALLFOLDERS + MENUITEM "Import...", ID_FILE_IMPORT_MAIL +#ifdef MOZ_OFFLINE MENUITEM SEPARATOR - POPUP "Ge&t Messages" - BEGIN - MENUITEM "&New\tCtrl+T", ID_FILE_GETNEWMAIL - MENUITEM "Ne&xt ###", ID_FILE_GETNEXT - END - MENUITEM "Send Unsent &Messages", ID_FILE_DELIVERMAILNOW - MENUITEM "Su&bscribe to Discussion Groups...", ID_FILE_SUBSCRIBE + POPUP "Synchronize" + BEGIN + MENUITEM "Synchronize Now..." ID_SYNCHRONIZE + MENUITEM SEPARATOR + MENUITEM "Download Flagged Messages", + ID_MESSAGE_RETRIEVEOFFLINE + MENUITEM "Download Selected Messages", + ID_MESSAGE_RETRIEVESELECTED + END + MENUITEM "Work Offl&ine...", ID_BIG_SWITCH +#endif //MOZ_OFFLINE MENUITEM SEPARATOR - MENUITEM "Go Offl&ine...", ID_BIG_SWITCH + MENUITEM "Pa&ge Setup...", ID_FILE_PAGE_SETUP + MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW + MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT MENUITEM SEPARATOR - MENUITEM "Pa&ge Setup...", ID_FILE_PAGE_SETUP - MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW - MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT - MENUITEM SEPARATOR - MENUITEM "&Close\tCtrl+W", ID_FILE_CLOSE - MENUITEM "E&xit\tCtrl+Q", ID_APP_EXIT + MENUITEM "&Close\tCtrl+W", ID_FILE_CLOSE + MENUITEM "E&xit\tCtrl+Q", ID_APP_EXIT END POPUP "&Edit" BEGIN @@ -2017,12 +2149,12 @@ BEGIN MENUITEM "&Find in Message...\tCtrl+F", ID_EDIT_FINDINCURRENT MENUITEM "Find A&gain\tCtrl+G", ID_EDIT_FINDAGAIN MENUITEM "Search &Messages", ID_EDIT_SEARCH - MENUITEM "Search Director&y", ID_EDIT_LDAPSEARCH + MENUITEM SEPARATOR + MENUITEM "Search &Messages", ID_EDIT_SEARCH + MENUITEM "Search Directories", ID_EDIT_LDAPSEARCH MENUITEM SEPARATOR - MENUITEM "Ma&nage Mail Account", ID_EDIT_MANAGEMAILACCOUNT - MENUITEM "Manage Discussion Gr&oup", ID_NEWS_MODERATE - MENUITEM SEPARATOR - MENUITEM "Mai&l Filters...", ID_EDIT_FILTER + MENUITEM "Message F&ilters...", ID_EDIT_FILTER + MENUITEM SEPARATOR MENUITEM "Pr&eferences...", ID_OPTIONS_MAILANDNEWS END POPUP "&View" @@ -2036,11 +2168,11 @@ BEGIN MENUITEM "&Normal", ID_VIEW_HEADERS_SHORT MENUITEM "&Brief", ID_VIEW_HEADERS_MICRO END - POPUP "&Attachments" - BEGIN - MENUITEM "&Inline", ID_VIEW_ATTACHINLINE - MENUITEM "As &Links", ID_VIEW_ATTACHLINKS - END + MENUITEM SEPARATOR + MENUITEM "View &Attachments Inline", ID_VIEW_ATTACHINLINE + MENUITEM "View Attachments As &Links", ID_VIEW_ATTACHLINKS + MENUITEM SEPARATOR + MENUITEM "Wrap Lon&g Lines", ID_MAIL_WRAPLONGLINES MENUITEM SEPARATOR MENUITEM "Increase &Font\tCtrl+]", ID_VIEW_INCREASEFONT MENUITEM "Decrease Fon&t\tCtrl+[", ID_VIEW_DECREASEFONT @@ -2051,7 +2183,6 @@ BEGIN MENUITEM "&Stop Loading\tESC", ID_NAVIGATE_INTERRUPT MENUITEM SEPARATOR MENUITEM "Unscram&ble (ROT13)", ID_VIEW_ROT13 - MENUITEM "Wrap Lon&g Lines", ID_MAIL_WRAPLONGLINES MENUITEM SEPARATOR MENUITEM "Page So&urce\tCtrl+U", ID_FILE_VIEWSOURCE MENUITEM "Page &Info", ID_FILE_DOCINFO @@ -2093,20 +2224,26 @@ BEGIN END POPUP "&Go" BEGIN - MENUITEM "&Next Message\tShift+N", ID_MESSAGE_NEXT - MENUITEM "Next &Unread Message\tN", ID_MESSAGE_NEXTUNREAD - MENUITEM "Next F&lagged Message", ID_MESSAGE_NEXTFLAGGED - MENUITEM "Next Unread &Thread\tT", ID_MESSAGE_NEXTUNREADTHREAD - - MENUITEM "Ne&xt Folder", ID_MESSAGE_NEXTNEWSGROUP - MENUITEM "Next Unrea&d Folder\tG", ID_MESSAGE_NEXTUNREADNEWSGROUP - - MENUITEM SEPARATOR - MENUITEM "&Previous Message\tShift+P", ID_MESSAGE_PREVIOUS - MENUITEM "Previou&s Unread Message\tP", ID_MESSAGE_PREVIOUSUNREAD - MENUITEM "Previous Fla&gged Message", ID_MESSAGE_PREVIOUSFLAGGED - MENUITEM SEPARATOR - MENUITEM "&First Flagged Message", ID_MESSAGE_FIRSTFLAGGED + MENUITEM "First Unread Message", ID_MESSAGE_FIRSTUNREAD + MENUITEM "&First Flagged Message", ID_MESSAGE_FIRSTFLAGGED + MENUITEM SEPARATOR + POPUP "Next" + BEGIN + MENUITEM "Message\tShift+N", ID_MESSAGE_NEXT + MENUITEM "&Unread Message\tN", ID_MESSAGE_NEXTUNREAD + MENUITEM "F&lagged Message", ID_MESSAGE_NEXTFLAGGED + MENUITEM SEPARATOR + MENUITEM "Unread &Thread\tT", ID_MESSAGE_NEXTUNREADTHREAD + MENUITEM SEPARATOR + MENUITEM "Folder" , ID_MESSAGE_NEXTNEWSGROUP + MENUITEM "Unrea&d Folder\tG", ID_MESSAGE_NEXTUNREADNEWSGROUP + END + POPUP "Previous" + BEGIN + MENUITEM "Message\tShift+P", ID_MESSAGE_PREVIOUS + MENUITEM "Unread Message\tP", ID_MESSAGE_PREVIOUSUNREAD + MENUITEM "Fla&gged Message", ID_MESSAGE_PREVIOUSFLAGGED + END MENUITEM SEPARATOR MENUITEM "&Back\tAlt+<-", ID_NAVIGATE_MSG_BACK MENUITEM "For&ward\tAlt+->", ID_NAVIGATE_MSG_FORWARD @@ -2116,30 +2253,30 @@ BEGIN MENUITEM "&New Message\tCtrl+M", ID_FILE_NEWMESSAGE POPUP "&Reply" BEGIN - MENUITEM "to &Sender\tCtrl+R", ID_MESSAGE_REPLY + MENUITEM "to &Sender Only\tCtrl+R", ID_MESSAGE_REPLY MENUITEM "to Sender and &All Recipients\tCtrl+Shift+R", - ID_MESSAGE_REPLYALL - MENUITEM "to &Group", ID_MESSAGE_POSTREPLY + ID_MESSAGE_REPLYALL + MENUITEM "to &Group", ID_MESSAGE_POSTREPLY MENUITEM "to Sender and Gro&up", - ID_MESSAGE_POSTANDREPLY + ID_MESSAGE_POSTANDREPLY END - MENUITEM "Forwar&d\tCtrl+L", ID_MESSAGE_FORWARD - MENUITEM "Forward &Quoted\tCtrl+Shift+L", ID_MESSAGE_FORWARDQUOTED - MENUITEM SEPARATOR - POPUP "&Add to Address Book" + MENUITEM "&Forward as attachment\tCtrl+L", ID_MESSAGE_FORWARD + MENUITEM "Forward &Quoted\tCtrl+Shift+L", ID_MESSAGE_FORWARDQUOTED + MENUITEM "Forward In&line", ID_MESSAGE_FORWARDINLINE + MENUITEM "&Edit to Resend", ID_FILE_EDITMESSAGE + MENUITEM SEPARATOR + POPUP "Move Message" BEGIN - MENUITEM "&Sender", ID_MESSAGE_ADDSENDER - MENUITEM "&All", ID_MESSAGE_ADDALL - END - POPUP "Fi&le Message" - BEGIN - MENUITEM "&Replace Me", FIRST_MOVE_MENU_ID + MENUITEM "&Replace Me", FIRST_MOVE_MENU_ID END POPUP "&Copy Message" BEGIN - MENUITEM "&Replace Me", FIRST_MOVE_MENU_ID + MENUITEM "&Replace Me", FIRST_MOVE_MENU_ID END MENUITEM SEPARATOR + MENUITEM "&Add Sender to Address Book", ID_MESSAGE_ADDSENDER + MENUITEM "Add All to Address Book", ID_MESSAGE_ADDALL + MENUITEM SEPARATOR POPUP "&Mark" BEGIN MENUITEM "as &Unread\tU", ID_MESSAGE_MARKASUNREAD @@ -2149,9 +2286,10 @@ BEGIN MENUITEM "&All Read\tShift+C", ID_MESSAGE_MARKALLREAD MENUITEM "by &Date...\tC", ID_MESSAGE_CATCHUP MENUITEM "for &Later\tL", ID_MESSAGE_MARKASLATER + MENUITEM SEPARATOR + MENUITEM "&Flag", ID_MESSAGE_MARK + MENUITEM "&Unflag", ID_MESSAGE_UNMARK END - MENUITEM "&Flag", ID_MESSAGE_MARK - MENUITEM "&Unflag", ID_MESSAGE_UNMARK MENUITEM SEPARATOR MENUITEM "Ignor&e Thread\tK", ID_MESSAGE_KILL MENUITEM "&Watch Thread\tW", ID_MESSAGE_WATCH @@ -2159,8 +2297,7 @@ BEGIN POPUP "&Communicator" BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL MENUITEM SEPARATOR @@ -2188,6 +2325,13 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS + POPUP "Server Tools" + BEGIN + MENUITEM "Ma&nage Mail Account", ID_EDIT_MANAGEMAILACCOUNT + MENUITEM "Manage Newsgr&oup", ID_NEWS_MODERATE + END + MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END @@ -2444,8 +2588,7 @@ BEGIN POPUP "&Communicator" BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL MENUITEM SEPARATOR @@ -2473,6 +2616,12 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS + POPUP "Server Tools" + BEGIN + MENUITEM "Ma&nage Mail Account", ID_EDIT_MANAGEMAILACCOUNT + MENUITEM "Manage Newsgroups", ID_EDIT_SERVER + END MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END @@ -2493,38 +2642,40 @@ IDM_MAILTHREADFILEMENU MENU DISCARDABLE MENUITEM "Page From &Template", ID_EDT_NEW_DOC_FROM_TEMPLATE MENUITEM "Page From &Wizard...", ID_COMMAND_PAGE_FROM_WIZARD - + MENUITEM SEPARATOR + MENUITEM "Ne&w Folder...", ID_FILE_NEWFOLDER END - MENUITEM "Ne&w Folder...", ID_FILE_NEWFOLDER - MENUITEM "&Open Message", ID_FILE_OPENMESSAGE POPUP "Open &Attachments" BEGIN MENUITEM "&Replace Me", FIRST_ATTACH_MENU_ID END - MENUITEM SEPARATOR - MENUITEM "&Save As...\tCtrl+S", ID_FILE_SAVEMESSAGES - MENUITEM "&Edit Message", ID_FILE_EDITMESSAGE - MENUITEM SEPARATOR - MENUITEM "&Rename Folder...", ID_FOLDER_RENAME - MENUITEM "Empt&y Trash Folder", ID_FILE_EMPTYTRASHFOLDER - MENUITEM "Compress Fol&ders", ID_FILE_COMPRESSALLFOLDERS - MENUITEM SEPARATOR - POPUP "Ge&t Messages" - BEGIN - MENUITEM "&New\tCtrl+T", ID_FILE_GETNEWMAIL - MENUITEM "Ne&xt ###", ID_FILE_GETNEXT - MENUITEM SEPARATOR - MENUITEM "Se&lected For Offline Reading", - ID_MESSAGE_RETRIEVESELECTED - - MENUITEM "&Flagged For Offline Reading", - ID_MESSAGE_RETRIEVEOFFLINE - - END + POPUP "&Save As" + BEGIN + MENUITEM "&File...\tCtrl+S", ID_FILE_SAVEMESSAGES + END + MENUITEM SEPARATOR + MENUITEM "Get New Messages" ID_FILE_GETNEWMAIL + MENUITEM "Get Ne&xt ###", ID_FILE_GETNEXT MENUITEM "Send Unsent &Messages", ID_FILE_DELIVERMAILNOW - MENUITEM "Su&bscribe to Discussion Groups...", ID_FILE_SUBSCRIBE + MENUITEM "Su&bscribe...", ID_FILE_SUBSCRIBE + MENUITEM SEPARATOR + MENUITEM "&Rename Folder...", ID_FOLDER_RENAME + MENUITEM "Empt&y Trash Folder", ID_FILE_EMPTYTRASHFOLDER + MENUITEM "Compact Fol&ders", ID_FILE_COMPRESSALLFOLDERS +// MENUITEM "&Open Message", ID_FILE_OPENMESSAGE MENUITEM SEPARATOR - MENUITEM "Go Offl&ine...", ID_BIG_SWITCH + MENUITEM "Import..." ID_FILE_IMPORT_MAIL + MENUITEM SEPARATOR + POPUP "Synchronize" + BEGIN + MENUITEM "Synchronize Now..." ID_SYNCHRONIZE + MENUITEM SEPARATOR + MENUITEM "Download Flagged Messages", + ID_MESSAGE_RETRIEVEOFFLINE + MENUITEM "Download Selected Messages", + ID_MESSAGE_RETRIEVESELECTED + END + MENUITEM "Work Offl&ine...", ID_BIG_SWITCH MENUITEM SEPARATOR MENUITEM "Pa&ge Setup...", ID_FILE_PAGE_SETUP MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW @@ -2542,25 +2693,22 @@ BEGIN MENUITEM "Cu&t\tCtrl+X", ID_EDIT_CUT MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY MENUITEM "&Paste\tCtrl+V", ID_EDIT_PASTE - MENUITEM "&Delete Message\tDel", ID_EDIT_DELETEMESSAGE - POPUP "Select Mess&age" + MENUITEM "&Delete Message\tDel", ID_EDIT_DELETE_3PANE + POPUP "Selec&t" BEGIN - MENUITEM "&Thread\tCtrl+Shift+A", ID_EDIT_SELECTTHREAD - MENUITEM "&Flagged", ID_EDIT_SELECTMARKEDMESSAGES - MENUITEM "&All\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM "&Thread\tCtrl+Shift+A", ID_EDIT_SELECTTHREAD + MENUITEM "&Flagged Messages", ID_EDIT_SELECTMARKEDMESSAGES END MENUITEM SEPARATOR - MENUITEM "&Find in Message...\tCtrl+F", ID_EDIT_FINDINCURRENT + MENUITEM "&Find\tCtrl+F", ID_EDIT_FINDINCURRENT MENUITEM "Find A&gain\tCtrl+G", ID_EDIT_FINDAGAIN - MENUITEM "Search &Messages", ID_EDIT_SEARCH - MENUITEM "Search Director&y", ID_EDIT_LDAPSEARCH + MENUITEM SEPARATOR + MENUITEM "&Search Messages", ID_EDIT_SEARCH MENUITEM SEPARATOR - MENUITEM "Ma&nage Mail Account", ID_EDIT_MANAGEMAILACCOUNT - MENUITEM "Manage Discussion Gr&oup", ID_EDIT_SERVER - MENUITEM SEPARATOR - MENUITEM "Mai&l Filters...", ID_EDIT_FILTER - MENUITEM "Propertie&s", ID_VIEW_PROPERTIES + MENUITEM "Message F&ilters...", ID_EDIT_FILTER + MENUITEM "Pr&operties", ID_VIEW_PROPERTIES + MENUITEM SEPARATOR MENUITEM "Pr&eferences...", ID_OPTIONS_MAILANDNEWS END @@ -2570,6 +2718,7 @@ BEGIN MENUITEM "&Location Toolbar", ID_VIEW_LOCATIONTOOLBAR MENUITEM "&Categories", ID_VIEW_CATEGORIES MENUITEM "Messa&ge", ID_VIEW_MESSAGE + MENUITEM "&Folders", ID_VIEW_FOLDER MENUITEM SEPARATOR POPUP "S&ort" BEGIN @@ -2582,18 +2731,19 @@ BEGIN MENUITEM "by &Subject", ID_SORT_BYSUBJECT MENUITEM "by &Thread", ID_SORT_BYTHREAD MENUITEM "by U&nread", ID_SORT_BYUNREAD + MENUITEM "by &Order received", ID_SORT_BYMESSAGENUMBER MENUITEM SEPARATOR MENUITEM "&Ascending", ID_SORT_ASCENDING MENUITEM "&Descending", ID_SORT_DESCENDING END POPUP "&Messages" BEGIN - MENUITEM "&New", ID_VIEW_NEWONLY - MENUITEM "&Threads with New", ID_VIEW_NEWTHREADS - MENUITEM "&Watched Threads with New", ID_VIEW_WATCHEDTHREADS - MENUITEM "&All", ID_VIEW_ALLTHREADS + MENUITEM "&All", ID_VIEW_ALLTHREADS + MENUITEM "&Unread", ID_VIEW_NEWONLY + MENUITEM "&Threads with Unread", ID_VIEW_NEWTHREADS + MENUITEM "&Watched Threads with Unread", ID_VIEW_WATCHEDTHREADS MENUITEM SEPARATOR - MENUITEM "&Ignored", ID_VIEW_KILLEDTHREADS + MENUITEM "&Ignored Threads", ID_VIEW_KILLEDTHREADS END POPUP "Hea&ders" BEGIN @@ -2601,23 +2751,21 @@ BEGIN MENUITEM "&Normal", ID_VIEW_HEADERS_SHORT MENUITEM "&Brief", ID_VIEW_HEADERS_MICRO END - POPUP "&Attachments" - BEGIN - MENUITEM "&Inline", ID_VIEW_ATTACHINLINE - MENUITEM "As &Links", ID_VIEW_ATTACHLINKS - END + MENUITEM SEPARATOR + MENUITEM "View &Attachments Inline", ID_VIEW_ATTACHINLINE + MENUITEM "View Attachments As &Links", ID_VIEW_ATTACHLINKS + MENUITEM SEPARATOR + MENUITEM "Wra&p Long Lines", ID_MAIL_WRAPLONGLINES MENUITEM SEPARATOR MENUITEM "Increase &Font\tCtrl+]", ID_VIEW_INCREASEFONT - MENUITEM "Decrease Fon&t\tCtrl+[", ID_VIEW_DECREASEFONT + MENUITEM "Decrease Fo&nt\tCtrl+[", ID_VIEW_DECREASEFONT MENUITEM SEPARATOR MENUITEM "&Reload", ID_NAVIGATE_RELOAD MENUITEM "Sho&w Images", ID_VIEW_LOADIMAGES MENUITEM "Refres&h", ID_NAVIGATE_REPAINT MENUITEM "&Stop Loading\tESC", ID_NAVIGATE_INTERRUPT MENUITEM SEPARATOR - MENUITEM "Unscram&ble (ROT13)", ID_VIEW_ROT13 - MENUITEM "Wra&p Long Lines", ID_MAIL_WRAPLONGLINES - MENUITEM SEPARATOR +// MENUITEM "Unscram&ble (ROT13)", ID_VIEW_ROT13 MENUITEM "Page So&urce", ID_FILE_VIEWSOURCE MENUITEM "Page &Info", ID_FILE_DOCINFO MENUITEM SEPARATOR @@ -2660,23 +2808,29 @@ END IDM_MAILTHREADGOMENU MENU DISCARDABLE BEGIN - MENUITEM "&Next Message\tShift+N", ID_MESSAGE_NEXT - MENUITEM "Next &Unread Message\tN", ID_MESSAGE_NEXTUNREAD - MENUITEM "Next F&lagged Message", ID_MESSAGE_NEXTFLAGGED - MENUITEM "Next Unread &Thread\tT", ID_MESSAGE_NEXTUNREADTHREAD - - MENUITEM "Ne&xt Folder", ID_MESSAGE_NEXTNEWSGROUP - MENUITEM "Next Unrea&d Folder\tG", ID_MESSAGE_NEXTUNREADNEWSGROUP - - MENUITEM SEPARATOR - MENUITEM "&Previous Message\tShift+P", ID_MESSAGE_PREVIOUS - MENUITEM "Previou&s Unread Message\tP", ID_MESSAGE_PREVIOUSUNREAD - MENUITEM "Previous Fla&gged Message", ID_MESSAGE_PREVIOUSFLAGGED - MENUITEM SEPARATOR + MENUITEM "First Unread Message" ID_MESSAGE_FIRSTUNREAD MENUITEM "&First Flagged Message", ID_MESSAGE_FIRSTFLAGGED + MENUITEM SEPARATOR + POPUP "Next" + BEGIN + MENUITEM "Message\tShift+N", ID_MESSAGE_NEXT + MENUITEM "&Unread Message\tN", ID_MESSAGE_NEXTUNREAD + MENUITEM "F&lagged Message", ID_MESSAGE_NEXTFLAGGED + MENUITEM SEPARATOR + MENUITEM "Unread &Thread\tT", ID_MESSAGE_NEXTUNREADTHREAD + MENUITEM SEPARATOR + MENUITEM "Folder", ID_MESSAGE_NEXTNEWSGROUP + MENUITEM "Unrea&d Folder\tG", ID_MESSAGE_NEXTUNREADNEWSGROUP + END + POPUP "Previous" + BEGIN + MENUITEM "&Message\tShift+P", ID_MESSAGE_PREVIOUS + MENUITEM "&Unread Message\tP", ID_MESSAGE_PREVIOUSUNREAD + MENUITEM "Fla&gged Message", ID_MESSAGE_PREVIOUSFLAGGED + END MENUITEM SEPARATOR MENUITEM "&Back\tAlt+<-", ID_NAVIGATE_MSG_BACK - MENUITEM "For&ward\tAlt+->", ID_NAVIGATE_MSG_FORWARD*/ + MENUITEM "For&ward\tAlt+->", ID_NAVIGATE_MSG_FORWARD END IDM_MAILTHREADMESSAGEMENU MENU DISCARDABLE @@ -2684,21 +2838,18 @@ IDM_MAILTHREADMESSAGEMENU MENU DISCARDABLE MENUITEM "&New Message\tCtrl+M", ID_FILE_NEWMESSAGE POPUP "&Reply" BEGIN - MENUITEM "to &Sender\tCtrl+R", ID_MESSAGE_REPLY + MENUITEM "to &Sender Only\tCtrl+R", ID_MESSAGE_REPLY MENUITEM "to Sender and &All Recipients\tCtrl+Shift+R", ID_MESSAGE_REPLYALL - MENUITEM "to &Group", ID_MESSAGE_POSTREPLY + MENUITEM "to &Group", ID_MESSAGE_POSTREPLY MENUITEM "to Sender and Gro&up", ID_MESSAGE_POSTANDREPLY END - MENUITEM "Forwar&d\tCtrl+L", ID_MESSAGE_FORWARD - MENUITEM "Forward &Quoted\tCtrl+Shift+L", ID_MESSAGE_FORWARDQUOTED - MENUITEM SEPARATOR - POPUP "&Add to Address Book" - BEGIN - MENUITEM "&Sender", ID_MESSAGE_ADDSENDER - MENUITEM "&All", ID_MESSAGE_ADDALL - END + MENUITEM "&Forward as attachment\tCtrl+L", ID_MESSAGE_FORWARD + MENUITEM "Forward &Quoted\tCtrl+Shift+L", ID_MESSAGE_FORWARDQUOTED + MENUITEM "Forward In&line", ID_MESSAGE_FORWARDINLINE + MENUITEM "&Edit to Resend", ID_FILE_EDITMESSAGE + MENUITEM SEPARATOR POPUP "Fi&le Message" BEGIN MENUITEM "&Replace Me", FIRST_MOVE_MENU_ID @@ -2707,19 +2858,22 @@ IDM_MAILTHREADMESSAGEMENU MENU DISCARDABLE BEGIN MENUITEM "&Replace Me", FIRST_MOVE_MENU_ID END + MENUITEM SEPARATOR + MENUITEM "&Add Sender to Address Book", ID_MESSAGE_ADDSENDER + MENUITEM "Add All to Address Book", ID_MESSAGE_ADDALL MENUITEM SEPARATOR POPUP "&Mark" BEGIN MENUITEM "as &Unread\tU", ID_MESSAGE_MARKASUNREAD MENUITEM "as &Read\tM", ID_MESSAGE_MARKASREAD MENUITEM "&Thread Read", ID_MESSAGE_MARKTHREADREAD - - MENUITEM "&All Read\tShift+C", ID_MESSAGE_MARKALLREAD MENUITEM "by &Date...\tC", ID_MESSAGE_CATCHUP - MENUITEM "for &Later\tL", ID_MESSAGE_MARKASLATER - END - MENUITEM "&Flag", ID_MESSAGE_MARK - MENUITEM "&Unflag", ID_MESSAGE_UNMARK + MENUITEM "&All Read\tShift+C", ID_MESSAGE_MARKALLREAD + //MENUITEM "for &Later\tL", ID_MESSAGE_MARKASLATER + MENUITEM SEPARATOR + MENUITEM "&Flag", ID_MESSAGE_MARK + MENUITEM "&Unflag", ID_MESSAGE_UNMARK + END MENUITEM SEPARATOR MENUITEM "Ignor&e Thread\tK", ID_MESSAGE_KILL MENUITEM "&Watch Thread\tW", ID_MESSAGE_WATCH @@ -2748,29 +2902,30 @@ BEGIN MENUITEM "Page From &Template", ID_EDT_NEW_DOC_FROM_TEMPLATE MENUITEM "Page From &Wizard...", ID_COMMAND_PAGE_FROM_WIZARD - END MENUITEM SEPARATOR - MENUITEM "&Save Draft\tCtrl+S", IDM_SAVEASDRAFT - MENUITEM "Save Template\tCtrl+T", IDM_SAVEASTEMPLATE - MENUITEM "Save &As ...", IDM_SAVEAS - MENUITEM SEPARATOR - MENUITEM "Sen&d Now\tCtrl+Enter", IDM_SENDNOW - MENUITEM "Send &Later", IDM_SENDLATER - MENUITEM "&Quote Original Text", IDM_QUOTEORIGINAL - MENUITEM "Selec&t Addresses...", IDM_ADDRESSPICKER + POPUP "Save &As" + BEGIN + MENUITEM "&File...", IDM_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Draft\tCtrl+S", IDM_SAVEASDRAFT + MENUITEM "&Template\tCtrl+T", IDM_SAVEASTEMPLATE + END POPUP "A&ttach" BEGIN MENUITEM "&File...", IDM_ATTACHFILE MENUITEM "&Web Page...", IDM_ATTACHWEBPAGE - MENUITEM "&Address Book Card...", IDM_ATTACHVCARD MENUITEM SEPARATOR MENUITEM "&My Address Book Card", IDM_ATTACHMYCARD END MENUITEM SEPARATOR - MENUITEM "Go Offl&ine...", ID_BIG_SWITCH + MENUITEM "Sen&d Now\tCtrl+Enter", IDM_SENDNOW + MENUITEM "Send &Later", IDM_SENDLATER + MENUITEM "&Quote Original Text", IDM_QUOTEORIGINAL + MENUITEM "Selec&t Addresses...", IDM_ADDRESSPICKER MENUITEM SEPARATOR MENUITEM "&Close\tCtrl+W", ID_FILE_CLOSE + MENUITEM "E&xit\tCtrl+Q", ID_APP_EXIT END POPUP "&Edit" BEGIN @@ -2786,7 +2941,9 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Find in Message\tCtrl+F", IDM_FINDINMESSAGE MENUITEM "Find Again\tCtrl+G", IDM_FINDAGAIN - MENUITEM "Search Director&y", IDM_SEARCHADDRESSES + MENUITEM SEPARATOR + MENUITEM "Name Completion", ID_TOGGLENAMECOMPLETION + MENUITEM "Show Name Picker\tCtrl+J" ID_SHOW_NAME_PICKER MENUITEM SEPARATOR MENUITEM "&Preferences...", ID_OPTIONS_PREFERENCES END @@ -2844,8 +3001,7 @@ BEGIN POPUP "&Communicator" BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR MENUITEM "&Conference\tCtrl+5", ID_WINDOW_LIVECALL MENUITEM SEPARATOR @@ -2873,6 +3029,7 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END @@ -3024,6 +3181,33 @@ BEGIN LTEXT "Click Finish to continue.",IDC_STATIC,1,135,203,8 END +#ifdef MOZ_MAIL_NEWS +#define MOZ_NEWADDR 1 +#ifdef MOZ_NEWADDR +IDD_ADDRESSBOOK DIALOG DISCARDABLE 0, 0, 332, 34 +STYLE WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Search for names in:",IDC_STATIC,0,5,66,8 + PUSHBUTTON "Search...",IDC_DIRSEARCH,0,16,50,13 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDVERT,54,16,1,12 + EDITTEXT IDC_ADDRNAME,60,16,267,13,ES_AUTOHSCROLL + LTEXT "a directory name",IDC_STATIC1,69,5,195,8 +END +#else +IDD_ADDRESSBOOK DIALOG DISCARDABLE 0, 0, 332, 34 +STYLE WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Select a directory and type in the name you are looking for:", + IDC_STATIC,0,5,203,8 + COMBOBOX IDC_DIRECTORIES,0,0,0,0,CBS_DROPDOWNLIST | + WS_VSCROLL + EDITTEXT IDC_ADDRNAME,0,16,267,13,ES_AUTOHSCROLL + PUSHBUTTON "Search...",IDC_DIRSEARCH,277,16,50,13 +END +#endif +#endif //MOZ_MAIL_NEWS IDD_LOGIN_DIALOG DIALOG DISCARDABLE 0, 0, 244, 274 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -3035,9 +3219,12 @@ BEGIN #else DEFPUSHBUTTON "Start Communicator",IDOK,95,165,70,14 #endif // MOZ_COMMUNICATOR_NAME - LISTBOX IDC_LOGIN_LIST,15,52,150,80,LBS_OWNERDRAWVARIABLE | + LISTBOX IDC_LOGIN_LIST,15,52,150,96,LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LISTBOX IDC_REMOVEITEM,15,52,150,80,LBS_OWNERDRAWVARIABLE | + LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | + WS_TABSTOP | NOT WS_VISIBLE PUSHBUTTON "Open Remote Profile...",IDC_PROFILE1,40,140,90,14 PUSHBUTTON "Exit",IDCANCEL,175,165,50,14 PUSHBUTTON "New",IDC_CREATENEWPROFILE,176,52,49,14 @@ -3155,8 +3342,7 @@ BEGIN BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB #ifdef MOZ_MAIL_NEWS - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "&Collabra Discussions\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX #endif /* MOZ_MAIL_NEWS */ #ifdef EDITOR MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR @@ -3193,6 +3379,9 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY +#ifdef MOZ_MAIL_NEWS + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS +#endif //MOZ_MAIL_NEWS MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END @@ -3279,8 +3468,7 @@ BEGIN BEGIN MENUITEM "&Navigator\tCtrl+1", ID_TOOLS_WEB #ifdef MOZ_MAIL_NEWS - MENUITEM "&Messenger Mailbox\tCtrl+2", ID_TOOLS_INBOX - MENUITEM "Collabra &Discussion Groups\tCtrl+3", ID_TOOLS_NEWS + MENUITEM "&Messenger\tCtrl+2", ID_TOOLS_INBOX #endif // MOZ_MAIL_NEWS #ifdef EDITOR MENUITEM "&Page Composer\tCtrl+4", ID_TOOLS_EDITOR @@ -3317,6 +3505,9 @@ BEGIN MENUITEM "&History\tCtrl+H", ID_GO_HISTORY MENUITEM "&Java Console", ID_OPTIONS_SHOWJAVACONSOLE MENUITEM "&Security Info\tCtrl+Shift+I", ID_SECURITY +#ifdef MOZ_MAIL_NEWS + MENUITEM "Migration Tools", ID_MIGRATION_TOOLS +#endif MENUITEM SEPARATOR MENUITEM "Replace Me!", ID_WINDOW_WINDOW_0 END