From 0e97492c9d2fc6ee3ddbe689ef269fd860e3973e Mon Sep 17 00:00:00 2001 From: "kairo%kairo.at" Date: Fri, 11 May 2007 15:47:16 +0000 Subject: [PATCH] bug 377801 - move suite's typeaheadfind locale file so that it works with 'source L10n', r+sr=Neil git-svn-id: svn://10.0.0.236/trunk@226302 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/typeaheadfind/Makefile.in | 6 +++++- mozilla/extensions/typeaheadfind/resources/jar.mn | 3 --- mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h | 2 +- .../locales/en-US/chrome/common}/typeaheadfind.properties | 0 mozilla/suite/locales/jar.mn | 1 + 5 files changed, 7 insertions(+), 5 deletions(-) rename mozilla/{extensions/typeaheadfind/resources/locale/en-US => suite/locales/en-US/chrome/common}/typeaheadfind.properties (100%) diff --git a/mozilla/extensions/typeaheadfind/Makefile.in b/mozilla/extensions/typeaheadfind/Makefile.in index 6c5f1a15c3c..aa86015b5dc 100644 --- a/mozilla/extensions/typeaheadfind/Makefile.in +++ b/mozilla/extensions/typeaheadfind/Makefile.in @@ -42,6 +42,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = suitetypeaheadfind -DIRS = public src resources +DIRS = public src + +ifndef MOZ_XUL_APP +DIRS += resources +endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/typeaheadfind/resources/jar.mn b/mozilla/extensions/typeaheadfind/resources/jar.mn index 38e5e065124..4d084177b60 100644 --- a/mozilla/extensions/typeaheadfind/resources/jar.mn +++ b/mozilla/extensions/typeaheadfind/resources/jar.mn @@ -1,5 +1,2 @@ -en-US.jar: - locale/en-US/global/typeaheadfind.properties (locale/en-US/typeaheadfind.properties) - toolkit.jar: content/global/notfound.wav (content/notfound.wav) diff --git a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h index fc5b70edc42..e96e01c20d4 100644 --- a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h +++ b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h @@ -66,7 +66,7 @@ #include "nsISound.h" #define TYPEAHEADFIND_BUNDLE_URL \ - "chrome://global/locale/typeaheadfind.properties" + "chrome://communicator/locale/typeaheadfind.properties" #define TYPEAHEADFIND_NOTFOUND_WAV_URL \ "chrome://global/content/notfound.wav" diff --git a/mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties b/mozilla/suite/locales/en-US/chrome/common/typeaheadfind.properties similarity index 100% rename from mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties rename to mozilla/suite/locales/en-US/chrome/common/typeaheadfind.properties diff --git a/mozilla/suite/locales/jar.mn b/mozilla/suite/locales/jar.mn index 0dfa268c037..db155301d32 100644 --- a/mozilla/suite/locales/jar.mn +++ b/mozilla/suite/locales/jar.mn @@ -46,6 +46,7 @@ locale/@AB_CD@/communicator/openLocation.properties (%chrome/common/openLocation.properties) locale/@AB_CD@/communicator/printPreview.dtd (%chrome/common/printPreview.dtd) locale/@AB_CD@/communicator/tasksOverlay.dtd (%chrome/common/tasksOverlay.dtd) + locale/@AB_CD@/communicator/typeaheadfind.properties (%chrome/common/typeaheadfind.properties) locale/@AB_CD@/communicator/utilityOverlay.dtd (%chrome/common/utilityOverlay.dtd) locale/@AB_CD@/communicator/utilityOverlay.properties (%chrome/common/utilityOverlay.properties) locale/@AB_CD@/communicator/viewZoomOverlay.dtd (%chrome/common/viewZoomOverlay.dtd)