Updated strings to Chromium 87.0.4250.0.

brave · Oct 28, 2020 · edb584e · edb584e
1 parent 0c8a08b
commit edb584e
Show file tree

Hide file tree

Showing 15 changed files with 328 additions and 154 deletions.
diff --git a/app/brave_strings.grd b/app/brave_strings.grd
@@ -1149,6 +1149,12 @@ Brave is unable to recover your settings.
         </message>
       </if>
 
+      <!-- Global Media Controls -->
+      <if expr="not is_android">
+        <message name="IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_BUTTON_LABEL" desc="Label for a button that opens a menu for picking an audio device to play from.">
+          Devices
+        </message>
+      </if>
     </messages>
   </release>
 </grit>
diff --git a/app/brave_strings_override.grd b/app/brave_strings_override.grd
@@ -304,6 +304,8 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
         </message>
         </if>
 
+      <if expr="not is_android">
+        </if>
     </messages>
   </release>
 </grit>
diff --git a/app/generated_resources.grd b/app/generated_resources.grd
@@ -3423,6 +3423,9 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_TASK_MANAGER_ARC_PREFIX" desc="The prefix for an ARC general process row">
           App: <ph name="ARC_PROCESS_NAME">$1<ex>com.android.systemui</ex></ph>
         </message>
+        <message name="IDS_TASK_MANAGER_TOOL_PREFIX" desc="The prefix for a tool process row in the Task Manager">
+          Tool: <ph name="PRINT_NAME">$1<ex>Manage Profiles</ex></ph>
+        </message>
         <message name="IDS_TASK_MANAGER_ARC_PREFIX_BACKGROUND_SERVICE" desc="The prefix for an ARC service process row">
           Service: <ph name="ARC_PROCESS_NAME">$1<ex>com.android.systemui</ex></ph>
         </message>
@@ -5456,6 +5459,20 @@ Keep your key file in a safe place. You will need it to create new versions of y
         </message>
       </if>
 
+      <!-- Star View menu -->
+      <message name="IDS_STAR_VIEW_MENU_ADD_BOOKMARK" desc="The item label of the menu triggered from the star icon in the location bar for adding a bookmark.">
+        Add Bookmark
+      </message>
+      <message name="IDS_STAR_VIEW_MENU_EDIT_BOOKMARK" desc="The item label of the menu triggered from the star icon in the location bar for editing a bookmark.">
+        Edit Bookmark
+      </message>
+      <message name="IDS_STAR_VIEW_MENU_MOVE_TO_READ_LATER" desc="The item label of the menu triggered from the star icon in the location bar for moving the current tab to read later.">
+        Add to Read later
+      </message>
+      <message name="IDS_STAR_VIEW_MENU_MARK_AS_READ" desc="The item label of the menu triggered from the star icon in the location bar for marking the current tab's read later entry as read.">
+        Mark as Read
+      </message>
+
       <!--Tooltip strings-->
       <message name="IDS_TOOLTIP_BACK" desc="The tooltip for back button">
         Click to go back, hold to see history
@@ -5801,6 +5818,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_PASSWORD_MANAGER_SAVE_BUTTON" desc="Save button text for password manager">
           Save
         </message>
+        <message name="IDS_PASSWORD_MANAGER_SAVE_BUBBLE_OPT_IN_BUTTON" desc="Text for action button in the save bubble that leads the user to opt in to the account-scoped password storage.">
+          Next
+        </message>
         <message name="IDS_PASSWORD_MANAGER_MOVE_BUBBLE_OK_BUTTON" desc="Text for the ok button in the password manager move bubble.">
           Move
         </message>
@@ -9046,9 +9066,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
       </message>
 
       <!-- Live caption. -->
-      <message name="IDS_LIVE_CAPTION_BUBBLE_WAIT_TEXT" desc="Text displayed in the Live Caption bubble when it is waiting for captions from the speech service">
-        Detecting speech...
-      </message>
       <message name="IDS_LIVE_CAPTION_BUBBLE_CLOSE" desc="Tooltip for the Live Caption close button">
         Turn off Live Caption for now
       </message>
@@ -9061,6 +9078,9 @@ Please help our engineers fix this problem. Tell us what happened right before y
       <message name="IDS_LIVE_CAPTION_BUBBLE_ERROR" desc="Error message for the Live Caption bubble when Live Captions are unavailable.">
         Live Caption is not available right now
       </message>
+      <message name="IDS_LIVE_CAPTION_BUBBLE_ACCESSIBLE_NAME" desc="Label of the Live Caption bubble for accessibility.">
+        Live Caption
+      </message>
 
       <!-- Caret browsing. -->
       <if expr="not chromeos">
@@ -10506,6 +10526,31 @@ Please help our engineers fix this problem. Tell us what happened right before y
           other {Click to view these extensions}}
       </message>
     </if>
