Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Chromium from 73.0.3683.75 to Chromium 74.0.3729.22 #2027

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions app/app_management_strings.grdp
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--This file is created by l10nUtil.js. Do not edit manually.-->
<grit-part>
<message name="IDS_APP_MANAGEMENT_ANDROID_SETTINGS" desc="Label for the open Android settings button on the ARC app permissions page.">
Open Android settings
</message>
<message name="IDS_APP_MANAGEMENT_APP_LIST_PREVIEW" desc="A label that summarizes a list of apps by naming up to 3 apps, finishing with 'X more apps' for the rest.">
{COUNT, plural,
=0 {None}
Expand All @@ -19,6 +22,9 @@
<message name="IDS_APP_MANAGEMENT_CAMERA" desc="Label for the camera permission toggle.">
Camera
</message>
<message name="IDS_APP_MANAGEMENT_EXTENSIONS_SETTINGS" desc="Label for the open Extensions settings button on the Brave app permissions page.">
Open Extensions settings
</message>
<message name="IDS_APP_MANAGEMENT_LESS_APPS" desc="Label for showing less apps.">
Show less
</message>
Expand All @@ -31,6 +37,9 @@
<message name="IDS_APP_MANAGEMENT_MORE_APPS" desc="Label for more apps button at bottom of app list card.">
Show <ph name="NUMBER_OF_MORE_APPS">$1<ex>4</ex></ph> more apps
</message>
<message name="IDS_APP_MANAGEMENT_NO_RESULTS" desc="Text description of a search that has no results.">
No search results found
</message>
<message name="IDS_APP_MANAGEMENT_NOTIFICATIONS" desc="Label for notifications section in the app settings page.">
Notifications
</message>
Expand Down
54 changes: 0 additions & 54 deletions app/bookmarks_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@
<message name="IDS_BOOKMARK_BAR_OPEN_ALL" desc="Menu title for opening all urls in a bookmark folder">
&amp;Open all bookmarks
</message>
<message name="IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW" desc="Menu title for opening all urls in a bookmark folder in a new window">
Open all bookmarks in &amp;new window
</message>
<message name="IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO" desc="Menu description for opening all urls in a bookmark folder in a private window">
Open all bookmarks in &amp;private window
</message>
<message name="IDS_BOOKMARK_BAR_OPEN_ALL_COUNT" desc="Menu title for opening all urls in a bookmark folder">
{COUNT, plural,
=0 {&amp;Open all}
Expand Down Expand Up @@ -117,12 +111,6 @@
<message name="IDS_BOOKMARK_BAR_OPEN_ALL" desc="In Title Case: Menu title for opening all urls in a bookmark folder">
&amp;Open All Bookmarks
</message>
<message name="IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW" desc="In Title Case: Menu title for opening all urls in a bookmark folder in a new window">
Open All Bookmarks in &amp;New Window
</message>
<message name="IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO" desc="In Title Case: Menu description for opening all urls in a bookmark folder in a private window">
Open All Bookmarks in &amp;Private Window
</message>
<message name="IDS_BOOKMARK_BAR_OPEN_ALL_COUNT" desc="In Title Case: Menu title for opening all urls in a bookmark folder">
{COUNT, plural,
=0 {&amp;Open All}
Expand Down Expand Up @@ -315,65 +303,23 @@
<message name="IDS_BOOKMARK_MANAGER" desc="The label of the menu item that shows the bookmark manager">
&amp;Bookmark manager
</message>
<message name="IDS_BOOKMARK_MANAGER_FOLDERS_MENU" desc="Title of the folders menu in the bookmark manager.">
Folders
</message>
<message name="IDS_BOOKMARK_MANAGER_ORGANIZE_MENU" desc="Title of the organize menu in the bookmark manager.">
Organize
</message>
<message name="IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER" desc="The label of the menu item in the bookmark manager context menu that changes the selection in the tree to match the folder of the selected item in the table.">
Show in folder
</message>
<message name="IDS_BOOKMARK_MANAGER_SORT" desc="The label of the menu item in the bookmark manager organize menu that alphabetizes the bookmarks/folders by title.">
Reorder by title
</message>
<message name="IDS_BOOKMARK_MANAGER_IMPORT_MENU" desc="Title of the import menu item in the bookmark manager.">
Import bookmarks from HTML file...
</message>
<message name="IDS_BOOKMARK_MANAGER_EXPORT_MENU" desc="Title of the export menu item in the bookmark manager.">
Export bookmarks to HTML file...
</message>
<message name="IDS_BOOKMARK_MANAGER_INVALID_URL" desc="Error message to display when the user tries to edit or create a bookmark with an invalid URL.">
Invalid URL
</message>
<message name="IDS_BOOKMARK_MANAGER_RECENT" desc="The label for the tree item that shows the recently added bookmarks.">
Recent
</message>
<message name="IDS_BOOKMARK_MANAGER_SEARCH" desc="The label for the tree item that shows the search results for the bookmarks.">
Search
</message>
</if>
<if expr="use_titlecase">
<message name="IDS_BOOKMARK_MANAGER" desc="In Title Case: The label of the menu item that shows the bookmark manager">
&amp;Bookmark Manager
</message>
<message name="IDS_BOOKMARK_MANAGER_FOLDERS_MENU" desc="In Title Case: Title of the folders menu in the bookmark manager.">
Folders
</message>
<message name="IDS_BOOKMARK_MANAGER_ORGANIZE_MENU" desc="In Title Case: Title of the organize menu in the bookmark manager.">
Organize
</message>
<message name="IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER" desc="In Title Case: The label of the menu item in the bookmark manager context menu that changes the selection in the tree to match the folder of the selected item in the table.">
Show in Folder
</message>
<message name="IDS_BOOKMARK_MANAGER_SORT" desc="In Title Case: The label of the menu item in the bookmark manager organize menu that alphabetizes the bookmarks/folders by title.">
Reorder by Title
</message>
<message name="IDS_BOOKMARK_MANAGER_IMPORT_MENU" desc="In Title Case: Title of the import menu item in the bookmark manager.">
Import Bookmarks from HTML File...
</message>
<message name="IDS_BOOKMARK_MANAGER_EXPORT_MENU" desc="In Title Case: Title of the export menu item in the bookmark manager.">
Export Bookmarks to HTML File...
</message>
<message name="IDS_BOOKMARK_MANAGER_INVALID_URL" desc="In Title Case: Error message to display when the user tries to edit or create a bookmark with an invalid URL.">
Invalid URL.
</message>
<message name="IDS_BOOKMARK_MANAGER_RECENT" desc="In Title Case: The label for the tree item that shows the recently added bookmarks.">
Recent
</message>
<message name="IDS_BOOKMARK_MANAGER_SEARCH" desc="In Title Case: The label for the tree item that shows the search results for the bookmarks.">
Search
</message>
</if>
<message name="IDS_EXPORT_BOOKMARKS_DEFAULT_FILENAME" desc="Filename that pre-populates the filename field when user attempts to export their bookmarks from Bookmark Manager.">
bookmarks_<ph name="DATESTAMP">$1<ex>02_11_11</ex></ph>.html
Expand Down
3 changes: 2 additions & 1 deletion app/brave_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "content/public/common/content_features.h"
#include "extensions/common/extension_features.h"
#include "gpu/config/gpu_finch_features.h"
#include "services/network/public/cpp/features.h"
#include "third_party/widevine/cdm/buildflags.h"
#include "ui/base/ui_base_features.h"

Expand Down Expand Up @@ -145,7 +146,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
autofill::features::kAutofillServerCommunication.name,
features::kAudioServiceOutOfProcess.name,
features::kDefaultEnableOopRasterization.name,
features::kSharedArrayBuffer.name,
network::features::kNetworkService.name,
unified_consent::kUnifiedConsent.name,
};

Expand Down
15 changes: 11 additions & 4 deletions app/brave_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,13 @@ Signing in anyway will merge Brave information like bookmarks, history, and othe
</message>
</if>

<!-- about:browser-switch strings -->
<if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open">
Your system administrator has configured Brave to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
</if>

<!-- Signin Email Confirmation tab modal dialog -->
<if expr="not chromeos">
<message name="IDS_SIGNIN_EMAIL_CONFIRMATION_TITLE" desc="Title of the signin email confirmation tab modal dialog.">
Expand Down Expand Up @@ -899,7 +906,10 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</

<if expr="not is_android">
<message name="IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the accessibility labels service of Brave to Brave.">
Brave can recognize images and text in an image by sending page images to Brave servers, allowing you to better understand page content.
If an image doesn’t have a useful description, Brave will try to provide one for you. Images are scanned by Brave. You can turn this off in settings at any time.
</message>
<message name="IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_TEXT_ONCE" desc="The text of a bubble that confirms users allows integrating the accessibility labels service of Brave to Brave just once.">
If an image doesn’t have a useful description, Brave will try to provide one for you. Images are scanned by Brave.
</message>
<message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Brave to Brave.">
Brave can provide smarter spell-checking by sending what you type in the browser to Brave servers, allowing you to use the same spell-checking technology used by Brave search.
Expand Down Expand Up @@ -974,9 +984,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
</message>

<!-- User menu errors -->
<message name="IDS_SYNC_ERROR_USER_MENU_SUPERVISED_SIGNIN_MESSAGE" desc="Message of the out-of-date signin token error for supervised users in the header of desktop user menu.">
Your manager must remove and add you back to Brave.
</message>
<message name="IDS_SYNC_ERROR_USER_MENU_UPGRADE_MESSAGE" desc="Message of the out-of-date Brave client error in the header of desktop user menu.">
Brave is out of date
</message>
Expand Down
9 changes: 3 additions & 6 deletions app/file_manager_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@
<message name="IDS_FILE_BROWSER_LINUX_FILES_ROOT_LABEL" desc="A label for the 'Linux files' root which shows crostini files. Use sentence case.">
Linux files
</message>
<message name="IDS_FILE_BROWSER_MY_FILES_ROOT_LABEL" desc="A label for the 'My files' root which is parent of Downloads, Linux and Android files. Use sentence case.">
My files
</message>
<message name="IDS_FILE_BROWSER_EXTERNAL_STORAGE_ROOT_LABEL" desc="A label for external USB storage. Use sentence case.">
External storage
</message>
<message name="IDS_FILE_BROWSER_MEDIA_VIEW_IMAGES_ROOT_LABEL" desc="A label for the 'Images' root of media views.">
Images
</message>
Expand Down Expand Up @@ -246,6 +240,9 @@
<message name="IDS_FILE_BROWSER_CLOSE_VOLUME_BUTTON_LABEL" desc="Title of the action for closing either an archive volume or a volume provided by an extension.">
Close
</message>
<message name="IDS_FILE_BROWSER_SEND_FEEDBACK_BUTTON_LABEL" desc="Title for the action of sending user feedback.">
Send feedback
</message>
<message name="IDS_FILE_BROWSER_ADD_NEW_SERVICES_BUTTON_LABEL" desc="Title of the button in the left nav to add new services (file systems) to the Files app.">
Add new service
</message>
Expand Down
Loading