new prefwindow landing r=alecf@netscape.com

xpfe/components/prefwindow/resources/locale/en-US/MANIFEST

@@ -3,6 +3,7 @@ pref-appearance.dtd
 pref-applications.dtd
 pref-cache.dtd
 pref-colors.dtd
+pref-cookies.dtd
 pref-themes.dtd
 pref-composer.dtd
 pref-debug.dtd
@@ -19,4 +20,6 @@ pref-smart_browsing.dtd
 pref-smartupdate.dtd
 PrefsWindow.dtd
 preftree.dtd
+pref.dtd
+pref-wallet.dtd
 pref-mousewheel.dtd

xpfe/components/prefwindow/resources/locale/en-US/Makefile.in

@@ -35,6 +35,7 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/pref-colors.dtd \
 		$(srcdir)/pref-themes.dtd \
 		$(srcdir)/pref-composer.dtd \
+		$(srcdir)/pref-cookies.dtd \
 		$(srcdir)/pref-debug.dtd \
 		$(srcdir)/pref-download.dtd \
 		$(srcdir)/pref-fonts.dtd \
@@ -48,7 +49,9 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/pref-smart_browsing.dtd \
 		$(srcdir)/pref-smartupdate.dtd \
 		$(srcdir)/pref-mousewheel.dtd	\
+		$(srcdir)/pref-wallet.dtd	\
 		$(srcdir)/preftree.dtd \
+		$(srcdir)/pref.dtd \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

xpfe/components/prefwindow/resources/locale/en-US/makefile.win

@@ -29,6 +29,7 @@ install::
 	$(MAKE_INSTALL) pref-applications.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) pref-cache.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) pref-colors.dtd  $(DIST)\bin\chrome\pref\locale\en-US
+	$(MAKE_INSTALL) pref-cookies.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) pref-themes.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) pref-composer.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) pref-download.dtd  $(DIST)\bin\chrome\pref\locale\en-US
@@ -45,6 +46,8 @@ install::
 	$(MAKE_INSTALL) pref-smartupdate.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) PrefsWindow.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) preftree.dtd  $(DIST)\bin\chrome\pref\locale\en-US
+	$(MAKE_INSTALL) pref.dtd  $(DIST)\bin\chrome\pref\locale\en-US
+	$(MAKE_INSTALL) pref-wallet.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 	$(MAKE_INSTALL) pref-mousewheel.dtd  $(DIST)\bin\chrome\pref\locale\en-US
 
 clobber::

xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd

@@ -7,15 +7,10 @@
 <!--LOCALIZATION NOTE (enbJavaCheck.label): 'Java' should never be translated -->
 <!ENTITY enbJavaCheck.label "Enable Java">
 <!--LOCALIZATION NOTE (enbJsCheck.label): 'JavaScript' should never be translated -->
-<!ENTITY enbJsCheck.label "Enable JavaScript">
+<!ENTITY enbJsCheck.label "Enable JavaScript in Navigator">
 <!ENTITY enbJsCheck.labelforMailNNews "Enable JavaScript for Mail and News">
 <!ENTITY enbCssCheck.label "Enable style sheets">
 <!ENTITY sendAddFtpCheck.label "Send email address as anonymous FTP password">
-<!ENTITY cookies "Cookies">
-<!ENTITY accAllCookiesRadio.label "Accept all cookies">
-<!ENTITY accpOrgCookiesRadio.label "Accept only cookies that get sent back to the originating server">
-<!ENTITY disCookRadio.label "Disable cookies">
-<!ENTITY warnCookCheck.label "Warn me before accepting a cookie">
 <!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
 <!ENTITY capFormsCheck.label "Enable prefilling of forms">
 <!ENTITY rHeader "Changing preferences that affect the entire product">

xpfe/components/prefwindow/resources/locale/en-US/pref-colors.dtd

