Skip to content

Commit

Permalink
Merge pull request #6386 from brave/pr6317_fix_brave_account_strings_…
Browse files Browse the repository at this point in the history
…1.13.x

Use Brave sync chain instead of Brave Account (uplift to 1.13.x)
  • Loading branch information
kjozwiak authored Aug 14, 2020
2 parents 56db493 + f35c0cd commit 2023706
Show file tree
Hide file tree
Showing 17 changed files with 95 additions and 93 deletions.
8 changes: 4 additions & 4 deletions app/brave_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ Brave is unable to recover your settings.
</if>
<!-- Password generation strings -->
<message name="IDS_PASSWORD_GENERATION_PROMPT" desc="Autofill dropdown text describing password generation.">
Brave will save this password in your Brave Account. You won’t have to remember it.
Brave will save this password in your Brave sync chain. You won’t have to remember it.
</message>
<!-- Password manager onboarding strings -->
<message name="IDS_PASSWORD_MANAGER_ONBOARDING_DETAILS_C" desc="The explanation text that is shown below the title in the password manager onboarding dialog.">
Expand Down Expand Up @@ -663,10 +663,10 @@ Brave is unable to recover your settings.
Link your Brave data to this account?
</message>
<message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITHOUT_PROFILE_CREATION" desc="The warning message displayed to an enterprise user about to link their profile to their Brave account. This message is followed by a 'Learn more' link.">
You are signing in with a managed account and giving its administrator control over your Brave profile. Your Brave data, such as your apps, bookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Brave Accounts Dashboard, but you will not be able to associate this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
You are signing in with a managed account and giving its administrator control over your Brave profile. Your Brave data, such as your apps, bookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Brave sync chains Dashboard, but you will not be able to associate this data with another account. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
</message>
<message name="IDS_ENTERPRISE_SIGNIN_EXPLANATION_WITH_PROFILE_CREATION" desc="The warning message displayed to an enterprise user about to link their profile to their Brave account. Additionally notifies the user that they can create a new profile instead. This message is followed by a 'Learn more' link.">
You are signing in with a managed account and giving its administrator control over your Brave profile. Your Brave data, such as your apps, bookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Brave Accounts Dashboard, but you will not be able to associate this data with another account. You can optionally create a new profile to keep your existing Brave data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
You are signing in with a managed account and giving its administrator control over your Brave profile. Your Brave data, such as your apps, bookmarks, history, passwords, and other settings will become permanently tied to <ph name="USER_NAME">$1<ex>pat@example.com</ex></ph>. You will be able to delete this data via the Brave sync chains Dashboard, but you will not be able to associate this data with another account. You can optionally create a new profile to keep your existing Brave data separate. <ph name="LEARN_MORE">$2<ex>Learn more</ex></ph>
</message>
</if>

Expand Down Expand Up @@ -795,7 +795,7 @@ Brave is unable to recover your settings.
Brave just got better
</message>
<message name="IDS_USER_MANAGER_TUTORIAL_SLIDE_INTRO_TEXT" desc="Main text of the tutorial introduction slide">
Now it's easier to use Brave with your Brave Account and on shared computers.
Now it's easier to use Brave with your Brave sync chain and on shared computers.
</message>
<message name="IDS_USER_MANAGER_TUTORIAL_SLIDE_YOUR_CHROME_TITLE" desc="Title of the slide about personalizing the browser">
This is your Brave
Expand Down
22 changes: 11 additions & 11 deletions app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -4695,7 +4695,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Update password for <ph name="ORIGIN">$1<ex>example.com</ex></ph>?
</message>
<message name="IDS_SAVE_PASSWORD_FOOTER" desc="The footer text of the bubble that offers user to save a password to Brave.">
Passwords are saved in your Brave Account so you can use them on any device
Passwords are saved in your Brave sync chain so you can use them on any device
</message>
<if expr="use_titlecase">
<message name="IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN" desc="In Title Case: The title of the Sign in button in the account chooser when there is one account.">
Expand Down Expand Up @@ -4724,18 +4724,18 @@ Keep your key file in a safe place. You will need it to create new versions of y
Never worry about your passwords
</message>
<message name="IDS_PASSWORD_MANAGER_ONBOARDING_DETAILS_A" desc="The explanation text that is shown below the title in the password manager onboarding dialog.">
Save passwords securely in your Brave Account, and you'll never have to type them again
Save passwords securely in your Brave sync chain, and you'll never have to type them again
</message>
<message name="IDS_PASSWORD_MANAGER_ONBOARDING_DETAILS_B" desc="The explanation text that is shown below the title in the password manager onboarding dialog.">
Access your passwords whenever you're signed in to your Brave Account
Access your passwords whenever you're signed in to your Brave sync chain
</message>

