Bug 745755 - Generate a marketplace bookmark on profile creation. r=wesj
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Wed, 29 Jan 2014 06:58:46 -0800
changeset 181795 dc13e23057af9b16adb921b73d847a72d46dd141
parent 181794 c175d9ca4939fa464e8ed42a28740dad44c7abcd
child 181796 ba6a785bf7ea8c194bbff7738f4e7a8f7a2c328c
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj
bugs745755
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 745755 - Generate a marketplace bookmark on profile creation. r=wesj
mobile/android/base/resources/drawable-mdpi/bookmarkdefaults_favicon_marketplace.png
mobile/android/base/strings.xml.in
mobile/locales/en-US/profile/bookmarks.inc
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a30095135d4d64de1bb2bbf867472bc484ec8c58
GIT binary patch
literal 5468
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
PC&=8y%J`+BN5X#rV;pI{
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -291,29 +291,34 @@
   <string name="home_reading_list_hint_accessible">&home_reading_list_hint_accessible;</string>
   <string name="pin_site_dialog_hint">&pin_site_dialog_hint;</string>
 
   <string name="filepicker_title">&filepicker_title;</string>
   <string name="filepicker_audio_title">&filepicker_audio_title;</string>
   <string name="filepicker_image_title">&filepicker_image_title;</string>
   <string name="filepicker_video_title">&filepicker_video_title;</string>
 
-  <!-- Default bookmarks. Use bookmarks titles shared with XUL from mobile's
-       profile/bookmarks.inc. Don't expose the URLs to L10N. -->
+  <!-- Default bookmarks. We used to use bookmark titles shared with XUL from mobile's
+       profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -->
   <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
   <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
   <string name="bookmarkdefaults_favicon_aboutfirefox">chrome/chrome/content/branding/favicon64.png</string>
 
+  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_addons -->
   <string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>
   <string name="bookmarkdefaults_url_addons">https://addons.mozilla.org/@AB_CD@/android/</string>
 
   <string name="bookmarkdefaults_title_support">@bookmarks_support@</string>
   <string name="bookmarkdefaults_url_support">http://support.mozilla.org/@AB_CD@/products/mobile</string>
   <string name="bookmarkdefaults_favicon_abouthome">chrome/chrome/content/branding/favicon64.png</string>
 
+  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_marketplace -->
+  <string name="bookmarkdefaults_title_marketplace">@bookmarks_marketplace@</string>
+  <string name="bookmarkdefaults_url_marketplace">https://marketplace.firefox.com/</string>
+
   <!-- Site identity popup -->
   <string name="identity_connected_to">&identity_connected_to;</string>
   <string name="identity_run_by">&identity_run_by;</string>
   <string name="loaded_mixed_content_message">&loaded_mixed_content_message;</string>
   <string name="blocked_mixed_content_message_top">&blocked_mixed_content_message_top;</string>
   <string name="blocked_mixed_content_message_bottom">&blocked_mixed_content_message_bottom;</string>
   <string name="learn_more">&learn_more;</string>
   <string name="enable_protection">&enable_protection;</string>
--- a/mobile/locales/en-US/profile/bookmarks.inc
+++ b/mobile/locales/en-US/profile/bookmarks.inc
@@ -21,9 +21,13 @@
 # LOCALIZATION NOTE (bookmarks_addons):
 # link title for https://addons.mozilla.org/en-US/mobile
 #define bookmarks_addons Firefox: Customize with add-ons
 
 # LOCALIZATION NOTE (bookmarks_support):
 # link title for https://support.mozilla.org/mobile
 #define bookmarks_support Firefox: Support
 
+# LOCALIZATION NOTE (bookmarks_marketplace):
+# link title for https://marketplace.firefox.com
+#define bookmarks_marketplace Firefox Marketplace
+
 #unfilter emptyLines