@@ -14,5 +14,5 @@
 <!ENTITY  links "Links">
 <!ENTITY  unvisit "Unvisited Links:">
 <!ENTITY  visit "Visited Links:">
-<!ENTITY  someProvColors "Sometimes a document will provide its own colors and background.">
+<!ENTITY  someProvColors "Many documents provide their own colors and background.">
 <!ENTITY  alwaysOverCheck.label "Always use my colors, overriding document">

xpfe/components/prefwindow/resources/locale/en-US/pref-composer.dtd

@@ -17,7 +17,7 @@
 <!ENTITY  pageColorHeader "Default Page Colors">
 <!ENTITY  img "Images:">
 <!ENTITY  UseNavigatorColor.label "Use Navigator's Color Settings">
-<!ENTITY  UseCustomColors.label "Use Custom Colors">
+<!ENTITY  UseCustomColors.label "Use Custom Colors:">
 <!ENTITY  NormalText.label "Normal Text">
 <!ENTITY  LinkText.label "Link Text">
 <!ENTITY  ActiveLinkText.label "Active Link Text">

xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd

@@ -0,0 +1,14 @@
+<!ENTITY window.title "Cookies">
+<!ENTITY lHeader "Cookies">
+<!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
+<!ENTITY rHeader "Manage cookies stored on your computer">
+<!--LOCALIZATION NOTE (server.label): 'Wallet' is a product name and should not be translated. -->
+
+<!ENTITY cookies "Cookies">
+<!ENTITY accAllCookiesRadio.label "Accept all cookies">
+<!ENTITY accpOrgCookiesRadio.label "Only accept only cookies that get sent back to the originating server">
+<!ENTITY disCookRadio.label "Disable cookies">
+<!ENTITY warnCookCheck.label "Warn me before accepting a cookie">
+<!ENTITY cookieDetails "Cookies are small pieces of information that websites store on your computer. This allows them to customize their websites to suit your individual preferences.">
+<!ENTITY viewCookies.label "View Stored Cookies">
+

xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd

@@ -8,8 +8,10 @@
 
 <!-- Debug: Turn on gfx-rendered widgets -->
 <!ENTITY widgetRendering.label "Debug: Widget rendering">
+<!ENTITY nativeWidgets.label "native">
+<!ENTITY partialGfxWidgets.label "partial-gfx">
+<!ENTITY gfxWidgets.label "gfx">
 <!ENTITY gfxScrollbars.label "gfx scrollbars">
-<!ENTITY debugWindow.label "debug window">
 
 <!-- Event Debugging -->
 <!ENTITY debugEventDebugging.label "Event Debugging">
@@ -23,5 +25,4 @@
 <!-- Miscelleneous -->
 <!ENTITY debugMiscellaneous.label   "Miscellaneous">
 <!ENTITY debugDisableXULCache.label "Disable XUL Cache">
-<!ENTITY debugEnableMemCache.label "Enable Mem Cache">
 <!ENTITY debugEnableXPCOMRefcntLog.label "Enable XPCOM Refcount Log">

xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd

