Bug 382358 - "move places properties back into localizable location before betas" [p=dietrich r=sspitzer a=blocking-firefox3+ for M9]
authorreed@reedloden.com
Thu, 25 Oct 2007 13:18:41 -0700
changeset 7177 ff906193525adff9890fc2c7ccfa2447062488a6
parent 7176 da0d719b036c224af790aed23f73ae27d43f0ae5
child 7178 f3593037373f8ea42c8da28fba2bd0905c8d4c12
push idunknown
push userunknown
push dateunknown
reviewerssspitzer, blocking-firefox3
bugs382358
milestone1.9a9pre
Bug 382358 - "move places properties back into localizable location before betas" [p=dietrich r=sspitzer a=blocking-firefox3+ for M9]
toolkit/components/places/content/places.properties
toolkit/components/places/src/nsNavBookmarks.cpp
toolkit/locales/en-US/chrome/places/places.properties
toolkit/locales/jar.mn
deleted file mode 100644
--- a/toolkit/components/places/content/places.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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
--- a/toolkit/components/places/src/nsNavBookmarks.cpp
+++ b/toolkit/components/places/src/nsNavBookmarks.cpp
@@ -129,17 +129,17 @@ nsNavBookmarks::Init()
   }
 
   nsCAutoString buffer;
 
   nsCOMPtr<nsIStringBundleService> bundleService =
     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);
 
   // mDBFindURIBookmarks
   rv = dbConn->CreateStatement(NS_LITERAL_CSTRING(
       "SELECT a.id "
       "FROM moz_bookmarks a, moz_places h "
       "WHERE h.url = ?1 AND a.fk = h.id and a.type = ?2 "
new file mode 100644
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/places/places.properties
@@ -0,0 +1,6 @@
+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
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -104,8 +104,10 @@
 * locale/@AB_CD@/passwordmgr/passwordManager.dtd    (%chrome/passwordmgr/passwordManager.dtd)
 % locale autoconfig @AB_CD@ %locale/@AB_CD@/autoconfig/
   locale/@AB_CD@/autoconfig/autoconfig.properties   (%chrome/autoconfig/autoconfig.properties)
 % locale help @AB_CD@ %locale/@AB_CD@/help/
   locale/@AB_CD@/help/help.properties                     (%chrome/mozapps/help/help.properties)
   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)