Skip to content

Commit

Permalink
branding fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aankirz
Aankirz committed Mar 20, 2024
1 parent 13759a2 commit 9843a46
Show file tree
Hide file tree
Showing 46 changed files with 706 additions and 706 deletions.
4 changes: 2 additions & 2 deletions src/chrome/app/chromeos_strings.grdp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6082,12 +6082,12 @@ You can use this account with Android apps. If you want to add an account for so

Permissions you've already given to apps may apply to this account. You can control permissions for Android apps in <ph name="APPS_LINK_BEGIN">&lt;a id="appsSettingsLink" href="$3<ex>https://google.com/</ex>"&gt;</ph>Apps Settings<ph name="APPS_LINK_END">&lt;/a&gt;</ph>.
</message>
<message name="IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_BODY_V2_WITH_DEVICE_GUEST_MODE" desc="Text body for the Welcome screen in ChromiumOS 'Add account' dialog.">
<message name="IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_BODY_V2_WITH_DEVICE_GUEST_MODE" desc="Text body for the Welcome screen in WootzAppOS 'Add account' dialog.">
If you want to use this account one-time only, you can <ph name="GUEST_LINK_BEGIN">&lt;a id="guestModeLink" href="#"&gt;</ph>use the device as guest<ph name="GUEST_LINK_END">&lt;/a&gt;</ph>. If you want to add an account for someone else, <ph name="LINK_BEGIN">&lt;a target="_blank" id="newPersonLink" href="$1<ex>https://google.com/</ex>"&gt;</ph>add a new person<ph name="LINK_END">&lt;/a&gt;</ph> to your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>.

Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <ph name="SETTINGS_LINK_BEGIN">&lt;a id="osSettingsLink" href="$3<ex>https://google.com/</ex>"&gt;</ph>Settings<ph name="SETTINGS_LINK_END">&lt;/a&gt;</ph>.
</message>
<message name="IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_BODY_V2_WITHOUT_GUEST" desc="Text body for the Welcome screen in ChromiumOS 'Add account' dialog.">
<message name="IDS_ACCOUNT_MANAGER_DIALOG_WELCOME_BODY_V2_WITHOUT_GUEST" desc="Text body for the Welcome screen in WootzAppOS 'Add account' dialog.">
If you want to add an account for someone else, <ph name="LINK_BEGIN">&lt;a target="_blank" id="newPersonLink" href="$1<ex>https://google.com/</ex>"&gt;</ph>add a new person<ph name="LINK_END">&lt;/a&gt;</ph> to your <ph name="DEVICE_TYPE">$2<ex>Chromebook</ex></ph>.

Permissions you've already given to websites and apps may apply to this account. You can manage your Google Accounts in <ph name="SETTINGS_LINK_BEGIN">&lt;a id="osSettingsLink" href="$3<ex>https://google.com/</ex>"&gt;</ph>Settings<ph name="SETTINGS_LINK_END">&lt;/a&gt;</ph>.
Expand Down
800 changes: 400 additions & 400 deletions src/chrome/app/chromium_strings.grd
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/chrome/app/generated_resources.grd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5114,7 +5114,7 @@ are declared in tools/grit/grit_rule.gni.
</message>

<!-- Critical Notification bubble -->
<message name="IDS_CRITICAL_NOTIFICATION_RESTART" desc="Button label a button on the bubble that appears when there is a critical update and Chrome/Chromium must restart to install it. Pressing the buton will cause Chrome/Chromium to restart.">
<message name="IDS_CRITICAL_NOTIFICATION_RESTART" desc="Button label a button on the bubble that appears when there is a critical update and Chrome/WootzApp must restart to install it. Pressing the buton will cause Chrome/WootzApp to restart.">
Restart now
</message>

