Index: build/ios/grit_whitelist.txt |
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt |
index b1ef69837df52fdcc52929dc90328d50ffc5bd50..277e3fe036406542a6c54e402cc0af4d465a3423 100644 |
--- a/build/ios/grit_whitelist.txt |
+++ b/build/ios/grit_whitelist.txt |
@@ -85,7 +85,6 @@ IDS_ACCNAME_BACK |
IDS_ACCNAME_CLEAR_TEXT |
IDS_ACCNAME_FORWARD |
IDS_ACCNAME_LOCATION |
-IDS_ACCNAME_STAR |
IDS_ACCNAME_VOICE_SEARCH |
IDS_ALLOW_INSECURE_CONTENT_BUTTON |
IDS_ALTERNATE_NAV_URL_VIEW_LABEL |
@@ -103,6 +102,7 @@ IDS_AUTOFILL_CC_INFOBAR_DENY |
IDS_AUTOFILL_CC_INFOBAR_TEXT |
IDS_AUTOFILL_CC_JCB |
IDS_AUTOFILL_CC_MASTERCARD |
+IDS_AUTOFILL_CC_UNION_PAY |
IDS_AUTOFILL_CC_VISA |
IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM |
IDS_AUTOFILL_DIALOG_PRIVACY_POLICY_LINK |
@@ -130,6 +130,7 @@ IDS_AUTOLOGIN_INFOBAR_OK_BUTTON |
IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT |
IDS_BLOCK_INSECURE_CONTENT_BUTTON |
IDS_BOOKMARK_ADD_EDITOR_TITLE |
+IDS_BOOKMARK_ALL_TABS_DIALOG_TITLE |
IDS_BOOKMARK_BAR_FOLDER_NAME |
IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME |
IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME |
@@ -263,6 +264,7 @@ IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED |
IDS_ERRORPAGES_DETAILS_CONNECTION_FAILED |
IDS_ERRORPAGES_DETAILS_CONNECTION_REFUSED |
IDS_ERRORPAGES_DETAILS_CONNECTION_RESET |
+IDS_ERRORPAGES_DETAILS_DNS_PROBE_RUNNING |
IDS_ERRORPAGES_DETAILS_DOWNLOAD_FILE_TYPE_ERROR |
IDS_ERRORPAGES_DETAILS_EMPTY_RESPONSE |
IDS_ERRORPAGES_DETAILS_FILE_ACCESS_DENIED |
@@ -344,6 +346,7 @@ IDS_ERRORPAGES_SUMMARY_CACHE_MISS |
IDS_ERRORPAGES_SUMMARY_CACHE_READ_FAILURE |
IDS_ERRORPAGES_SUMMARY_CONNECTION_REFUSED |
IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET |
+IDS_ERRORPAGES_SUMMARY_DNS_PROBE_RUNNING |
IDS_ERRORPAGES_SUMMARY_DOWNLOAD_FILE_TYPE_ERROR |
IDS_ERRORPAGES_SUMMARY_DUPLICATE_HEADERS |
IDS_ERRORPAGES_SUMMARY_EMPTY_RESPONSE |
@@ -393,6 +396,8 @@ IDS_FIND_IN_PAGE_NEXT_TOOLTIP |
IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP |
IDS_FLAGS_ACCELERATED_FILTERS |
IDS_FLAGS_ACCELERATED_FILTERS_DESCRIPTION |
+IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_DESCRIPTION |
+IDS_FLAGS_ACCELERATED_FIXED_ROOT_BACKGROUND_NAME |
IDS_FLAGS_ACTION_BOX_DESCRIPTION |
IDS_FLAGS_ACTION_BOX_NAME |
IDS_FLAGS_ALLOW_NACL_SOCKET_API_DESCRIPTION |
@@ -427,6 +432,8 @@ IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION |
IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_DESCRIPTION |
IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_HIGH_DPI |
IDS_FLAGS_COMPOSITING_FOR_FIXED_POSITION_NAME |
+IDS_FLAGS_COMPOSITING_FOR_TRANSITION_DESCRIPTION |
+IDS_FLAGS_COMPOSITING_FOR_TRANSITION_NAME |
IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION |
IDS_FLAGS_CONFLICTS_CHECK_NAME |
IDS_FLAGS_CSS_SHADERS_DESCRIPTION |
@@ -511,6 +518,8 @@ IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION |
IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME |
IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION |
IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME |
+IDS_FLAGS_ENABLE_DRAGGABLE_MENU_BUTTON_DESCRIPTION |
+IDS_FLAGS_ENABLE_DRAGGABLE_MENU_BUTTON_NAME |
IDS_FLAGS_ENABLE_EXPERIMENTAL_BLUETOOTH_DESCRIPTION |
IDS_FLAGS_ENABLE_EXPERIMENTAL_BLUETOOTH_NAME |
IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION |
@@ -521,6 +530,8 @@ IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION |
IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME |
IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION |
IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME |
+IDS_FLAGS_ENABLE_HTTP2_DRAFT_04_DESCRIPTION |
+IDS_FLAGS_ENABLE_HTTP2_DRAFT_04_NAME |
IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API |
IDS_FLAGS_ENABLE_INSTANT_EXTENDED_API_DESCRIPTION |
IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_DESCRIPTION |
@@ -569,6 +580,8 @@ IDS_FLAGS_ENABLE_SPDY3_DESCRIPTION |
IDS_FLAGS_ENABLE_SPDY3_NAME |
IDS_FLAGS_ENABLE_SPDY4A1_DESCRIPTION |
IDS_FLAGS_ENABLE_SPDY4A1_NAME |
+IDS_FLAGS_ENABLE_SPDY4A2_DESCRIPTION |
+IDS_FLAGS_ENABLE_SPDY4A2_NAME |
IDS_FLAGS_ENABLE_SPDY_PROXY_AUTH_DESCRIPTION |
IDS_FLAGS_ENABLE_SPDY_PROXY_AUTH_NAME |
IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION |
@@ -583,6 +596,8 @@ IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION |
IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME |
IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION |
IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME |
+IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_DESCRIPTION |
+IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_NAME |
IDS_FLAGS_ENABLE_VP9_PLAYBACK_DESCRIPTION |
IDS_FLAGS_ENABLE_VP9_PLAYBACK_NAME |
IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_DESCRIPTION |
@@ -599,6 +614,8 @@ IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_DESCRIPTION |
IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_NAME |
IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_DESCRIPTION |
IDS_FLAGS_EXPERIMENTAL_WEBKIT_FEATURES_NAME |
+IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION |
+IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_NAME |
IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_DESCRIPTION |
IDS_FLAGS_EXTENSIONS_ON_CHROME_URLS_NAME |
IDS_FLAGS_FILE_MANAGER_PACKAGED_DESCRIPTION |
@@ -628,6 +645,7 @@ IDS_FLAGS_NOT_AVAILABLE |
IDS_FLAGS_NO_DISCARD_TABS_DESCRIPTION |
IDS_FLAGS_NO_DISCARD_TABS_NAME |
IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE |
+IDS_FLAGS_NO_UNSUPPORTED_EXPERIMENTS |
IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_DESCRIPTION |
IDS_FLAGS_NTP_OTHER_SESSIONS_MENU_NAME |
IDS_FLAGS_NTP_SUGGESTIONS_PAGE_DESCRIPTION |
@@ -700,6 +718,7 @@ IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION |
IDS_FLAGS_TOUCH_OPTIMIZED_UI_NAME |
IDS_FLAGS_TRACK_ACTIVE_VISIT_TIME_DESCRIPTION |
IDS_FLAGS_TRACK_ACTIVE_VISIT_TIME_NAME |
+IDS_FLAGS_UNSUPPORTED_TABLE_TITLE |
IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_DESCRIPTION |
IDS_FLAGS_USE_CLIENT_LOGIN_SIGNIN_FLOW_NAME |
IDS_FLAGS_VIEWS_TEXTFIELD_DESCRIPTION |
@@ -722,7 +741,6 @@ IDS_HISTORY_CONTINUED |
IDS_HISTORY_DATE_WITH_RELATIVE_TIME |
IDS_HISTORY_DELETE_PRIOR_VISITS_CONFIRM_BUTTON |
IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING |
-IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING_NO_SHORTCUT |
IDS_HISTORY_FILTER_ALLOWED |
IDS_HISTORY_FILTER_ALLOW_ITEMS |
IDS_HISTORY_FILTER_BLOCKED |
@@ -762,12 +780,15 @@ IDS_HISTORY_UNLOCK_BUTTON |
IDS_HTTP_POST_WARNING |
IDS_HTTP_POST_WARNING_RESEND |
IDS_HTTP_POST_WARNING_TITLE |
+IDS_IMPORT_FROM_FIREFOX |
+IDS_IMPORT_FROM_ICEWEASEL |
IDS_KEYWORD_SEARCH |
IDS_LEARN_MORE |
IDS_LOGIN_DIALOG_OK_BUTTON_LABEL |
IDS_LOGIN_DIALOG_PASSWORD_FIELD |
IDS_LOGIN_DIALOG_TITLE |
IDS_LOGIN_DIALOG_USERNAME_FIELD |
+IDS_MANAGED_USER_AVATAR_LABEL |
IDS_MOBILE_WELCOME_URL |
IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS |
IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG |
@@ -794,7 +815,6 @@ IDS_OPEN_TABS_PROMOCOMPUTER |
IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY |
IDS_OPTIONS_DISABLE_WEB_SERVICES |
IDS_OPTIONS_ENABLE_LOGGING |
-IDS_OPTIONS_GENERAL_TAB_LABEL |
IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE |
IDS_OPTIONS_INTERNET_TAB_LABEL |
IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON |
@@ -803,7 +823,6 @@ IDS_OTHER_DEVICES_X_MORE |
IDS_PAGEINFO_ADDRESS |
IDS_PAGEINFO_CERT_INFO_BUTTON |
IDS_PAGEINFO_PARTIAL_ADDRESS |
-IDS_PAGE_INFO_EV_IDENTITY_TITLE |
IDS_PAGE_INFO_HELP_CENTER_LINK |
IDS_PAGE_INFO_INTERNAL_PAGE |
IDS_PAGE_INFO_SECURITY_BUTTON_ACCESSIBILITY_LABEL |
@@ -812,6 +831,7 @@ IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR |
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING |
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK |
IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS |
+IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD |
IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE |
IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY |
IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY |
@@ -844,14 +864,19 @@ IDS_PREFERENCES_UNREADABLE_ERROR |
IDS_PRINT |
IDS_PRIVACY_POLICY_URL |
IDS_PRODUCT_NAME |
+IDS_PROFILES_GUEST_PROFILE_NAME |
IDS_PROFILES_LOCAL_PROFILE_STATE |
IDS_PROFILE_TOO_NEW_ERROR |
IDS_SAD_TAB_MESSAGE |
IDS_SAD_TAB_TITLE |
IDS_SAFE_BROWSING_MALWARE_BACK_BUTTON |
+IDS_SAFE_BROWSING_MALWARE_BACK_HEADLINE |
+IDS_SAFE_BROWSING_MALWARE_COLLAB_HEADLINE |
IDS_SAFE_BROWSING_MALWARE_DIAGNOSTIC_PAGE |
+IDS_SAFE_BROWSING_MALWARE_FEAR_HEADLINE |
IDS_SAFE_BROWSING_MALWARE_HEADLINE |
IDS_SAFE_BROWSING_MALWARE_LABEL |
+IDS_SAFE_BROWSING_MALWARE_QUESTION_HEADLINE |
IDS_SAFE_BROWSING_MALWARE_TITLE |
IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION1 |
IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION1_SUBRESOURCE |
@@ -876,8 +901,12 @@ IDS_SAFE_BROWSING_MULTI_PHISHING_DESCRIPTION1 |
IDS_SAFE_BROWSING_MULTI_THREAT_DESCRIPTION1 |
IDS_SAFE_BROWSING_MULTI_THREAT_DESCRIPTION2 |
IDS_SAFE_BROWSING_MULTI_THREAT_TITLE |
+IDS_SAFE_BROWSING_PHISHING_BACK_HEADLINE |
+IDS_SAFE_BROWSING_PHISHING_COLLAB_HEADLINE |
+IDS_SAFE_BROWSING_PHISHING_FEAR_HEADLINE |
IDS_SAFE_BROWSING_PHISHING_HEADLINE |
IDS_SAFE_BROWSING_PHISHING_LABEL |
+IDS_SAFE_BROWSING_PHISHING_QUESTION_HEADLINE |
IDS_SAFE_BROWSING_PHISHING_REPORT_ERROR |
IDS_SAFE_BROWSING_PHISHING_TITLE |
IDS_SAFE_BROWSING_PHISHING_V2_DESCRIPTION1 |
@@ -892,6 +921,7 @@ IDS_SESSION_CRASHED_VIEW_MESSAGE |
IDS_SESSION_CRASHED_VIEW_RESTORE_BUTTON |
IDS_SETTINGS_SHOW_ADVANCED_SETTINGS |
IDS_SHORT_PRODUCT_NAME |
+IDS_SHOW_HISTORY |
IDS_SIGNED_IN_WITH_SYNC_DISABLED |
IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED |
IDS_SIGNIN_ERROR_BUBBLE_VIEW_TITLE |
@@ -917,6 +947,7 @@ IDS_SYNC_CANNOT_ACCESS_ACCOUNT |
IDS_SYNC_CLEAR_USER_DATA |
IDS_SYNC_CONFIGURE_ENCRYPTION |
IDS_SYNC_CREATE_ACCOUNT |
+IDS_SYNC_DATATYPE_AUTOFILL |
IDS_SYNC_DATATYPE_BOOKMARKS |
IDS_SYNC_DATATYPE_PASSWORDS |
IDS_SYNC_DATATYPE_PREFERENCES |
@@ -954,7 +985,8 @@ IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE |
IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM |
IDS_SYNC_PASSPHRASE_LABEL |
IDS_SYNC_PASSPHRASE_MISMATCH_ERROR |
-IDS_SYNC_PASSPHRASE_MSG_EXPLICIT |
+IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_POSTFIX |
+IDS_SYNC_PASSPHRASE_MSG_EXPLICIT_PREFIX |
IDS_SYNC_PASSPHRASE_SECTION_TITLE |
IDS_SYNC_PASSWORD_SYNC_ATTENTION |
IDS_SYNC_PROMO_TAB_TITLE |
@@ -1067,8 +1099,12 @@ IDS_TIME_SECS_MANY |
IDS_TIME_SECS_TWO |
IDS_TIME_SECS_ZERO |
IDS_TIME_SEC_SINGULAR |
+IDS_TOOLTIP_STAR |
IDS_TOUCH_EVENTS_DESCRIPTION |
IDS_TOUCH_EVENTS_NAME |
+IDS_TRANSLATE_INFOBAR_ACCEPT |
+IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE |
+IDS_TRANSLATE_INFOBAR_DENY |
IDS_UNKNOWN_SEARCH_ENGINE_NAME |
IDS_UPGRADE_AVAILABLE |
IDS_UPGRADE_AVAILABLE_BUTTON |