+
+    <if expr="is_macosx">
+      <!-- These strings are placeholders for strings that are filled in via
+           field trials, so they are *not* used as-is except in tests. -->
+      <message name="IDS_MAC_SYSTEM_INFOBAR_TEXT_ARM" desc="Mac system-specific infobar text for Arm64-on-Arm64." translateable="false">
+        This is an Arm64 Brave on Arm64, so things might not work quite right
+yet!
+      </message>
+      <message name="IDS_MAC_SYSTEM_INFOBAR_TEXT_ROSETTA" desc="Mac system-specific infobar text for Intel-on-Arm64." translateable="false">
+        This is an x86-64 Brave on Arm64, so things might not work quite right
+yet!
+      </message>
+      <message name="IDS_MAC_SYSTEM_INFOBAR_LINK_TEXT_ARM" desc="Mac system-specific infobar link text for Arm64-on-Arm64." translateable="false">
+        Learn more
+      </message>
+      <message name="IDS_MAC_SYSTEM_INFOBAR_LINK_URL_ARM" desc="Mac system-specific infobar link for Arm64-on-Arm64." translateable="false">
+        https://www.google.com
+      </message>
+      <message name="IDS_MAC_SYSTEM_INFOBAR_LINK_TEXT_ROSETTA" desc="Mac system-specific infobar link text for Intel-on-Arm64." translateable="false">
+        Learn more
+      </message>
+      <message name="IDS_MAC_SYSTEM_INFOBAR_LINK_URL_ROSETTA" desc="Mac system-specific infobar link for Intel-on-Arm64." translateable="false">
+        https://www.google.com
+      </message>
+    </if>
   </messages>
 </release>
 </grit>
diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd
@@ -109,7 +109,8 @@ are declared in tools/grit/grit_rule.gni.
       </if>
 
       <if expr="not is_android">
-        </if>
+        <part file="nearby_share_strings_override.grdp" />
+      </if>
 
       <if expr="not chromeos and not is_android">
         </if>
@@ -362,6 +363,9 @@ are declared in tools/grit/grit_rule.gni.
         <message name="IDS_TASK_MANAGER_PORTAL_INCOGNITO_PREFIX" desc="The prefix for a Private portal row in the Task Manager (these processes are created when portals is enabled, in private mode)">
           Private Portal: <ph name="SUBFRAME_SITE">$1<ex>https://youtube.com/</ex></ph>
         </message>
+        <message name="IDS_TASK_MANAGER_TOOL_PREFIX" desc="The prefix for a tool process row in the Task Manager">
+          Tool: <ph name="PRINT_NAME">$1<ex>Manage Profiles</ex></ph>
+        </message>
         </if>
 
       <if expr="chromeos">
@@ -867,6 +871,9 @@ are declared in tools/grit/grit_rule.gni.
       </if>
     <if expr="not is_android">
       </if>
+
+    <if expr="is_macosx">
+      </if>
   </messages>
 </release>
 </grit>
diff --git a/app/nearby_share_strings.grdp b/app/nearby_share_strings.grdp
@@ -2,7 +2,104 @@
 <!-- Nearby Share specific strings (included from generated_resources.grd). -->
 <!--This file is created by l10nUtil.js. Do not edit manually.-->
 <grit-part>
