From 2722ecceb3e96bd95d28142f672faccd158333ca Mon Sep 17 00:00:00 2001 From: "reed@reedloden.com" Date: Thu, 25 Oct 2007 13:18:41 -0700 Subject: [PATCH] Bug 382358 - "move places properties back into localizable location before betas" [p=dietrich r=sspitzer a=blocking-firefox3+ for M9] --- toolkit/components/places/src/nsNavBookmarks.cpp | 2 +- .../en-US/chrome/places}/places.properties | 10 ---------- toolkit/locales/jar.mn | 2 ++ 3 files changed, 3 insertions(+), 11 deletions(-) rename toolkit/{components/places/content => locales/en-US/chrome/places}/places.properties (54%) diff --git a/toolkit/components/places/src/nsNavBookmarks.cpp b/toolkit/components/places/src/nsNavBookmarks.cpp index 92436096a2f..b9057572531 100644 --- a/toolkit/components/places/src/nsNavBookmarks.cpp +++ b/toolkit/components/places/src/nsNavBookmarks.cpp @@ -134,7 +134,7 @@ nsNavBookmarks::Init() do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); rv = bundleService->CreateBundle( - "chrome://global/content/places/places.properties", + "chrome://places/locale/places.properties", getter_AddRefs(mBundle)); NS_ENSURE_SUCCESS(rv, rv); diff --git a/toolkit/components/places/content/places.properties b/toolkit/locales/en-US/chrome/places/places.properties similarity index 54% rename from toolkit/components/places/content/places.properties rename to toolkit/locales/en-US/chrome/places/places.properties index 74ff47001e7..bcd0e831926 100644 --- a/toolkit/components/places/content/places.properties +++ b/toolkit/locales/en-US/chrome/places/places.properties @@ -1,16 +1,6 @@ -# -# NOTE: The string properties need to be moved into locale when they are -# considered stable. -# - PlacesBookmarksRootTitle=Bookmarks PlacesBookmarksRootDescription=Add bookmarks to this folder to see them displayed on the Bookmarks Menu PlacesBookmarksRootIconURI=chrome://browser/skin/places/bookmarksMenu.png PlacesBookmarksToolbarTitle=Bookmarks Toolbar Folder PlacesBookmarksToolbarDescription=Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar - -PlacesFeedsQueryURI=place:&annotation=livemark%2FfeedURI -PlacesFeedsQueryIconURI=chrome://browser/skin/places/livemarkItem.png -PlacesFeedsQueryTitle=Subscriptions -PlacesFeedsQueryDescription=Shows all Subscribed Feeds diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 7480dba5e3d..1b2477c57b0 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -109,3 +109,5 @@ locale/@AB_CD@/help/help.dtd (%chrome/mozapps/help/help.dtd) locale/@AB_CD@/help/help-toc.rdf (%chrome/mozapps/help/help-toc.rdf) locale/@AB_CD@/help/welcome.xhtml (%chrome/mozapps/help/welcome.xhtml) +% locale places @AB_CD@ %locale/@AB_CD@/places/ + locale/@AB_CD@/places/places.properties (%chrome/places/places.properties)