Expand Down Expand Up @@ -7445,7 +7445,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Reason: The inverted rule <ph name="REVERT_RULE">$1<ex>!example.com</ex></ph> was found in the "Force open in" list.
</message>
<message name="IDS_ABOUT_BROWSER_SWITCH_INTERNALS_OPEN_BROWSER_DEFAULT_REASON" desc="about:browser-switch/internals, section URL Checker, the explaination reason for check result, displayed when the entered URL did not match any listed rule and default browser will not get switched">
Reason: LBS stays in <ph name="DEFAULT_OPEN_BROWSER">$1<ex>Chromium</ex></ph> by default.
Reason: LBS stays in <ph name="DEFAULT_OPEN_BROWSER">$1<ex>WootzApp</ex></ph> by default.
</message>
<message name="IDS_ABOUT_BROWSER_SWITCH_INTERNALS_INVALID_URL" desc="about:browser-switch/internals, section URL Checker, specific error message when the url is invalid">
Invalid URL. Make sure it is formatted properly.
Expand Down
14 changes: 7 additions & 7 deletions src/chrome/app/google_chrome_strings.grd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,18 +403,18 @@ chromium_strings.grd. -->
</message>
<if expr="chromeos_ash">
<if expr="reven">
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for ChromeOS Flex.">
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the WootzApp open source URLs for ChromeOS Flex.">
ChromeOS Flex 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 Chromium open source URLs for ChromeOS Flex when Crostini is installed.">
<message name="IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE" desc="Additional text displayed beneath the WootzApp open source URLs for ChromeOS Flex when Crostini is installed.">
ChromeOS Flex 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 development environment<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
</message>
</if>
<if expr="not reven">
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the Chromium open source URLs for ChromeOS.">
<message name="IDS_ABOUT_CROS_VERSION_LICENSE" desc="Additional text displayed beneath the WootzApp open source URLs for ChromeOS.">
ChromeOS 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 Chromium open source URLs for ChromeOS when Crostini is installed.">
<message name="IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE" desc="Additional text displayed beneath the WootzApp open source URLs for ChromeOS when Crostini is installed.">
ChromeOS 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 development environment<ph name="END_LINK_LINUX_OSS">&lt;/a&gt;</ph>.
</message>
</if>
Expand Down Expand Up @@ -634,7 +634,7 @@ Permissions you've already given to websites and apps may apply to this account.
<message name="IDS_UNINSTALL_DELETE_PROFILE" desc="Text to show user to ask whether to delete all the profile data also during uninstallation.">
Also delete your browsing data?
</message>
<message name="IDS_UNINSTALL_SET_DEFAULT_BROWSER" desc="Text to ask whether to set another browser as default when Chromium is uninstalled.">
<message name="IDS_UNINSTALL_SET_DEFAULT_BROWSER" desc="Text to ask whether to set another browser as default when WootzApp is uninstalled.">
Change default browser to:
</message>
<message name="IDS_UNINSTALL_BUTTON_TEXT" desc="Label for uninstall button on Uninstall confirmation dialog.">
Expand Down Expand Up @@ -1257,10 +1257,10 @@ Permissions you've already given to websites and apps may apply to this account.