<!-- Begin of Sync Promo strings for Desktop Identity Consistency. -->
<message name="IDS_PASSWORD_MANAGER_DICE_PROMO_SIGNIN_MESSAGE" desc="Text of the sync promo displayed at the bottom of the save password bubble asking the user to sign in and enable sync.">
To save passwords to your Brave Account, sign in and turn on sync.
To save passwords to your Brave sync chain, sign in and turn on sync.
</message>
<message name="IDS_PASSWORD_MANAGER_DICE_PROMO_SYNC_MESSAGE" desc="Text of the sync promo displayed at the bottom of the save password bubble asking the user to enable sync.">
To save passwords to your Brave Account, turn on sync.
To save passwords to your Brave sync chain, turn on sync.
</message>
<!-- End of Sync Promo strings for Desktop Identity Consistency. -->

Expand Down Expand Up @@ -5733,7 +5733,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Password
</message>
<message name="IDS_PASSWORD_MANAGER_MOVE_TITLE" desc="The title of the 'move password to account' bubble">
Move to Brave Account?
Move to Brave sync chain?
</message>
<message name="IDS_PASSWORD_MANAGER_MOVE_HINT" desc="Label describing the effect of moving an existing credential to the user's account store">
Move your password to your Brave account to access it securely wherever you're signed in
Expand Down Expand Up @@ -5943,7 +5943,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Clear browsing data
</message>
<message name="IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE" desc="A dialog informing the user that their Brave browsing history was deleted, but other forms of history can still be found on Brave My Activity.">
The selected data has been removed from Brave and synced devices. Your Brave Account may have other forms of browsing history like searches and activity from other Brave services at <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/a&gt;</ph>.
The selected data has been removed from Brave and synced devices. Your Brave sync chain may have other forms of browsing history like searches and activity from other Brave services at <ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>myactivity.google.com<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
<message name="IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE" desc="Title of a dialog that informs the user that the deletion of Brave's browsing data has been completed.">
Cleared Brave data
Expand Down Expand Up @@ -6977,7 +6977,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Undo
</message>
<message name="IDS_ONE_CLICK_SIGNIN_BUBBLE_MESSAGE" desc="The body of the sync promo NTP bubble.">
Your bookmarks, history, and other settings will be synced to your Brave Account.
Your bookmarks, history, and other settings will be synced to your Brave sync chain.
</message>
<message name="IDS_ONE_CLICK_SIGNIN_DIALOG_OK_BUTTON" desc="The text of the OK button of the one click sign-in dialog.">
OK, got it
Expand Down Expand Up @@ -8555,18 +8555,18 @@ Please help our engineers fix this problem. Tell us what happened right before y

<!-- Protected media identifier permission infobar -->
<message name="IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT" desc="A message that the browser shows after saving a password it has autogenerated for the user. This message appears in a bubble and contains a link to all the user's saved autogenerated passwords. The link text is a separate string in the translation console and appears here as placeholder text.">
View and manage saved passwords in your <ph name="SAVED_PASSWORDS_STORE">$1<ex>Brave Account</ex></ph>
View and manage saved passwords in your <ph name="SAVED_PASSWORDS_STORE">$1<ex>Brave sync chain</ex></ph>
</message>
<message name="IDS_PASSWORDS_WEB_LINK" translateable="false">
https://passwords.google.com
</message>
<if expr="is_android">
<message name="IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT_INFOBAR" desc="A message that the browser shows after saving a password it has autogenerated for the user. This message appears in an infobar and contains a link to all the user's saved autogenerated passwords. The link text is a separate string in the translation console and appears here as placeholder text.">
Password saved. View and manage saved passwords in your <ph name="SAVED_PASSWORDS_STORE">$1<ex>Brave Account</ex></ph>.
Password saved. View and manage saved passwords in your <ph name="SAVED_PASSWORDS_STORE">$1<ex>Brave sync chain</ex></ph>.
</message>
</if>
<message name="IDS_MANAGE_PASSWORDS_LINK" desc="The text for a link to the user's saved passwords. This is inserted into an infobar or a bubble that the browser shows to the user. The infobar and the bubble use a separate string in the translation console that has a placeholder for this link title.">
Brave Account
Brave sync chain
</message>
<message name="IDS_MANAGE_PASSWORDS_TITLE" desc="The title text that is used in the manage passwords bubble when a password is autofilled or after a user has stored a password.">
Saved passwords for this site
Expand Down
10 changes: 5 additions & 5 deletions app/os_settings_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
Wi-Fi networks
</message>
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_SUBMENU_LABEL" desc="Label of Account Manager submenu in Settings page.">
Brave Accounts
Brave sync chains
</message>
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_PAGE_TITLE" desc="Title of Account Manager Settings page.">
My accounts
Expand Down Expand Up @@ -826,10 +826,10 @@
School Account
</message>
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_TEXT" desc="Text for 'secondary accounts disabled' message in Settings page.">
Your administrator has disabled the addition of more Brave Accounts
Your administrator has disabled the addition of more Brave sync chains
</message>
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_SECONDARY_ACCOUNTS_DISABLED_CHILD_TEXT" desc="Text for 'secondary accounts disabled' message for child accounts in Settings page.">
Addition of more Brave Accounts is disabled
Addition of more Brave sync chains is disabled
</message>
<message name="IDS_SETTINGS_ACCOUNT_MANAGER_SIGNED_OUT_ACCOUNT_PLACEHOLDER" desc="Placeholder text for the full name of a signed out account in Account Manager.">
Sign in again
Expand Down Expand Up @@ -1672,7 +1672,7 @@
Get data connection
</message>
<message name="IDS_SETTINGS_INTERNET_TOGGLE_TETHER_SUBTEXT" desc="Settings &gt; Internet: Description for Tether enable/disable toggle .">
Let this device find other devices with your Brave Account that have a mobile data connection
Let this device find other devices with your Brave sync chain that have a mobile data connection
</message>
<message name="IDS_SETTINGS_INTERNET_TOGGLE_WIFI_ACCESSIBILITY_LABEL" desc="Accessibility only label for WiFi enable/disable toggle .">
Wi-Fi enable
Expand Down Expand Up @@ -2448,7 +2448,7 @@
Unlock device only
</message>
<message name="IDS_SETTINGS_EASY_UNLOCK_UNLOCK_DEVICE_AND_ALLOW_SIGNIN" desc="This option lets the user unlock their Bravebook from their phone as well as log into their Bravebook without a password if their phone is nearby and unlocked.">
Unlock device and sign in to Brave Account
Unlock device and sign in to Brave sync chain
</message>

<!-- Fingerprint Page (OS settings) -->
Expand Down
4 changes: 2 additions & 2 deletions app/settings_brave_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
Brave can't check your passwords. Try checking your internet connection.
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT" desc="Error message when the password check can't be completed because the user is not signed in.">
Brave can check your passwords when you sign in with your Brave Account
Brave can check your passwords when you sign in with your Brave sync chain
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS" desc="Error message when the password check can't be completed since no passwords could be checked.">
No saved passwords. Brave can check your passwords when you save them.
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT" desc="Error message when the password check can't be completed since the user hit the quota limit, but the user is able to check their passwords in their Brave account.">
Brave can't check your passwords. Try again after 24 hours or <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;</ph>check passwords in your Brave Account<ph name="END_LINK">&lt;/a&gt;</ph>.
Brave can't check your passwords. Try again after 24 hours or <ph name="BEGIN_LINK">&lt;a href="$1" target="_blank"&gt;</ph>check passwords in your Brave sync chain<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT" desc="Error message when the password check can't be completed since the user hit the quota limit.">
Brave can't check your passwords. Try again after 24 hours.
Expand Down
Loading

0 comments on commit 2023706

Please sign in to comment.