+  <!-- Confirmation page -->
+  <message name="IDS_NEARBY_CONFIRMATION_PAGE_ADD_CONTACT_SUBTITLE" desc="Subtitle of the checkbox to add the profile to a users contacts. This will make the local device visible to them once they are nearby.">
+    Adding this contact will remember the next time they share
+  </message>
+  <message name="IDS_NEARBY_CONFIRMATION_PAGE_ADD_CONTACT_TITLE" desc="Title of the checkbox to add the profile to a users contacts.">
+    Add <ph name="CONTACT_NAME">$1<ex>Richard</ex></ph> to your contacts
+  </message>
+  <message name="IDS_NEARBY_CONFIRMATION_PAGE_TITLE" desc="Title of the Nearby Share confirmation page after selecting a device to share with.">
+    Share with this device?
+  </message>
+
+  <!-- Contact visibility component -->
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_CONTACTS_TITLE" desc="Section title of the contacts list when setting up the device visibility for the Nearby Share feature.">
+    Contacts
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_NEARBY_SHARE_OPEN" desc="Describes that nearby devices are visible while the Nearby Share feature is open on screen.">
+    Devices near you when Nearby Share is open
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_SUBTITLE" desc="Help text shown when there are no available contacts with a Brave sync chain to select from. Nearby Share is the feature name.">
+    No contacts are available. To use Nearby Share with your contacts, add the email address linked with their Brave sync chain to your contacts.
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_NO_CONTACTS_TITLE" desc="Title text shown when there are no available contacts with a Brave sync chain to select from.">
+    No available contacts
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OTHERS" desc="Describes when nearby devices are visible to this user when using the Nearby Share feature.">
+    Profiles who have chosen to be visible to you when their screen is unlocked
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OTHERS_TITLE" desc="Title of the description for which devices the user can share with using the Nearby Share feature.">
+    Devices you can share with
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_ALL" desc="Describes who can see the local device when the Nearby Share visibility setting is set to 'All contacts'.">
+    All contacts near you when your screen is unlocked
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_NONE" desc="Describes who can see the local device when the Nearby Share visibility setting is set to 'Hidden'.">
+    No one unless you open Nearby Share
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_SOME" desc="Describes who can see the local device when the Nearby Share visibility setting is set to 'Some contacts'.">
+    Selected contacts near you when your screen is unlocked
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OWN_TITLE" desc="Title of the description for which nearby devices can share with a users device using the Nearby Share feature.">
+    Who can share with your device
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_ZERO_STATE_INFO" desc="Help text to learn more about the privacy and visibility settings of the Nearby Share feature.">
+    Learn more
+  </message>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_ZERO_STATE_TEXT" desc="Zero state help text to explain how the visibility settings control the Nearby Share feature.">
+    Your device visibility controls who can share with you while your screen is unlocked
+  </message>
+
+  <!-- Discovery page -->
+  <message name="IDS_NEARBY_DISCOVERY_PAGE_INFO" desc="Help text on how to use the Nearby Share feature. Explains how to enable it on a nearby Bravebook to share with it.">
+    Make sure both devices are unlocked, close together, and have Bluetooth turned on. If you’re sharing with a Bravebook, make sure it has Nearby Sharing turned on (open the status area by selecting the time, then select Nearby Share).
+  </message>
+  <message name="IDS_NEARBY_DISCOVERY_PAGE_SUBTITLE" desc="Subtitle of the Nearby Share device discovery page. This is where users select a device to share files with.">
+    Select the device you’d like to share files with
+  </message>
+  <message name="IDS_NEARBY_DISCOVERY_PAGE_TITLE" desc="Title of the Nearby Share device discovery page. This is where users select a device to share files with. Nearby Share is the feature name.">
+    Nearby Share
+  </message>
+
+  <!-- Onboarding page -->
+  <message name="IDS_NEARBY_ONBOARDING_PAGE_DEVICE_NAME" desc="Label of the text input field to set the name of a users device which is shown to other devices for the Nearby Share feature.">
+    Device name
+  </message>
+  <message name="IDS_NEARBY_ONBOARDING_PAGE_SUBTITLE" desc="Subtitle of the Nearby Share onboarding page that sets up the local device for the feature which provides a way for nearby devices to share files, text, and urls.">
+    Share files with profiles around you
+  </message>
+  <message name="IDS_NEARBY_ONBOARDING_PAGE_TITLE" desc="Title of the Nearby Share onboarding page that sets up the local device for the feature. Nearby Share is the feature name.">
+    Set up Nearby Share
+  </message>
+
+  <!-- Visibility page -->
+  <message name="IDS_NEARBY_VISIBILITY_PAGE_MANAGE_CONTACTS" desc="Action button text to manage the contacts of a user while setting up Nearby Share.">
+    Manage contacts
+  </message>
+  <message name="IDS_NEARBY_VISIBILITY_PAGE_SUBTITLE" desc="Subtitle of the Nearby Share device visibility page that sets up the visibility settings for the local device. This page allows users to configure who can see their local device when nearby.">
+    Select who can share with you
+  </message>
+  <message name="IDS_NEARBY_VISIBILITY_PAGE_TITLE" desc="Title of the Nearby Share device visibility page that sets up the visibility settings for the local device.">
+    Device visibility
+  </message>
+
   <!-- Common strings -->
