From 6ff75e2d5eac2798adb7ec29c45960a915b45d3e Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Wed, 14 Jul 2004 21:09:11 +0000 Subject: [PATCH] Centralize chrome://necko/locale/ package in toolkit/locales/ (and put security.properties in that package, instead of "communicator"). git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@159186 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/installer/unix/langenus.jst | 2 +- mozilla/browser/installer/windows/langenus.jst | 2 +- mozilla/mail/installer/windows/langenus.jst | 2 +- mozilla/netwerk/resources/jar.mn | 10 ++++++---- .../manager/boot/src/nsSecureBrowserUIImpl.cpp | 2 +- .../manager/boot/src/nsSecurityWarningDialogs.cpp | 2 +- .../locales/en-US/chrome/necko}/contents.rdf | 0 .../locales/en-US/chrome/necko}/necko.properties | 0 .../locales/en-US/chrome/necko}/redirect_loop.dtd | 0 .../locales/en-US/chrome/necko}/security.properties | 0 mozilla/toolkit/locales/jar.mn | 4 ++++ 11 files changed, 15 insertions(+), 9 deletions(-) rename mozilla/{netwerk/resources/locale/en-US => toolkit/locales/en-US/chrome/necko}/contents.rdf (100%) rename mozilla/{netwerk/resources/locale/en-US => toolkit/locales/en-US/chrome/necko}/necko.properties (100%) rename mozilla/{netwerk/resources/locale/en-US => toolkit/locales/en-US/chrome/necko}/redirect_loop.dtd (100%) rename mozilla/{netwerk/resources/locale/en-US => toolkit/locales/en-US/chrome/necko}/security.properties (100%) diff --git a/mozilla/browser/installer/unix/langenus.jst b/mozilla/browser/installer/unix/langenus.jst index ac2d656b27b..d636535ec44 100644 --- a/mozilla/browser/installer/unix/langenus.jst +++ b/mozilla/browser/installer/unix/langenus.jst @@ -61,7 +61,7 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "passwordmgr/"); registerChrome(chromeType, cf, "locale/mozapps/"); - registerChrome(chromeType, cf, localeName + "necko/"); + registerChrome(chromeType, cf, "locale/necko/"); registerChrome(chromeType, cf, "locale/autoconfig/"); registerChrome(chromeType, cf, localeName + "cookie/"); registerChrome(chromeType, cf, localeName + "wallet/"); diff --git a/mozilla/browser/installer/windows/langenus.jst b/mozilla/browser/installer/windows/langenus.jst index e213310975e..5eb7c18ba6b 100644 --- a/mozilla/browser/installer/windows/langenus.jst +++ b/mozilla/browser/installer/windows/langenus.jst @@ -63,7 +63,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, localeName + "passwordmgr/"); registerChrome(chromeType, cf, "locale/mozapps/"); - registerChrome(chromeType, cf, localeName + "necko/"); + registerChrome(chromeType, cf, "locale/necko/"); registerChrome(chromeType, cf, "locale/autoconfig/"); registerChrome(chromeType, cf, localeName + "cookie/"); registerChrome(chromeType, cf, localeName + "wallet/"); diff --git a/mozilla/mail/installer/windows/langenus.jst b/mozilla/mail/installer/windows/langenus.jst index 9fce39943f7..4912d69e876 100644 --- a/mozilla/mail/installer/windows/langenus.jst +++ b/mozilla/mail/installer/windows/langenus.jst @@ -60,7 +60,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, "locale/mozapps/"); - registerChrome(chromeType, cf, localeName + "necko/"); + registerChrome(chromeType, cf, "locale/necko/"); registerChrome(chromeType, cf, "locale/autoconfig/"); registerChrome(chromeType, cf, localeName + "wallet/"); registerChrome(chromeType, cf, localeName + "pippki/"); diff --git a/mozilla/netwerk/resources/jar.mn b/mozilla/netwerk/resources/jar.mn index 28508e580c4..f0b0e52d678 100644 --- a/mozilla/netwerk/resources/jar.mn +++ b/mozilla/netwerk/resources/jar.mn @@ -2,8 +2,10 @@ comm.jar: * content/necko/contents.rdf (content/contents.rdf) content/necko/redirect_loop.xul (content/redirect_loop.xul) +#ifndef MOZ_XUL_APP en-US.jar: -* locale/en-US/necko/contents.rdf (locale/en-US/contents.rdf) - locale/en-US/necko/necko.properties (locale/en-US/necko.properties) - locale/en-US/necko/redirect_loop.dtd (locale/en-US/redirect_loop.dtd) - locale/en-US/communicator/security.properties (locale/en-US/security.properties) +* locale/en-US/necko/contents.rdf (/toolkit/locales/en-US/chrome/necko/contents.rdf) + locale/en-US/necko/necko.properties (/toolkit/locales/en-US/chrome/necko/necko.properties) + locale/en-US/necko/redirect_loop.dtd (/toolkit/locales/en-US/chrome/necko/redirect_loop.dtd) + locale/en-US/necko/security.properties (/toolkit/locales/en-US/chrome/necko/security.properties) +#endif diff --git a/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp index 58a41791406..e228e4b8a08 100644 --- a/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp +++ b/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp @@ -68,7 +68,7 @@ #include "nsIProxyObjectManager.h" #include "nsCRT.h" -#define SECURITY_STRING_BUNDLE_URL "chrome://communicator/locale/security.properties" +#define SECURITY_STRING_BUNDLE_URL "chrome://necko/locale/security.properties" #define IS_SECURE(state) ((state & 0xFFFF) == STATE_IS_SECURE) diff --git a/mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp b/mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp index 8aa9a2cd488..c5e09f6fb82 100644 --- a/mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp +++ b/mozilla/security/manager/boot/src/nsSecurityWarningDialogs.cpp @@ -36,7 +36,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsSecurityWarningDialogs, nsISecurityWarningDialog static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -#define STRING_BUNDLE_URL "chrome://communicator/locale/security.properties" +#define STRING_BUNDLE_URL "chrome://necko/locale/security.properties" #define ENTER_SITE_PREF "security.warn_entering_secure" #define WEAK_SITE_PREF "security.warn_entering_weak" diff --git a/mozilla/netwerk/resources/locale/en-US/contents.rdf b/mozilla/toolkit/locales/en-US/chrome/necko/contents.rdf similarity index 100% rename from mozilla/netwerk/resources/locale/en-US/contents.rdf rename to mozilla/toolkit/locales/en-US/chrome/necko/contents.rdf diff --git a/mozilla/netwerk/resources/locale/en-US/necko.properties b/mozilla/toolkit/locales/en-US/chrome/necko/necko.properties similarity index 100% rename from mozilla/netwerk/resources/locale/en-US/necko.properties rename to mozilla/toolkit/locales/en-US/chrome/necko/necko.properties diff --git a/mozilla/netwerk/resources/locale/en-US/redirect_loop.dtd b/mozilla/toolkit/locales/en-US/chrome/necko/redirect_loop.dtd similarity index 100% rename from mozilla/netwerk/resources/locale/en-US/redirect_loop.dtd rename to mozilla/toolkit/locales/en-US/chrome/necko/redirect_loop.dtd diff --git a/mozilla/netwerk/resources/locale/en-US/security.properties b/mozilla/toolkit/locales/en-US/chrome/necko/security.properties similarity index 100% rename from mozilla/netwerk/resources/locale/en-US/security.properties rename to mozilla/toolkit/locales/en-US/chrome/necko/security.properties diff --git a/mozilla/toolkit/locales/jar.mn b/mozilla/toolkit/locales/jar.mn index b1f1998a828..7cccaba5fde 100644 --- a/mozilla/toolkit/locales/jar.mn +++ b/mozilla/toolkit/locales/jar.mn @@ -1,6 +1,10 @@ #filter substitution @AB_CD@.jar: +* locale/necko/contents.rdf (@AB_CD@/chrome/necko/contents.rdf) + locale/necko/necko.properties (@AB_CD@/chrome/necko/necko.properties) + locale/necko/redirect_loop.dtd (@AB_CD@/chrome/necko/redirect_loop.dtd) + locale/necko/security.properties (@AB_CD@/chrome/necko/security.properties) * locale/mozapps/contents.rdf (@AB_CD@/chrome/mozapps/contents.rdf) * locale/mozapps/downloads/unknownContentType.properties (@AB_CD@/chrome/mozapps/downloads/unknownContentType.properties) * locale/mozapps/downloads/unknownContentType.dtd (@AB_CD@/chrome/mozapps/downloads/unknownContentType.dtd)