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

@@ -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);
 

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

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)