Merge fx-team to m-c. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 06 Apr 2015 21:30:03 -0400
changeset 237834 ab0490972e1e47a356c3fc2f9e749a2d77a9739b
parent 237830 f08e25c64e8ad52e0f6d8f92b3e55bd56f06f652 (current diff)
parent 237833 973f507abcf0eec3fd7c6e2551f94c3120618ef2 (diff)
child 237835 2727e5aa21cdd59ec241eb81adfc949dc95914f8
child 237875 b3ab774947bdee6e501bd22fb2af45edee15a5b0
child 237967 fd2dfe2228b621322fe25fc84e5aa294ac090031
push id28550
push userryanvm@gmail.com
push dateTue, 07 Apr 2015 01:30:28 +0000
treeherdermozilla-central@ab0490972e1e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone40.0a1
first release with
nightly linux32
ab0490972e1e / 40.0a1 / 20150407030207 / files
nightly linux64
ab0490972e1e / 40.0a1 / 20150407030207 / files
nightly mac
ab0490972e1e / 40.0a1 / 20150407030207 / files
nightly win32
ab0490972e1e / 40.0a1 / 20150407030207 / files
nightly win64
ab0490972e1e / 40.0a1 / 20150407030207 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge fx-team to m-c. a=merge
--- a/mobile/android/base/ReadingListHelper.java
+++ b/mobile/android/base/ReadingListHelper.java
@@ -222,17 +222,17 @@ public final class ReadingListHelper imp
      * A page can be removed from the ReadingList by panel context menu,
      * or by tapping the readinglist-remove icon in the ReaderMode banner.
      */
     private void handleRemoveFromList(final String url) {
         ThreadUtils.postToBackgroundThread(new Runnable() {
             @Override
             public void run() {
                 readingListAccessor.removeReadingListItemWithURL(context.getContentResolver(), url);
-                showToast(R.string.page_removed, Toast.LENGTH_SHORT);
+                showToast(R.string.reading_list_removed, Toast.LENGTH_SHORT);
             }
         });
     }
 
     /**
      * Gecko (ReaderMode) requests the page ReadingList status, to display
      * the proper ReaderMode banner icon (readinglist-add / readinglist-remove).
      */