+  <message name="IDS_NEARBY_SHARE_FEATURE_NAME" desc="This is the name of the Nearby Share feature which provides a way for nearby devices to share files, text, and urls">
+    Nearby Share
+  </message>
+  <message name="IDS_NEARBY_ACTIONS_CANCEL" desc="Action button text to cancel the current step in the Nearby Share UI.">
+    Cancel
+  </message>
+  <message name="IDS_NEARBY_ACTIONS_CONFIRM" desc="Action button text to confirm a transfer in the Nearby Share UI.">
+    Confirm
+  </message>
+  <message name="IDS_NEARBY_ACTIONS_NEXT" desc="Action button text to go to the next step in the Nearby Share UI.">
+    Next
+  </message>
+  <message name="IDS_NEARBY_ACTIONS_REJECT" desc="Action button text to reject a transfer in the Nearby Share UI.">
+    Reject
+  </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_APPS" desc="Describes one or more apps being transfered via Nearby Share.">
     {COUNT, plural, =1 {1 app} other {# apps}}
   </message>
@@ -34,7 +131,39 @@
     {COUNT, plural, =1 {1 item} other {# items}}
   </message>
 
+  <!-- Settings Strings -->
+  <message name="IDS_NEARBY_VISIBLITY_ALL_CONTACTS" desc="Describes the user preference state for the user to be visibile to all their contacts in the Nearby Share feature.">
+    All contacts
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_ALL_CONTACTS_DESCRIPTION" desc="Accessibility description that explains to the user that their current visibility setting is all contacts for the Nearby Share feature." is_accessibility_with_no_ui="true">
+    Current visibility setting is all contacts
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_SOME_CONTACTS" desc="Describes the user preference state for the user to be visibile to some selected set of their contacts in the Nearby Share feature.">
+    Some contacts
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_SOME_CONTACTS_DESCRIPTION" desc="Accessibility description that explains to the user that their current visibility setting is some contacts for the Nearby Share feature." is_accessibility_with_no_ui="true">
+    Current visibility setting is some contacts
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_HIDDEN" desc="Describes the user preference state for the user to be visibile to none of their contacts (hidden) in the Nearby Share feature.">
+    Hidden
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_HIDDEN_DESCRIPTION" desc="Accessibility description that explains to the user that their current visibility setting hidden for the Nearby Share feature." is_accessibility_with_no_ui="true">
+    Current visibility setting is hidden
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_UNKNOWN" desc="Describes the user preference state when the user has not chosen a visibility preference yet in the Nearby Share feature.">
+    Choose your visibility
+  </message>
+  <message name="IDS_NEARBY_VISIBLITY_UNKNOWN_DESCRIPTION" desc="Accessibility description that explains to the user that their current visibility setting is not set yet for the Nearby Share feature." is_accessibility_with_no_ui="true">
+    Current visibility setting is not set yet
+  </message>
+
   <!-- Notification strings -->
+  <message name="IDS_NEARBY_NOTIFICATION_ACTION_COPY_TO_CLIPBOARD" desc="Notification action button text that copies the received text or image to the clipboard.">
+    Copy to clipboard
+  </message>
+  <message name="IDS_NEARBY_NOTIFICATION_ACTION_OPEN_FOLDER" desc="Notification action button text that opens the folder to the received files.">
+    Open folder
+  </message>
   <message name="IDS_NEARBY_NOTIFICATION_CONNECTION_REQUEST_MESSAGE" desc="Text shown as the message of a notfication when a nearby device requests a connection via Nearby Share.">
     {COUNT, plural,
       =1 {<ph name="DEVICE_NAME">$1<ex>Ted's Pixel 2</ex></ph> is sharing <ph name="ATTACHMENTS">$2<ex>1 item</ex></ph> with you.}

diff --git a/app/nearby_share_strings_override.grdp b/app/nearby_share_strings_override.grdp
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Nearby Share specific strings (included from generated_resources.grd). -->
+<grit-part>
+  <message name="IDS_NEARBY_CONTACT_VISIBILITY_OTHERS" desc="Describes when nearby devices are visible to this user when using the Nearby Share feature.">
+    Profiles who have chosen to be visible to you when their screen is unlocked
+  </message>
+  <message name="IDS_NEARBY_ONBOARDING_PAGE_SUBTITLE" desc="Subtitle of the Nearby Share onboarding page that sets up the local device for the feature which provides a way for nearby devices to share files, text, and urls.">
+    Share files with profiles around you
+  </message>
+  </grit-part>
diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp
@@ -307,10 +307,10 @@
   <message name="IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ALT1" desc="Text for search result item which, when clicked, navigates the user to account settings, with a toggle to restrict sign-in to a particular set of users. Alternate phrase for: 'Restrict sign-in'">
     Limit sign-in
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ADD" desc="Text for search result item which, when clicked, navigates the user to account settings, with an option to add to the whitelist of restricted users.">
+  <message name="IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_ADD" desc="Text for search result item which, when clicked, navigates the user to account settings, with an option to add to the allow list of restricted users.">
     Add restricted user
   </message>
-  <message name="IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_REMOVE" desc="Text for search result item which, when clicked, navigates the user to account settings, with an option to remove from the whitelist of restricted users.">
+  <message name="IDS_OS_SETTINGS_TAG_RESTRICT_SIGN_IN_REMOVE" desc="Text for search result item which, when clicked, navigates the user to account settings, with an option to remove from the allow list of restricted users.">
     Remove restricted user
   </message>
   <message name="IDS_OS_SETTINGS_TAG_SYNC_TURN_OFF" desc="Text for search result item which, when clicked, navigates the user to sync settings, with an option to turn off syncing. Alternate phrase for: 'Disable sync'">