author | Margaret Leibovic <margaret.leibovic@gmail.com> |
Sun, 18 Aug 2013 17:39:44 -0700 | |
changeset 143560 | 73fd388d5b93785fc537b802b81828ac81d047d1 |
parent 143559 | 59e82ad7b744ba45131f4393a2a1866a2d877c82 |
child 143561 | 29c038ab480e3d667ab09d5ba0a2b4e1123f857d |
push id | 25130 |
push user | lrocha@mozilla.com |
push date | Wed, 21 Aug 2013 09:41:27 +0000 |
treeherder | mozilla-central@b2486721572e [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | lucasr |
bugs | 905426 |
milestone | 26.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
|
--- a/mobile/android/base/home/HomePager.java +++ b/mobile/android/base/home/HomePager.java @@ -132,17 +132,17 @@ public class HomePager extends ViewPager final boolean shouldAnimate = (animator != null && Build.VERSION.SDK_INT >= 11); // Add the pages to the adapter in order. adapter.addTab(Page.HISTORY, HistoryPage.class, new Bundle(), getContext().getString(R.string.home_history_title)); adapter.addTab(Page.BOOKMARKS, BookmarksPage.class, new Bundle(), getContext().getString(R.string.bookmarks_title)); adapter.addTab(Page.READING_LIST, ReadingListPage.class, new Bundle(), - getContext().getString(R.string.reading_list)); + getContext().getString(R.string.reading_list_title)); adapter.setCanLoadHint(!shouldAnimate); setAdapter(adapter); setCurrentItem(adapter.getItemPosition(page), false); setVisibility(VISIBLE);
--- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -1,19 +1,22 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY no_space_to_start_error "There is not enough space available for &brandShortName; to start."> <!ENTITY error_loading_file "An error occurred when trying to load files required to run &brandShortName;"> -<!ENTITY all_pages_title "Top Sites"> +<!-- Localization note: These are used as the titles of different pages on the home screen. + They are automatically converted to all caps by the Android platform. --> <!ENTITY bookmarks_title "Bookmarks"> <!ENTITY history_title "History"> +<!ENTITY reading_list_title "Reading List"> + <!ENTITY switch_to_tab "Switch to tab"> <!ENTITY crash_reporter_title "&brandShortName; Crash Reporter"> <!ENTITY crash_message2 "&brandShortName; had a problem and crashed. Your tabs should be listed on the &brandShortName; Start page when you restart."> <!ENTITY crash_send_report_message3 "Tell &vendorShortName; about this crash so they can fix it"> <!ENTITY crash_include_url2 "Include the address of the page I was on"> <!ENTITY crash_sorry "We\'re sorry"> <!ENTITY crash_comment "Add a comment (comments are publicly visible)"> @@ -241,17 +244,16 @@ size. --> <!-- Localization note (site_settings_*) : These strings are used in the "Site Settings" dialog that appears after selecting the "Edit Site Settings" context menu item. --> <!ENTITY site_settings_title3 "Site Settings"> <!ENTITY site_settings_cancel "Cancel"> <!ENTITY site_settings_clear "Clear"> <!ENTITY site_settings_no_settings "There are no settings to clear."> -<!ENTITY reading_list "Reading List"> <!ENTITY reading_list_added "Page added to your Reading List"> <!ENTITY reading_list_removed "Page removed from your Reading List"> <!ENTITY reading_list_failed "Failed to add page to your Reading List"> <!ENTITY reading_list_duplicate "Page already in your Reading List"> <!-- Localization note : These strings are used as alternate text for accessibility. They are not visible in the UI. --> <!ENTITY page_action_dropmarker_description "Additional Actions">
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -16,19 +16,20 @@ #includesubst @BOOKMARKSPATH@ <resources> <string name="moz_app_displayname">@MOZ_APP_DISPLAYNAME@</string> #include ../services/strings.xml.in <string name="no_space_to_start_error">&no_space_to_start_error;</string> <string name="error_loading_file">&error_loading_file;</string> - <string name="all_pages_title">&all_pages_title;</string> <string name="bookmarks_title">&bookmarks_title;</string> <string name="history_title">&history_title;</string> + <string name="reading_list_title">&reading_list_title;</string> + <string name="switch_to_tab">&switch_to_tab;</string> <string name="crash_reporter_title">&crash_reporter_title;</string> <string name="crash_message2">&crash_message2;</string> <string name="crash_send_report_message3">&crash_send_report_message3;</string> <string name="crash_include_url2">&crash_include_url2;</string> <string name="crash_sorry">&crash_sorry;</string> <string name="crash_comment">&crash_comment;</string> @@ -196,17 +197,16 @@ <string name="tabs_private">&tabs_private;</string> <string name="tabs_synced">&tabs_synced;</string> <string name="site_settings_title">&site_settings_title3;</string> <string name="site_settings_cancel">&site_settings_cancel;</string> <string name="site_settings_clear">&site_settings_clear;</string> <string name="site_settings_no_settings">&site_settings_no_settings;</string> - <string name="reading_list">&reading_list;</string> <string name="reading_list_added">&reading_list_added;</string> <string name="reading_list_removed">&reading_list_removed;</string> <string name="reading_list_failed">&reading_list_failed;</string> <string name="reading_list_duplicate">&reading_list_duplicate;</string> <string name="page_action_dropmarker_description">&page_action_dropmarker_description;</string> <string name="contextmenu_open_new_tab">&contextmenu_open_new_tab;</string>