--- a/mobile/android/base/tests/StringHelper.java
+++ b/mobile/android/base/tests/StringHelper.java
@@ -18,41 +18,41 @@ public class StringHelper {
     public final String OK;
 
     // Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.length
     public final String[] DEFAULT_BOOKMARKS_TITLES;
     public final String[] DEFAULT_BOOKMARKS_URLS;
     public final int DEFAULT_BOOKMARKS_COUNT;
 
     // About pages
-    public final String ABOUT_BLANK_URL;
+    public final String ABOUT_BLANK_URL = "about:blank";
     public final String ABOUT_FIREFOX_URL;
-    public final String ABOUT_RIGHTS_URL;
-    public final String ABOUT_BUILDCONFIG_URL;
-    public final String ABOUT_FEEDBACK_URL;
-    public final String ABOUT_HEALTHREPORT_URL;
-    public final String ABOUT_DOWNLOADS_URL;
-    public final String ABOUT_HOME_URL;
-    public final String ABOUT_ADDONS_URL;
+    public final String ABOUT_RIGHTS_URL = "about:rights";
+    public final String ABOUT_BUILDCONFIG_URL = "about:buildconfig";
+    public final String ABOUT_FEEDBACK_URL = "about:feedback";
+    public final String ABOUT_HEALTHREPORT_URL = "about:healthreport";
+    public final String ABOUT_DOWNLOADS_URL = "about:downloads";
+    public final String ABOUT_HOME_URL = "about:home";
+    public final String ABOUT_ADDONS_URL = "about:addons";
     public static final String ABOUT_PASSWORDS_URL = "about:passwords";
-    public final String ABOUT_APPS_URL;
-    public final String ABOUT_ABOUT_URL;
-    public final String ABOUT_SCHEME;
+    public final String ABOUT_APPS_URL = "about:apps";
+    public final String ABOUT_ABOUT_URL = "about:about";
+    public final String ABOUT_SCHEME = "about:";
 
     // About pages' titles
-    public final String ABOUT_HOME_TITLE;
+    public final String ABOUT_HOME_TITLE = "";
 
     // Context Menu item strings
-    public final String CONTEXT_MENU_BOOKMARK_LINK;
-    public final String CONTEXT_MENU_OPEN_LINK_IN_NEW_TAB;
+    public final String CONTEXT_MENU_BOOKMARK_LINK = "Bookmark Link";
+    public final String CONTEXT_MENU_OPEN_LINK_IN_NEW_TAB = "Open Link in New Tab";
     public final String CONTEXT_MENU_OPEN_IN_NEW_TAB;
-    public final String CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB;
+    public final String CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB = "Open Link in Private Tab";
     public final String CONTEXT_MENU_OPEN_IN_PRIVATE_TAB;
-    public final String CONTEXT_MENU_COPY_LINK;
-    public final String CONTEXT_MENU_SHARE_LINK;
+    public final String CONTEXT_MENU_COPY_LINK = "Copy Link";
+    public final String CONTEXT_MENU_SHARE_LINK = "Share Link";
     public final String CONTEXT_MENU_EDIT;
     public final String CONTEXT_MENU_SHARE;
     public final String CONTEXT_MENU_REMOVE;
     public final String CONTEXT_MENU_COPY_ADDRESS;
     public final String CONTEXT_MENU_EDIT_SITE_SETTINGS;
     public final String CONTEXT_MENU_SITE_SETTINGS_SAVE_PASSWORD = "Save Password";
     public final String CONTEXT_MENU_ADD_TO_HOME_SCREEN;
     public final String CONTEXT_MENU_PIN_SITE;
@@ -66,58 +66,58 @@ public class StringHelper {
     public final String[] BOOKMARK_CONTEXT_MENU_ITEMS;
 
     public final String[] CONTEXT_MENU_ITEMS_IN_URL_BAR;
 
     public final String TITLE_PLACE_HOLDER;
 
     // Robocop page urls
     // Note: please use getAbsoluteUrl(String url) on each robocop url to get the correct url
-    public final String ROBOCOP_BIG_LINK_URL;
-    public final String ROBOCOP_BIG_MAILTO_URL;
-    public final String ROBOCOP_BLANK_PAGE_01_URL;
-    public final String ROBOCOP_BLANK_PAGE_02_URL;
-    public final String ROBOCOP_BLANK_PAGE_03_URL;
-    public final String ROBOCOP_BLANK_PAGE_04_URL;
-    public final String ROBOCOP_BLANK_PAGE_05_URL;
-    public final String ROBOCOP_BOXES_URL;
-    public final String ROBOCOP_GEOLOCATION_URL;
+    public final String ROBOCOP_BIG_LINK_URL = "/robocop/robocop_big_link.html";
+    public final String ROBOCOP_BIG_MAILTO_URL = "/robocop/robocop_big_mailto.html";
+    public final String ROBOCOP_BLANK_PAGE_01_URL = "/robocop/robocop_blank_01.html";
+    public final String ROBOCOP_BLANK_PAGE_02_URL = "/robocop/robocop_blank_02.html";
+    public final String ROBOCOP_BLANK_PAGE_03_URL = "/robocop/robocop_blank_03.html";
+    public final String ROBOCOP_BLANK_PAGE_04_URL = "/robocop/robocop_blank_04.html";
+    public final String ROBOCOP_BLANK_PAGE_05_URL = "/robocop/robocop_blank_05.html";
+    public final String ROBOCOP_BOXES_URL = "/robocop/robocop_boxes.html";
+    public final String ROBOCOP_GEOLOCATION_URL = "/robocop/robocop_geolocation.html";
     public final String ROBOCOP_LOGIN_01_URL= "/robocop/robocop_login_01.html";
     public final String ROBOCOP_LOGIN_02_URL= "/robocop/robocop_login_02.html";
-    public final String ROBOCOP_POPUP_URL;
-    public final String ROBOCOP_OFFLINE_STORAGE_URL;
-    public final String ROBOCOP_PICTURE_LINK_URL;
-    public final String ROBOCOP_SEARCH_URL;
-    public final String ROBOCOP_TEXT_PAGE_URL;
-    public final String ROBOCOP_ADOBE_FLASH_URL;
-    public final String ROBOCOP_INPUT_URL;
+    public final String ROBOCOP_POPUP_URL = "/robocop/robocop_popup.html";
+    public final String ROBOCOP_OFFLINE_STORAGE_URL = "/robocop/robocop_offline_storage.html";
+    public final String ROBOCOP_PICTURE_LINK_URL = "/robocop/robocop_picture_link.html";
+    public final String ROBOCOP_SEARCH_URL = "/robocop/robocop_search.html";
+    public final String ROBOCOP_TEXT_PAGE_URL = "/robocop/robocop_text_page.html";
+    public final String ROBOCOP_ADOBE_FLASH_URL = "/robocop/robocop_adobe_flash.html";
+    public final String ROBOCOP_INPUT_URL = "/robocop/robocop_input.html";
     public final String ROBOCOP_READER_MODE_BASIC_ARTICLE = "/robocop/reader_mode_pages/basic_article.html";
 
-    private final String ROBOCOP_JS_HARNESS_URL;
+    private final String ROBOCOP_JS_HARNESS_URL = "/robocop/robocop_javascript.html";
 
     // Robocop page titles
-    public final String ROBOCOP_BIG_LINK_TITLE;
-    public final String ROBOCOP_BIG_MAILTO_TITLE;
-    public final String ROBOCOP_BLANK_PAGE_01_TITLE;
-    public final String ROBOCOP_BLANK_PAGE_02_TITLE;
-    public final String ROBOCOP_BLANK_PAGE_03_TITLE;
-    public final String ROBOCOP_BLANK_PAGE_04_TITLE;
-    public final String ROBOCOP_BLANK_PAGE_05_TITLE;
-    public final String ROBOCOP_BOXES_TITLE;
-    public final String ROBOCOP_GEOLOCATION_TITLE;
-    public final String ROBOCOP_LOGIN_TITLE;
-    public final String ROBOCOP_OFFLINE_STORAGE_TITLE;
-    public final String ROBOCOP_PICTURE_LINK_TITLE;
-    public final String ROBOCOP_SEARCH_TITLE;
-    public final String ROBOCOP_TEXT_PAGE_TITLE;
-    public final String ROBOCOP_INPUT_TITLE;
+    public final String ROBOCOP_BIG_LINK_TITLE = "Big Link";
+    public final String ROBOCOP_BIG_MAILTO_TITLE = "Big Mailto";
+    public final String ROBOCOP_BLANK_PAGE_01_TITLE = "Browser Blank Page 01";
+    public final String ROBOCOP_BLANK_PAGE_02_TITLE = "Browser Blank Page 02";
+    public final String ROBOCOP_BLANK_PAGE_03_TITLE = "Browser Blank Page 03";
+    public final String ROBOCOP_BLANK_PAGE_04_TITLE = "Browser Blank Page 04";
+    public final String ROBOCOP_BLANK_PAGE_05_TITLE = "Browser Blank Page 05";
+    public final String ROBOCOP_BOXES_TITLE = "Browser Box test";
+    public final String ROBOCOP_GEOLOCATION_TITLE = "Geolocation Test Page";
+    public final String ROBOCOP_LOGIN_TITLE = "Robocop Login";
+    public final String ROBOCOP_OFFLINE_STORAGE_TITLE = "Robocop offline storage";
+    public final String ROBOCOP_PICTURE_LINK_TITLE = "Picture Link";
+    public final String ROBOCOP_SEARCH_TITLE = "Robocop Search Engine";
+    public final String ROBOCOP_TEXT_PAGE_TITLE = "Robocop Text Page";
+    public final String ROBOCOP_INPUT_TITLE = "Robocop Input";
 
     // Distribution tile labels
-    public final String DISTRIBUTION1_LABEL;
-    public final String DISTRIBUTION2_LABEL;
+    public final String DISTRIBUTION1_LABEL = "Distribution 1";
+    public final String DISTRIBUTION2_LABEL = "Distribution 2";
 
     // Settings menu strings
     // Section labels - ordered as found in the settings menu
     public final String CUSTOMIZE_SECTION_LABEL;
     public final String DISPLAY_SECTION_LABEL;
     public final String PRIVACY_SECTION_LABEL;
     public final String MOZILLA_SECTION_LABEL;
     public final String DEVELOPER_TOOLS_SECTION_LABEL;
@@ -125,56 +125,56 @@ public class StringHelper {
     // Option labels
     // Customize
     public final String SYNC_LABEL;
     public final String IMPORT_FROM_ANDROID_LABEL;
     public final String TABS_LABEL;
 
     // Display
     public final String TEXT_SIZE_LABEL;
-    public final String TITLE_BAR_LABEL;
+    public final String TITLE_BAR_LABEL = "Title bar";
     public final String SCROLL_TITLE_BAR_LABEL;
     public final String TEXT_REFLOW_LABEL;
     public final String CHARACTER_ENCODING_LABEL;
     public final String PLUGINS_LABEL;
 
     // Title bar
-    public final String SHOW_PAGE_TITLE_LABEL;
-    public final String SHOW_PAGE_ADDRESS_LABEL;
+    public final String SHOW_PAGE_TITLE_LABEL = "Show page title";
+    public final String SHOW_PAGE_ADDRESS_LABEL = "Show page address";
 
     // Privacy
     public final String TRACKING_PROTECTION_LABEL;
     public final String DNT_LABEL;
     public final String COOKIES_LABEL;
     public final String REMEMBER_PASSWORDS_LABEL;
     public final String MANAGE_LOGINS_LABEL;
     public final String MASTER_PASSWORD_LABEL;
     public final String CLEAR_PRIVATE_DATA_LABEL;
 
     // Mozilla
-    public final String BRAND_NAME;
-    public final String ABOUT_LABEL;
+    public final String BRAND_NAME = "(Fennec|Nightly|Aurora|Firefox Beta|Firefox)";
+    public final String ABOUT_LABEL = "About " + BRAND_NAME ;
     public final String FAQS_LABEL;
     public final String FEEDBACK_LABEL;
-    public final String LOCATION_SERVICES_LABEL;
-    public final String HEALTH_REPORT_LABEL;
+    public final String LOCATION_SERVICES_LABEL = "Mozilla Location Service";
+    public final String HEALTH_REPORT_LABEL = BRAND_NAME + " Health Report";
     public final String MY_HEALTH_REPORT_LABEL;
 
     // Developer tools
     public final String PAINT_FLASHING_LABEL;
     public final String REMOTE_DEBUGGING_LABEL;
     public final String LEARN_MORE_LABEL;
 
     // Labels for the about:home tabs
     public final String HISTORY_LABEL;
     public final String TOP_SITES_LABEL;
     public final String BOOKMARKS_LABEL;
     public final String READING_LIST_LABEL;
     public final String TODAY_LABEL;
-    public final String TABS_FROM_LAST_TIME_LABEL;
+    public final String TABS_FROM_LAST_TIME_LABEL = "Open all tabs from last time";
 
     // Desktop default bookmarks folders
     public final String BOOKMARKS_UP_TO;
     public final String BOOKMARKS_ROOT_LABEL;
     public final String DESKTOP_FOLDER_LABEL;
     public final String TOOLBAR_FOLDER_LABEL;
     public final String BOOKMARKS_MENU_FOLDER_LABEL;
     public final String UNSORTED_FOLDER_LABEL;
@@ -194,49 +194,49 @@ public class StringHelper {
     public final String GUEST_MODE_LABEL;
     public final String TAB_QUEUE_LABEL;
 
     // Android 3.0+
     public final String TOOLS_LABEL;
     public final String PAGE_LABEL;
 
     // Android 2.3 and lower only
-    public final String MORE_LABEL;
+    public final String MORE_LABEL = "More";
     public final String RELOAD_LABEL;
     public final String FORWARD_LABEL;
     public final String BOOKMARK_LABEL;
 
     // Bookmark Toast Notification
     public final String BOOKMARK_ADDED_LABEL;
     public final String BOOKMARK_REMOVED_LABEL;
     public final String BOOKMARK_UPDATED_LABEL;
     public final String BOOKMARK_OPTIONS_LABEL;
 
     // Edit Bookmark screen
     public final String EDIT_BOOKMARK;
 
     // Strings used in doorhanger messages and buttons
-    public final String GEO_MESSAGE;
+    public final String GEO_MESSAGE = "Share your location with";
     public final String GEO_ALLOW;
-    public final String GEO_DENY;
+    public final String GEO_DENY = "Don't share";
 
-    public final String OFFLINE_MESSAGE;
-    public final String OFFLINE_ALLOW;
-    public final String OFFLINE_DENY;
+    public final String OFFLINE_MESSAGE = "to store data on your device for offline use";
+    public final String OFFLINE_ALLOW = "Allow";
+    public final String OFFLINE_DENY = "Don't allow";
 
-    public final String LOGIN_MESSAGE;
-    public final String LOGIN_ALLOW;
-    public final String LOGIN_DENY;
+    public final String LOGIN_MESSAGE = "Would you like " + BRAND_NAME + " to remember this login?";
+    public final String LOGIN_ALLOW = "Remember";
+    public final String LOGIN_DENY = "Never";
 
-    public final String POPUP_MESSAGE;
+    public final String POPUP_MESSAGE = "prevented this site from opening";
     public final String POPUP_ALLOW;
-    public final String POPUP_DENY;
+    public final String POPUP_DENY = "Don't show";
 
     // Strings used as content description, e.g. for ImageButtons
-    public final String CONTENT_DESCRIPTION_READER_MODE_BUTTON;
+    public final String CONTENT_DESCRIPTION_READER_MODE_BUTTON = "Enter Reader View";
 
     private StringHelper(final Resources res) {
 
         OK = res.getString(R.string.button_ok);
 
         // Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.length
         DEFAULT_BOOKMARKS_TITLES = new String[] {
                 res.getString(R.string.bookmarkdefaults_title_aboutfirefox),
@@ -246,40 +246,21 @@ public class StringHelper {
         DEFAULT_BOOKMARKS_URLS = new String[] {
                 res.getString(R.string.bookmarkdefaults_url_aboutfirefox),
                 res.getString(R.string.bookmarkdefaults_url_support),
                 res.getString(R.string.bookmarkdefaults_url_addons)
         };
         DEFAULT_BOOKMARKS_COUNT = DEFAULT_BOOKMARKS_TITLES.length;
 
         // About pages
-        ABOUT_BLANK_URL = "about:blank";
         ABOUT_FIREFOX_URL = res.getString(R.string.bookmarkdefaults_url_aboutfirefox);
-        ABOUT_RIGHTS_URL = "about:rights";
-        ABOUT_BUILDCONFIG_URL = "about:buildconfig";
-        ABOUT_FEEDBACK_URL = "about:feedback";
-        ABOUT_HEALTHREPORT_URL = "about:healthreport";
-        ABOUT_DOWNLOADS_URL = "about:downloads";
-        ABOUT_HOME_URL = "about:home";
-        ABOUT_ADDONS_URL = "about:addons";
-        ABOUT_APPS_URL = "about:apps";
-        ABOUT_ABOUT_URL = "about:about";
-        ABOUT_SCHEME = "about:";
-
-        // About pages' titles
-        ABOUT_HOME_TITLE = "";
 
         // Context Menu item strings
-        CONTEXT_MENU_BOOKMARK_LINK = "Bookmark Link";
-        CONTEXT_MENU_OPEN_LINK_IN_NEW_TAB = "Open Link in New Tab";
         CONTEXT_MENU_OPEN_IN_NEW_TAB = res.getString(R.string.contextmenu_open_new_tab);
-        CONTEXT_MENU_OPEN_LINK_IN_PRIVATE_TAB = "Open Link in Private Tab";
         CONTEXT_MENU_OPEN_IN_PRIVATE_TAB = res.getString(R.string.contextmenu_open_private_tab);
-        CONTEXT_MENU_COPY_LINK = "Copy Link";
-        CONTEXT_MENU_SHARE_LINK = "Share Link";
         CONTEXT_MENU_EDIT = res.getString(R.string.contextmenu_top_sites_edit);
         CONTEXT_MENU_SHARE = res.getString(R.string.contextmenu_share);
         CONTEXT_MENU_REMOVE = res.getString(R.string.contextmenu_remove);
         CONTEXT_MENU_COPY_ADDRESS = res.getString(R.string.contextmenu_copyurl);
         CONTEXT_MENU_EDIT_SITE_SETTINGS = res.getString(R.string.contextmenu_site_settings);
         CONTEXT_MENU_ADD_TO_HOME_SCREEN = res.getString(R.string.contextmenu_add_to_launcher);
         CONTEXT_MENU_PIN_SITE = res.getString(R.string.contextmenu_top_sites_pin);
         CONTEXT_MENU_UNPIN_SITE = res.getString(R.string.contextmenu_top_sites_unpin);
@@ -314,116 +295,63 @@ public class StringHelper {
                 CONTEXT_MENU_SHARE,
                 CONTEXT_MENU_COPY_ADDRESS,
                 CONTEXT_MENU_EDIT_SITE_SETTINGS,
                 CONTEXT_MENU_ADD_TO_HOME_SCREEN
         };
 
         TITLE_PLACE_HOLDER = res.getString(R.string.url_bar_default_text);
 
-        // Robocop page urls
-        // Note: please use getAbsoluteUrl(String url) on each robocop url to get the correct url
-        ROBOCOP_BIG_LINK_URL = "/robocop/robocop_big_link.html";
-        ROBOCOP_BIG_MAILTO_URL = "/robocop/robocop_big_mailto.html";
-        ROBOCOP_BLANK_PAGE_01_URL = "/robocop/robocop_blank_01.html";
-        ROBOCOP_BLANK_PAGE_02_URL = "/robocop/robocop_blank_02.html";
-        ROBOCOP_BLANK_PAGE_03_URL = "/robocop/robocop_blank_03.html";
-        ROBOCOP_BLANK_PAGE_04_URL = "/robocop/robocop_blank_04.html";
-        ROBOCOP_BLANK_PAGE_05_URL = "/robocop/robocop_blank_05.html";
-        ROBOCOP_BOXES_URL = "/robocop/robocop_boxes.html";
-        ROBOCOP_GEOLOCATION_URL = "/robocop/robocop_geolocation.html";
-        ROBOCOP_POPUP_URL = "/robocop/robocop_popup.html";
-        ROBOCOP_OFFLINE_STORAGE_URL = "/robocop/robocop_offline_storage.html";
-        ROBOCOP_PICTURE_LINK_URL = "/robocop/robocop_picture_link.html";
-        ROBOCOP_SEARCH_URL = "/robocop/robocop_search.html";
-        ROBOCOP_TEXT_PAGE_URL = "/robocop/robocop_text_page.html";
-        ROBOCOP_ADOBE_FLASH_URL = "/robocop/robocop_adobe_flash.html";
-        ROBOCOP_INPUT_URL = "/robocop/robocop_input.html";
-
-        ROBOCOP_JS_HARNESS_URL = "/robocop/robocop_javascript.html";
-
-        // Robocop page titles
-        ROBOCOP_BIG_LINK_TITLE = "Big Link";
-        ROBOCOP_BIG_MAILTO_TITLE = "Big Mailto";
-        ROBOCOP_BLANK_PAGE_01_TITLE = "Browser Blank Page 01";
-        ROBOCOP_BLANK_PAGE_02_TITLE = "Browser Blank Page 02";
-        ROBOCOP_BLANK_PAGE_03_TITLE = "Browser Blank Page 03";
-        ROBOCOP_BLANK_PAGE_04_TITLE = "Browser Blank Page 04";
-        ROBOCOP_BLANK_PAGE_05_TITLE = "Browser Blank Page 05";
-        ROBOCOP_BOXES_TITLE = "Browser Box test";
-        ROBOCOP_GEOLOCATION_TITLE = "Geolocation Test Page";
-        ROBOCOP_LOGIN_TITLE = "Robocop Login";
-        ROBOCOP_OFFLINE_STORAGE_TITLE = "Robocop offline storage";
-        ROBOCOP_PICTURE_LINK_TITLE = "Picture Link";
-        ROBOCOP_SEARCH_TITLE = "Robocop Search Engine";
-        ROBOCOP_TEXT_PAGE_TITLE = "Robocop Text Page";
-        ROBOCOP_INPUT_TITLE = "Robocop Input";
-
-        // Distribution tile labels
-        DISTRIBUTION1_LABEL = "Distribution 1";
-        DISTRIBUTION2_LABEL = "Distribution 2";
-
         // Settings menu strings
         // Section labels - ordered as found in the settings menu
         CUSTOMIZE_SECTION_LABEL = res.getString(R.string.pref_category_customize);
         DISPLAY_SECTION_LABEL = res.getString(R.string.pref_category_display);
         PRIVACY_SECTION_LABEL = res.getString(R.string.pref_category_privacy_short);
         MOZILLA_SECTION_LABEL = res.getString(R.string.pref_category_vendor);
         DEVELOPER_TOOLS_SECTION_LABEL = res.getString(R.string.pref_category_devtools);
 
         // Option labels
         // Customize
         SYNC_LABEL = res.getString(R.string.pref_sync);
         IMPORT_FROM_ANDROID_LABEL = res.getString(R.string.pref_import_android);
         TABS_LABEL = res.getString(R.string.pref_restore);
 
         // Display
         TEXT_SIZE_LABEL = res.getString(R.string.pref_text_size);
-        TITLE_BAR_LABEL = "Title bar";
         SCROLL_TITLE_BAR_LABEL = res.getString(R.string.pref_scroll_title_bar2);
         TEXT_REFLOW_LABEL = res.getString(R.string.pref_reflow_on_zoom);
         CHARACTER_ENCODING_LABEL = res.getString(R.string.pref_char_encoding);
         PLUGINS_LABEL = res.getString(R.string.pref_plugins);
 
-        // Title bar
-        SHOW_PAGE_TITLE_LABEL = "Show page title";
-        SHOW_PAGE_ADDRESS_LABEL = "Show page address";
-
         // Privacy
         TRACKING_PROTECTION_LABEL = res.getString(R.string.pref_tracking_protection_title);
         DNT_LABEL = res.getString(R.string.pref_donottrack_title);
         COOKIES_LABEL = res.getString(R.string.pref_cookies_menu);
         REMEMBER_PASSWORDS_LABEL = res.getString(R.string.pref_remember_signons);
         MANAGE_LOGINS_LABEL = res.getString(R.string.pref_manage_logins);
         MASTER_PASSWORD_LABEL = res.getString(R.string.pref_use_master_password);
         CLEAR_PRIVATE_DATA_LABEL = res.getString(R.string.pref_clear_private_data);
 
         // Mozilla
-        BRAND_NAME = "(Fennec|Nightly|Aurora|Firefox Beta|Firefox)";
-        ABOUT_LABEL = "About " + BRAND_NAME;
         FAQS_LABEL = res.getString(R.string.pref_vendor_faqs);
         FEEDBACK_LABEL = res.getString(R.string.pref_vendor_feedback);
-        LOCATION_SERVICES_LABEL = "Mozilla Location Service";
-        HEALTH_REPORT_LABEL = BRAND_NAME + " Health Report";
         MY_HEALTH_REPORT_LABEL = res.getString(R.string.datareporting_abouthr_title);
 
         // Developer tools
         PAINT_FLASHING_LABEL = res.getString(R.string.pref_developer_paint_flashing);
         REMOTE_DEBUGGING_LABEL = res.getString(R.string.pref_developer_remotedebugging);
         LEARN_MORE_LABEL = res.getString(R.string.pref_learn_more);
 
         // Labels for the about:home tabs
         HISTORY_LABEL = res.getString(R.string.home_history_title);
         TOP_SITES_LABEL = res.getString(R.string.home_top_sites_title);
         BOOKMARKS_LABEL = res.getString(R.string.bookmarks_title);
         READING_LIST_LABEL = res.getString(R.string.reading_list_title);
         TODAY_LABEL = res.getString(R.string.history_today_section);
-        TABS_FROM_LAST_TIME_LABEL = "Open all tabs from last time";
 
-        // Desktop default bookmarks folders
         BOOKMARKS_UP_TO = res.getString(R.string.home_move_up_to_filter);
         BOOKMARKS_ROOT_LABEL = res.getString(R.string.bookmarks_title);
         DESKTOP_FOLDER_LABEL = res.getString(R.string.bookmarks_folder_desktop);
         TOOLBAR_FOLDER_LABEL = res.getString(R.string.bookmarks_folder_toolbar);
         BOOKMARKS_MENU_FOLDER_LABEL = res.getString(R.string.bookmarks_folder_menu);
         UNSORTED_FOLDER_LABEL = res.getString(R.string.bookmarks_folder_unfiled);
 
         // Menu items - some of the items are found only on android 2.3 and lower and some only on android 3.0+
@@ -441,48 +369,33 @@ public class StringHelper {
         GUEST_MODE_LABEL = res.getString(R.string.new_guest_session);
         TAB_QUEUE_LABEL = res.getString(R.string.pref_tab_queue_title);
 
         // Android 3.0+
         TOOLS_LABEL = res.getString(R.string.tools);
         PAGE_LABEL = res.getString(R.string.page);
 
         // Android 2.3 and lower only
-        MORE_LABEL = "More";
         RELOAD_LABEL = res.getString(R.string.reload);
         FORWARD_LABEL = res.getString(R.string.forward);
         BOOKMARK_LABEL = res.getString(R.string.bookmark);
 
         // Bookmark Toast Notification
         BOOKMARK_ADDED_LABEL = res.getString(R.string.bookmark_added);
         BOOKMARK_REMOVED_LABEL = res.getString(R.string.bookmark_removed);
         BOOKMARK_UPDATED_LABEL = res.getString(R.string.bookmark_updated);
         BOOKMARK_OPTIONS_LABEL = res.getString(R.string.bookmark_options);
 
         // Edit Bookmark screen
         EDIT_BOOKMARK = res.getString(R.string.bookmark_edit_title);
 
         // Strings used in doorhanger messages and buttons
-        GEO_MESSAGE = "Share your location with";
         GEO_ALLOW = res.getString(R.string.share);
-        GEO_DENY = "Don't share";
-
-        OFFLINE_MESSAGE = "to store data on your device for offline use";
-        OFFLINE_ALLOW = "Allow";
-        OFFLINE_DENY = "Don't allow";
 
-        LOGIN_MESSAGE = "Would you like " + BRAND_NAME + " to remember this login?";
-        LOGIN_ALLOW = "Remember";
-        LOGIN_DENY = "Never";
-
-        POPUP_MESSAGE = "prevented this site from opening";
         POPUP_ALLOW = res.getString(R.string.pref_panels_show);
-        POPUP_DENY = "Don't show";
-
-        CONTENT_DESCRIPTION_READER_MODE_BUTTON = "Enter Reader View";
     }
 
     public static void initialize(Resources res) {
         if (instance != null) {
             throw new IllegalStateException(StringHelper.class.getSimpleName() + " already Initialized");
         }
         instance = new StringHelper(res);
     }