<!-- content area context menus. Android does not use it -->
<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 Google to Chromium.">
<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 Google to WootzApp.">
If an image doesn’t have a useful description, Chrome will try to provide one for you. To create descriptions, images are sent to Google. 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 Google to Chromium just once.">
<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 Google to WootzApp just once.">
If an image doesn’t have a useful description, Chrome will try to provide one for you. To create descriptions, images are sent to Google.
</message>
<message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Google to Chrome.">
Expand Down
22 changes: 11 additions & 11 deletions src/chrome/app/os_settings_strings.grdp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@
<message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH_AND_AUTO_UPDATE" desc="The label for the button that relaunches and enables automatic updates">
Restart and get automatic updates
</message>
<message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated ChromiumOS/ChromeOS">
<message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_RELAUNCH" desc="Status label: Successfully updated WootzAppOS/ChromeOS">
Nearly up to date! Restart your device to finish updating.
</message>
<message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating ChromiumOS or ChromeOS">
<message name="IDS_SETTINGS_UPGRADE_UPDATING" desc="Status label: Updating WootzAppOS or ChromeOS">
Updating your device
</message>
<message name="IDS_SETTINGS_UPGRADE_UPDATING_PERCENT" desc="Status label: Updating ChromiumOS or ChromeOS (90%)">
<message name="IDS_SETTINGS_UPGRADE_UPDATING_PERCENT" desc="Status label: Updating WootzAppOS or ChromeOS (90%)">
Updating your device (<ph name="PROGRESS_PERCENT">$1<ex>90%</ex></ph>)
</message>
<message name="IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH" desc="Status label: Updating ChromiumOS/ChromeOS to a specified channel">
<message name="IDS_SETTINGS_UPGRADE_UPDATING_CHANNEL_SWITCH" desc="Status label: Updating WootzAppOS/ChromeOS to a specified channel">
Updating your device to <ph name="CHANNEL_NAME">$1<ex>stable</ex></ph> channel (<ph name="PROGRESS_PERCENT">$2<ex>90%</ex></ph>)
</message>
<message name="IDS_SETTINGS_ABOUT_PAGE_END_OF_LIFE_TITLE" desc="Title used for End of Life section on the About Page.">
Expand All @@ -103,13 +103,13 @@
<message name="IDS_SETTINGS_ABOUT_PAGE_DEVICE_NAME" desc="Title of the line item on the about page that allows the user to edit the device hostname.">
Device name
</message>
<message name="IDS_SETTINGS_UPGRADE_ROLLBACK_IN_PROGRESS" desc="Status label: Rolling back ChromiumOS or ChromeOS.">
<message name="IDS_SETTINGS_UPGRADE_ROLLBACK_IN_PROGRESS" desc="Status label: Rolling back WootzAppOS or ChromeOS.">
<ph name="MANAGER">$1<ex>google.com</ex></ph> is putting this device on a previous version (<ph name="PROGRESS_PERCENT">$2<ex>90%</ex></ph>)
</message>
<message name="IDS_SETTINGS_UPGRADE_ROLLBACK_SUCCESS" desc="Status label: Successfully rolled back ChromeOS. All data on the device will be deleted during the next reboot.">
<ph name="MANAGER">$1<ex>google.com</ex></ph> has put this device on a previous version. Please save important files, then restart. All data on the device will be deleted.
</message>
<message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH" desc="Status label: Channel was successfully switched on ChromiumOS/ChromeOS">
<message name="IDS_SETTINGS_UPGRADE_SUCCESSFUL_CHANNEL_SWITCH" desc="Status label: Channel was successfully switched on WootzAppOS/ChromeOS">
Channel changed. Restart your device to apply changes.
</message>
<message name="IDS_SETTINGS_ABOUT_TPM_FIRMWARE_UPDATE_TITLE" desc="Title for the line item on the about page that allows the user to trigger a device hardware reset and request installation of a TPM firmware update.">
Expand Down Expand Up @@ -223,19 +223,19 @@
<message name="IDS_SETTINGS_ABOUT_PAGE_DEVICE_NAME_EDIT_BTN_A11Y_DESCRIPTION" desc="The a11y description for the edit button for device name on the detailed build into page">
Current device name is <ph name="DEVICE_NAME">$1<ex>MyChromebook</ex></ph>
</message>
<message name="IDS_SETTINGS_UPGRADE_TRY_AGAIN" desc="Status label: Update check error (ChromiumOS/ChromeOS)">
<message name="IDS_SETTINGS_UPGRADE_TRY_AGAIN" desc="Status label: Update check error (WootzAppOS/ChromeOS)">
Couldn't update your Chromebook. Please try again later.
</message>
<message name="IDS_SETTINGS_UPGRADE_DOWNLOAD_ERROR" desc="Status label: Update check download error(ChromiumOS/ChromeOS)">
<message name="IDS_SETTINGS_UPGRADE_DOWNLOAD_ERROR" desc="Status label: Update check download error(WootzAppOS/ChromeOS)">
Couldn't download the update. Please try again later.
</message>
<message name="IDS_SETTINGS_UPGRADE_ADMINISTRATOR_ERROR" desc="Status label: Update blocked by policy (ChromiumOS/ChromeOS)">
<message name="IDS_SETTINGS_UPGRADE_ADMINISTRATOR_ERROR" desc="Status label: Update blocked by policy (WootzAppOS/ChromeOS)">
Updates are blocked by your administrator
</message>
<message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (ChromiumOS/ChromeOS)">
<message name="IDS_SETTINGS_UPGRADE_UP_TO_DATE" desc="Status label: Already up to date (WootzAppOS/ChromeOS)">
Your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> is up to date
</message>
<message name="IDS_SETTINGS_UPGRADE_NOT_UP_TO_DATE" desc="Status label: Not up to date (ChromiumOS/ChromeOS)">
<message name="IDS_SETTINGS_UPGRADE_NOT_UP_TO_DATE" desc="Status label: Not up to date (WootzAppOS/ChromeOS)">
Your device is not up to date
</message>
<message name="IDS_SETTINGS_ABOUT_PAGE_DEFERRED_UPDATE_DESCRIPTION" desc="Text of the deferred update description.">
Expand Down
14 changes: 7 additions & 7 deletions src/chrome/app/password_manager_ui_strings.grdp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -757,11 +757,11 @@
</message>
</then>
<else>
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE" desc="Title for not branded Relaunch Chromium promo card.">
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE" desc="Title for not branded Relaunch WootzApp promo card.">
Password Manager needs access to MacOS Keychain
</message>
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION" desc="Description for not branded Relaunch ChrChromiumome promo card.">
To use Password Manager with macOS Keychain, relaunch Chromium and allow Keychain access. Your tabs will reopen after relaunching.
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION" desc="Description for not branded Relaunch ChrWootzAppome promo card.">
To use Password Manager with macOS Keychain, relaunch WootzApp and allow Keychain access. Your tabs will reopen after relaunching.
</message>
</else>
</if>
Expand All @@ -777,11 +777,11 @@
</message>
</then>
<else>
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE_LINUX" desc="Title for the Relaunch Chromium promo card.">
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_TITLE_LINUX" desc="Title for the Relaunch WootzApp promo card.">
Password Manager needs more access
</message>
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION_LINUX" desc="Description for the Relaunch Chromium promo card.">
To use Password Manager with your operating system, relaunch Chromium and allow access to your computer's password manager. Your tabs will reopen after relaunching.
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_DESCRIPTION_LINUX" desc="Description for the Relaunch WootzApp promo card.">
To use Password Manager with your operating system, relaunch WootzApp and allow access to your computer's password manager. Your tabs will reopen after relaunching.
</message>
</else>
</if>
Expand All @@ -795,7 +795,7 @@
</then>
<else>
<message name="IDS_PASSWORD_MANAGER_UI_RELAUNCH_CHROME_PROMO_CARD_ACTION" desc="Action button for not branded Relaunch Chrome promo card.">
Relaunch Chromium
Relaunch WootzApp
</message>
</else>
</if>
Expand Down
Loading

0 comments on commit 9843a46

Please sign in to comment.