@@ -21,9 +21,3 @@
 <!ENTITY  useDocFontNonDynamic "Use document-specified fonts, but disable Dynamic Fonts">
 <!--LOCALIZATION NOTE (useDocFontDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
 <!ENTITY  useDocFontDynamic "Use document-specified fonts, including Dynamic Fonts">
-<!-- font scaling -->
-<!ENTITY  fontScaling "Font Scaling">
-<!ENTITY  fontScalingIntro "Choose a resolution at which fonts will be displayed. A larger value can improve text visibility on some computers.">
-<!ENTITY  defaultScaling "96">
-<!ENTITY  fontScalingExample "dpi. (e.g. 96dpi)">
-<!ENTITY  resolution "Font display resolution:">

xpfe/components/prefwindow/resources/locale/en-US/pref-languages.dtd

@@ -3,7 +3,7 @@
 <!--LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
 <!ENTITY  window.title "Languages">
 <!ENTITY  lHeader "Languages">
-<!ENTITY  rHeader "Preferred order of languages">
+<!ENTITY  rHeader "Languages in which webpages are displayed">
 <!ENTITY  prefLangDecript "Choose in order of preference the language(s) 
 			in which you prefer to view web pages. Web pages are sometimes 
 			available in several languages.  Navigator presents pages in 

xpfe/components/prefwindow/resources/locale/en-US/pref-offline.dtd

@@ -3,8 +3,7 @@
 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
 <!ENTITY title.label "Offline">
 <!ENTITY lHeader "Offline">
-<!ENTITY rHeader "Offline">
-<!ENTITY header1 "Startup State">
+<!ENTITY rHeader "Startup State">
 <!--LOCALIZATION NOTE (descipt1): Never translate the term 'Communicator' -->
 <!ENTITY descipt1 "Commucator can start in either online or offline modes. When online you have full 
 access to your network.  When offline you can only read messages that you have previously downloaded.">

xpfe/components/prefwindow/resources/locale/en-US/pref-proxies.dtd

@@ -10,16 +10,16 @@
 <!ENTITY  view.label "View...">
 <!ENTITY  directTypeRadio.label "Direct connection to the Internet">
 <!ENTITY  manualTypeRadio.label "Manual proxy configuration">
-<!ENTITY  autoTypeRadio.label "Automatic proxy configuration">
+<!ENTITY  autoTypeRadio.label "Automatic proxy configuration URL:">
 <!ENTITY  configAutoconfigText.label "Configuration location (URL):">
 <!ENTITY  reload.label "Reload">
 <!ENTITY window.title "View Manual Proxy Configuration">
-<!ENTITY intro.label "You may configure a proxy and port number for each of the internet protocols that Mozilla supports.">
+<!ENTITY intro.label "You may configure a proxy and port number for each of the internet protocols that Netscape supports.">
 <!ENTITY ftp.label "FTP Proxy:">
 <!ENTITY gopher.label "Gopher Proxy:">
 <!ENTITY http.label "HTTP Proxy:">
 <!ENTITY wais.label "WAIS Proxy:">
 <!ENTITY port.label "Port:">
-<!ENTITY direct.label "You may provide a list of domains that Mozilla should access directly, rather than via the proxy:">
+<!ENTITY direct.label "You may provide a list of domains that Netscape should access directly, rather than via the proxy:">
 <!ENTITY noproxy.label "No Proxy for:">
 <!ENTITY sockhost.label "SOCKS Host:">

xpfe/components/prefwindow/resources/locale/en-US/pref-proxy-manual.dtd

@@ -1,10 +1,10 @@
 <!ENTITY window.title "View Manual Proxy Configuration">
-<!ENTITY intro.label "You may configure a proxy and port number for each of the internet protocols that Mozilla supports.">
+<!ENTITY intro.label "You may configure a proxy and port number for each of the internet protocols that Netscape supports.">
 <!ENTITY ftp.label "FTP Proxy:">
 <!ENTITY gopher.label "Gopher Proxy:">
 <!ENTITY http.label "HTTP Proxy:">
 <!ENTITY wais.label "WAIS Proxy:">
 <!ENTITY port.label "Port:">
-<!ENTITY direct.label "You may provide a list of domains that Mozilla should access directly, rather than via the proxy:">
+<!ENTITY direct.label "You may provide a list of domains that Netscape should access directly, rather than via the proxy:">
 <!ENTITY noproxy.label "No Proxy for:">
 <!ENTITY sockhost.label "SOCKS Host:">

xpfe/components/prefwindow/resources/locale/en-US/pref-smartupdate.dtd

@@ -1,6 +1,7 @@
 <!--LOCALIZATION NOTE : FILE UI for Software Updates prefs -->
 <!ENTITY title.label "Software Installation">
-<!ENTITY header "Software Installation">
+<!ENTITY lHeader "Software Installation">
+<!ENTITY rHeader "Manage Installed Software">
 <!ENTITY enableSU.label "Enable software installations">
 <!ENTITY enableNotification.label "Enable notification of new and updated software">
 <!ENTITY requireConfirmation.label "Require manual confirmation of each install">

xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd

@@ -2,3 +2,15 @@
 <!--LOCALIZATION NOTE : FILE Theme management prefs -->
 <!ENTITY  lHeader "Themes">
 <!ENTITY  rHeader "Choose an installed theme for your display">
+
+<!ENTITY  tabThemeView.label "Theme View">
+<!ENTITY  tabPackageView.label "Package View">
+<!ENTITY  themeName "Selected Theme: ">
+<!ENTITY  themeAuthor.label "Theme Author: ">
+<!ENTITY  themeVersion.label "Theme Version: ">
+<!ENTITY  themeSite.label "Website:">
+<!ENTITY  themeImage.label "Preview Image">
+
+<!ENTITY  themeApply.label "Apply Theme">
+<!ENTITY  themeDelete.label "Delete Theme">
+<!ENTITY  themeDetails.label "Theme Details...">

xpfe/components/prefwindow/resources/locale/en-US/pref-wallet.dtd

@@ -0,0 +1,15 @@
+<!ENTITY window.title "Wallet">
+<!ENTITY lHeader "Wallet">
+<!ENTITY remSignCheck.label "Automatically prefill usernames and passwords">
+<!ENTITY capFormsCheck.label "Enable prefilling of forms">
+<!ENTITY rHeader "Manage stored data about yourself">
+<!--LOCALIZATION NOTE (server.label): 'Wallet' is a product name and should not be translated. -->
+<!ENTITY server.label "Server for wallet tables">
+
+<!ENTITY walletHeader "Wallet">
+<!ENTITY walletDetails "Wallet stores personal information so that filling out forms on webpages is easier.">
+<!ENTITY viewWallet.label "View Wallet Entries">
+
+<!ENTITY signonHeader "Single Signon">
+<!ENTITY signonDetails "Mozilla can store usernames and passwords for sites that require you to log in.">
+<!ENTITY viewSignons.label "View Signons">

xpfe/components/prefwindow/resources/locale/en-US/pref.dtd

@@ -0,0 +1,4 @@
+<!-- extracted from content/PrefsWindow.xul -->
+
+<!-- LOCALIZATION NOTE : FILE UI for the outer parts of the Prefs dialog -->
+<!ENTITY prefWindow.title "Preferences">

xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd

@@ -1,5 +1,6 @@
 <!-- extracted from content/preftree.xul -->
 
+<!ENTITY categoryHeader "Category">
 <!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
 <!ENTITY appear.label "Appearance">
 <!ENTITY fonts.label "Fonts">
@@ -9,7 +10,6 @@
 <!ENTITY navigator.label "Navigator">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Applications">
-<!ENTITY search.label "Search">
 <!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
 <!ENTITY smartBrowse.label "Smart Browsing">
 <!ENTITY mail.label "Mail and Newsgroups">
@@ -24,8 +24,11 @@
 <!ENTITY offline.label "Offline">
 <!ENTITY advance.label "Advanced">
 <!ENTITY down.label "Download">
+<!ENTITY cookies.label "Cookies">
+<!ENTITY wallet.label "Wallet">
 <!ENTITY cache.label "Cache">
 <!ENTITY proxies.label "Proxies">
-<!ENTITY mousewheel.label "Mouse Wheel">
 <!ENTITY smart.label "Software Installation">
 <!ENTITY debug.label "Debug">
+<!ENTITY mousewheel.label "Mouse Wheel">
+<!ENTITY search.label "SmartSearch">

xpfe/components/prefwindow/resources/skin/pref.css

@@ -1,4 +1,4 @@
-@import url(chrome://global/skin);
+@import url(chrome://global/skin/);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
 @namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */