Skip to content

Commit

Permalink
Fixup some strings for google product names
Browse files Browse the repository at this point in the history 
We should not replace google's own product name such as Google Docs
or Google Drive.

fix brave/brave-browser#5450
  • Loading branch information
@simonhong
simonhong committed Feb 2, 2020
1 parent dd254f3 commit cfae9de
Show file tree
Hide file tree
Showing 16 changed files with 112 additions and 112 deletions.
54 changes: 27 additions & 27 deletions app/brave_strings.grd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,11 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
</message>
</if>
<if expr="chromeos">
<message name="IDS_PRODUCT_OS_NAME" desc="The Brave OS application name">
Brave OS
<message name="IDS_PRODUCT_OS_NAME" desc="The Chrome OS application name">
Chrome OS
</message>
<message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Brave OS application short name">
Brave OS
<message name="IDS_SHORT_PRODUCT_OS_NAME" desc="The Chrome OS application short name">
Chrome OS
</message>
</if>
<message name="IDS_SHORT_PRODUCT_LOGO_ALT_TEXT" desc="Alt text for the Brave logo image.">
Expand Down Expand Up @@ -203,7 +203,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
</message>
</if>
<!-- Accessible window title format - includes the channel, and the same
on all browser platforms rather than different on Brave OS. -->
on all browser platforms rather than different on Chrome OS. -->
<message name="IDS_ACCESSIBLE_BROWSER_WINDOW_TITLE_FORMAT" desc="The format for the accessible name of a tabbed browser window">
<ph name="PAGE_TITLE">$1<ex>Brave</ex></ph> - Brave
</message>
Expand All @@ -223,11 +223,11 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
Copyright © <ph name="YEAR">{0,date,y}<ex>2016</ex></ph> The Brave Authors. All rights reserved.
</message>
<if expr="chromeos">
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Brave open source URLs for Brave OS.">
Brave OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>.
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Brave open source URLs for Chrome OS.">
Chrome OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>.
</message>
<message name="IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE" desc="Additional text displayed beneath the Brave open source URLs for Brave OS when Crostini is installed.">
Brave OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>, as is <ph name="BEGIN_LINK_LINUX_OSS">&lt;a target="_blank" href="$2"&gt;</ph>Linux (Beta)<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
<message name="IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE" desc="Additional text displayed beneath the Brave open source URLs for Chrome OS when Crostini is installed.">
Chrome OS is made possible by additional <ph name="BEGIN_LINK_CROS_OSS">&lt;a target="_blank" href="$1"&gt;</ph>open source software<ph name="END_LINK_CROS_OSS">&lt;/a&gt;</ph>, as is <ph name="BEGIN_LINK_LINUX_OSS">&lt;a target="_blank" href="$2"&gt;</ph>Linux (Beta)<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
</message>
<message name="IDS_ABOUT_SAFETY_INFORMATION" desc="The safety label in the About box." translateable="false">
Not used in Brave. Placeholder to keep resource maps in sync.
Expand Down Expand Up @@ -272,7 +272,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
</message>
<if expr="chromeos">
<message name="IDS_EXTERNAL_PROTOCOL_TITLE" desc="External Protocol Dialog Title">
Brave OS can't open this page.
Chrome OS can't open this page.
</message>
</if>
<if expr="use_titlecase">
Expand Down Expand Up @@ -448,7 +448,7 @@ Brave is unable to recover your settings.

<!-- Abandon in-progress downloads confirmation dialog -->
<if expr="not is_macosx">
<message name="IDS_ABANDON_DOWNLOAD_DIALOG_BROWSER_MESSAGE" desc="Message on a dialog shown when the user closes the browser while one or more downloads are in progress. This string is shown on Windows, Brave OS, and Linux, which all use 'Exit' to refer to closing a browser.">
<message name="IDS_ABANDON_DOWNLOAD_DIALOG_BROWSER_MESSAGE" desc="Message on a dialog shown when the user closes the browser while one or more downloads are in progress. This string is shown on Windows, Chrome OS, and Linux, which all use 'Exit' to refer to closing a browser.">
Exit Brave anyway?
</message>
</if>
Expand Down Expand Up @@ -552,11 +552,11 @@ Brave is unable to recover your settings.
<message name="IDS_ABOUT" desc="The text label of the About Brave menu item">
About &amp;Brave
</message>
<message name="IDS_ABOUT_OS" desc="The text label of the About Brave OS menu item">
About &amp;Brave OS
<message name="IDS_ABOUT_OS" desc="The text label of the About Chrome OS menu item">
About &amp;Chrome OS
</message>
<message name="IDS_UPDATE_NOW" desc="The text label of the Update Brave OS Now menu item">
Update &amp;Brave OS
<message name="IDS_UPDATE_NOW" desc="The text label of the Update Chrome OS Now menu item">
Update &amp;Chrome OS
</message>
</if>

Expand Down Expand Up @@ -654,20 +654,20 @@ Brave is unable to recover your settings.
</message>
</if>
<if expr="chromeos">
<message name="IDS_SIGNIN_ERROR_SECONDARY_ACCOUNT_DISPLAY_SOURCE" desc="Context title shown in the notification header of sign-in error notification for Brave OS Secondary Accounts.">
Brave OS System
<message name="IDS_SIGNIN_ERROR_SECONDARY_ACCOUNT_DISPLAY_SOURCE" desc="Context title shown in the notification header of sign-in error notification for Chrome OS Secondary Accounts.">
Chrome OS System
</message>
<message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sync error notification when the user needs to update their sync passphrase.">
Brave OS could not sync your data. Please update your Sync passphrase.
Chrome OS could not sync your data. Please update your Sync passphrase.
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sign-in error notification when the user's sign-in credentials are out of date.">
Brave OS could not sync your data because your account sign-in details are out of date.
Chrome OS could not sync your data because your account sign-in details are out of date.
</message>
<message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sign-in error notification when sync is not available for their domain.">
Brave OS could not sync your data because Sync is not available for your domain.
Chrome OS could not sync your data because Sync is not available for your domain.
</message>
<message name="IDS_SYNC_OTHER_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE" desc="Message in the sign-in error notification when there's an error signing in.">
Brave OS could not sync your data due to an error signing in.
Chrome OS could not sync your data due to an error signing in.
</message>
</if>
<message name="IDS_SYNC_PAUSED_REASON_CLEAR_COOKIES_ON_EXIT" desc="Info text displayed in the user menu when sync is paused due to cookies cleared on exit.">
Expand Down Expand Up @@ -696,10 +696,10 @@ Brave is unable to recover your settings.
<message name="IDS_APP_SHORTCUTS_SUBDIR_NAME_DEV">Brave Apps</message>
</if>

<!-- Brave OS OOBE Terms of Service screen-->
<!-- Chrome OS OOBE Terms of Service screen-->
<if expr="chromeos">
<message name="IDS_TERMS_OF_SERVICE_SCREEN_SUBHEADING" desc="Subheading at the top of the Terms of Service screen.">
<ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read and accept the following Terms of Service before using this device. These terms do not expand, modify or limit the Brave OS Terms.
<ph name="DOMAIN">$1<ex>example.com</ex></ph> requires that you read and accept the following Terms of Service before using this device. These terms do not expand, modify or limit the Chrome OS Terms.
</message>
</if>

Expand Down Expand Up @@ -845,12 +845,12 @@ Brave is unable to recover your settings.
</if>
<if expr="chromeos">
<message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE" desc="The window title for the Update Recommended dialog.">
Restart Brave OS
Restart Chrome OS
</message>
<message name="IDS_UPDATE_RECOMMENDED" desc="The main text of the Update Recommended dialog.">
Brave OS needs to be restarted to apply the update.
Chrome OS needs to be restarted to apply the update.
</message>
<message name="IDS_RELAUNCH_AND_UPDATE" desc="The button in the Update Recommended dialog which updates and restarts Brave OS.">
<message name="IDS_RELAUNCH_AND_UPDATE" desc="The button in the Update Recommended dialog which updates and restarts Chrome OS.">
Restart
</message>
</if>
Expand Down Expand Up @@ -979,7 +979,7 @@ Brave is unable to recover your settings.
Please wait while Brave installs the latest system updates.
</message>
<message name="IDS_EULA_SCREEN_ACCESSIBLE_TITLE" desc="Title to be spoken on opening the OOBE EULA screen">
Brave OS terms
Chrome OS terms
</message>
</if>

Expand Down
2 changes: 1 addition & 1 deletion app/extensions_strings.grdp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
Are you sure you want to permanently keep this device in kiosk mode?
</message>
<message name="IDS_EXTENSIONS_KIOSK_DISABLE_BAILOUT_SHORTCUT_WARNING_BODY" desc="Warning text of disabling kiosk application launch bail out shortcut.">
The only way to undo this is to re-install <ph name="IDS_SHORT_PRODUCT_OS_NAME">$1<ex>Brave OS</ex></ph>
The only way to undo this is to re-install <ph name="IDS_SHORT_PRODUCT_OS_NAME">$1<ex>Chrome OS</ex></ph>
</message>
</if>
</grit-part>
Loading

0 comments on commit cfae9de

Please sign in to comment.