Commit 39e3f859 authored by Rainhard Findling's avatar Rainhard Findling Committed by Commit Bot

Safety check Chrome cleaner: make strings Windows only

Bug: 1087263
Change-Id: I6ca16d0a3037262ea03169bb582f3f67f4c62e22
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505829Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821767}
parent 03287798
...@@ -140,45 +140,6 @@ ...@@ -140,45 +140,6 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_ERROR" desc="This text describes that safety check could not check extensions for an unkown reason."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_ERROR" desc="This text describes that safety check could not check extensions for an unkown reason.">
Chromium can't check your extensions. Try again later. Chromium can't check your extensions. Try again later.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITHOUT_TIMESTAMP" desc="This text describes that Chrome can check if any known harmful software is installed on the user's computer.">
Chromium can check your computer for harmful software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_SECONDS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
Chromium didn't find known harmful software on your computer. Last checked: a moment ago.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_MINUTES" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_MINS, plural,
=1 {Chromium didn't find known harmful software on your computer. Last checked: 1 minute ago.}
other {Chromium didn't find known harmful software on your computer. Last checked: {NUM_MINS} minutes ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_HOURS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_HOURS, plural,
=1 {Chromium didn't find known harmful software on your computer. Last checked: 1 hour ago.}
other {Chromium didn't find known harmful software on your computer. Last checked: {NUM_HOURS} hours ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_YESTERDAY" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
Chromium didn't find known harmful software on your computer. Last checked: yesterday.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_DAYS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_DAYS, plural,
=1 {Chromium didn't find known harmful software on your computer. Last checked: 1 day ago.}
other {Chromium didn't find known harmful software on your computer. Last checked: {NUM_DAYS} days ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_INFECTED" desc="This text describes that Chrome found harmful software on the computer.">
Chromium found harmful software on your computer
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_SCANNING" desc="This text describes that Chrome is currently checking the user's device for unwanted software. This takes a couple of minutes.">
Chromium is checking your computer for harmful software...
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_REMOVING" desc="This text describes that Chrome is currently removing unwanted software frrom the user.s device. This takes a couple of minutes.">
Chromium is removing harmful software from your computer...
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_DISABLED_BY_ADMIN" desc="This text describes that Chrome can't check for unwanted software because an administrator disabled the feature.">
<ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Your administrator<ph name="END_LINK">&lt;/a&gt;</ph> has disabled Chromium's check for harmful software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR" desc="This text describes that Chrome can't check for unwanted software due to an error.">
An error occurred while Chromium was checking your computer for harmful software
</message>
<!-- People Page --> <!-- People Page -->
<message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device."> <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device.">
......
...@@ -141,45 +141,6 @@ ...@@ -141,45 +141,6 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_ERROR" desc="This text describes that safety check could not check extensions for an unkown reason."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_ERROR" desc="This text describes that safety check could not check extensions for an unkown reason.">
Chrome can't check your extensions. Try again later. Chrome can't check your extensions. Try again later.
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITHOUT_TIMESTAMP" desc="This text describes that Chrome can check if any known harmful software is installed on the user's computer.">
Chrome can check your computer for harmful software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_SECONDS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
Chrome didn't find known harmful software on your computer. Last checked: a moment ago.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_MINUTES" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_MINS, plural,
=1 {Chrome didn't find known harmful software on your computer. Last checked: 1 minute ago.}
other {Chrome didn't find known harmful software on your computer. Last checked: {NUM_MINS} minutes ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_HOURS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_HOURS, plural,
=1 {Chrome didn't find known harmful software on your computer. Last checked: 1 hour ago.}
other {Chrome didn't find known harmful software on your computer. Last checked: {NUM_HOURS} hours ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_YESTERDAY" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
Chrome didn't find known harmful software on your computer. Last checked: yesterday.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_DAYS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_DAYS, plural,
=1 {Chrome didn't find known harmful software on your computer. Last checked: 1 day ago.}
other {Chrome didn't find known harmful software on your computer. Last checked: {NUM_DAYS} days ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_INFECTED" desc="This text describes that Chrome found harmful software on the computer.">
Chrome found harmful software on your computer
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_SCANNING" desc="This text describes that Chrome is currently checking the user's device for unwanted software. This takes a couple of minutes.">
Chrome is checking your computer for harmful software...
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_REMOVING" desc="This text describes that Chrome is currently removing unwanted software frrom the user.s device. This takes a couple of minutes.">
Chrome is removing harmful software from your computer...
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_DISABLED_BY_ADMIN" desc="This text describes that Chrome can't check for unwanted software because an administrator disabled the feature.">
<ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Your administrator<ph name="END_LINK">&lt;/a&gt;</ph> has disabled Chrome's check for harmful software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR" desc="This text describes that Chrome can't check for unwanted software due to an error.">
An error occurred while Chrome was checking your computer for harmful software
</message>
<!-- People Page --> <!-- People Page -->
<message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device."> <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device.">
......
...@@ -1292,13 +1292,54 @@ ...@@ -1292,13 +1292,54 @@
<message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON_ARIA_LABEL" desc="Accessibility text for the button that allows users to review their extensions settings."> <message name="IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON_ARIA_LABEL" desc="Accessibility text for the button that allows users to review their extensions settings.">
Review extensions Review extensions
</message> </message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_PRIMARY_LABEL" desc="'Unwanted software protection' is an element in safety check that finds harmful software installed on the computer and allows users to remove it."> <if expr="is_win and _google_chrome">
Device software <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_PRIMARY_LABEL" desc="'Unwanted software protection' is an element in safety check that finds harmful software installed on the computer and allows users to remove it.">
</message> Device software
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_BUTTON_ARIA_LABEL" desc="Accessiblity text for the button that allows users to review and remove harmful software found on their computer."> </message>
Review device software <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_BUTTON_ARIA_LABEL" desc="Accessiblity text for the button that allows users to review and remove harmful software found on their computer.">
</message> Review device software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITHOUT_TIMESTAMP" desc="This text describes that Chrome can check if any known harmful software is installed on the user's computer.">
Chrome can check your computer for harmful software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_SECONDS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
Chrome didn't find known harmful software on your computer. Last checked: a moment ago.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_MINUTES" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_MINS, plural,
=1 {Chrome didn't find known harmful software on your computer. Last checked: 1 minute ago.}
other {Chrome didn't find known harmful software on your computer. Last checked: {NUM_MINS} minutes ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_HOURS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_HOURS, plural,
=1 {Chrome didn't find known harmful software on your computer. Last checked: 1 hour ago.}
other {Chrome didn't find known harmful software on your computer. Last checked: {NUM_HOURS} hours ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_YESTERDAY" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
Chrome didn't find known harmful software on your computer. Last checked: yesterday.
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_NO_UWS_WITH_TIMESTAMP_AFTER_DAYS" desc="This text describes that Chrome did not find any known harmful software installed on the user's computer, and that it checked for harmful softwrae the last time a certain time ago.">
{NUM_DAYS, plural,
=1 {Chrome didn't find known harmful software on your computer. Last checked: 1 day ago.}
other {Chrome didn't find known harmful software on your computer. Last checked: {NUM_DAYS} days ago.}}
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_INFECTED" desc="This text describes that Chrome found harmful software on the computer.">
Chrome found harmful software on your computer
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_SCANNING" desc="This text describes that Chrome is currently checking the user's device for unwanted software. This takes a couple of minutes.">
Chrome is checking your computer for harmful software...
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_REMOVING" desc="This text describes that Chrome is currently removing unwanted software frrom the user.s device. This takes a couple of minutes.">
Chrome is removing harmful software from your computer...
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_DISABLED_BY_ADMIN" desc="This text describes that Chrome can't check for unwanted software because an administrator disabled the feature.">
<ph name="BEGIN_LINK">&lt;a target="_blank" href="$1"&gt;</ph>Your administrator<ph name="END_LINK">&lt;/a&gt;</ph> has disabled Chrome's check for harmful software
</message>
<message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR" desc="This text describes that Chrome can't check for unwanted software due to an error.">
An error occurred while Chrome was checking your computer for harmful software
</message>
</if>
<message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_LABEL" desc="In the advanced options tab, the text next to the checkbox that enables prediction of network actions. Actions include browser-initiated DNS prefetching, TCP and SSL preconnection, and prerendering of webpages."> <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_LABEL" desc="In the advanced options tab, the text next to the checkbox that enables prediction of network actions. Actions include browser-initiated DNS prefetching, TCP and SSL preconnection, and prerendering of webpages.">
Preload pages for faster browsing and searching Preload pages for faster browsing and searching
</message> </message>
......
1f2af97c2f771f0b72c650db480762605b730538
\ No newline at end of file
...@@ -1457,47 +1457,47 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source, ...@@ -1457,47 +1457,47 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
void AddSafetyCheckStrings(content::WebUIDataSource* html_source) { void AddSafetyCheckStrings(content::WebUIDataSource* html_source) {
static constexpr webui::LocalizedString kLocalizedStrings[] = { static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"safetyCheckSectionTitle", IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE}, {"safetyCheckSectionTitle", IDS_SETTINGS_SAFETY_CHECK_SECTION_TITLE},
{"safetyCheckParentPrimaryLabelBefore", {"safetyCheckParentPrimaryLabelBefore",
IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE}, IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_BEFORE},
{"safetyCheckRunning", IDS_SETTINGS_SAFETY_CHECK_RUNNING}, {"safetyCheckRunning", IDS_SETTINGS_SAFETY_CHECK_RUNNING},
{"safetyCheckParentPrimaryLabelAfter", {"safetyCheckParentPrimaryLabelAfter",
IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER}, IDS_SETTINGS_SAFETY_CHECK_PARENT_PRIMARY_LABEL_AFTER},
{"safetyCheckAriaLiveRunning", {"safetyCheckAriaLiveRunning", IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_RUNNING},
IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_RUNNING}, {"safetyCheckAriaLiveAfter", IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_AFTER},
{"safetyCheckAriaLiveAfter", IDS_SETTINGS_SAFETY_CHECK_ARIA_LIVE_AFTER}, {"safetyCheckParentButton", IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON},
{"safetyCheckParentButton", IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON}, {"safetyCheckParentButtonAriaLabel",
{"safetyCheckParentButtonAriaLabel", IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON_ARIA_LABEL},
IDS_SETTINGS_SAFETY_CHECK_PARENT_BUTTON_ARIA_LABEL}, {"safetyCheckParentButtonAriaLabelReload",
{"safetyCheckParentButtonAriaLabelReload", IDS_SETTINGS_CHECK_PASSWORDS_AGAIN},
IDS_SETTINGS_CHECK_PASSWORDS_AGAIN}, {"safetyCheckIconRunningAriaLabel",
{"safetyCheckIconRunningAriaLabel", IDS_SETTINGS_SAFETY_CHECK_ICON_RUNNING_ARIA_LABEL},
IDS_SETTINGS_SAFETY_CHECK_ICON_RUNNING_ARIA_LABEL}, {"safetyCheckIconSafeAriaLabel",
{"safetyCheckIconSafeAriaLabel", IDS_SETTINGS_SAFETY_CHECK_ICON_SAFE_ARIA_LABEL},
IDS_SETTINGS_SAFETY_CHECK_ICON_SAFE_ARIA_LABEL}, {"safetyCheckIconInfoAriaLabel",
{"safetyCheckIconInfoAriaLabel", IDS_SETTINGS_SAFETY_CHECK_ICON_INFO_ARIA_LABEL},
IDS_SETTINGS_SAFETY_CHECK_ICON_INFO_ARIA_LABEL}, {"safetyCheckIconWarningAriaLabel",
{"safetyCheckIconWarningAriaLabel", IDS_SETTINGS_SAFETY_CHECK_ICON_WARNING_ARIA_LABEL},
IDS_SETTINGS_SAFETY_CHECK_ICON_WARNING_ARIA_LABEL}, {"safetyCheckReview", IDS_SETTINGS_SAFETY_CHECK_REVIEW},
{"safetyCheckReview", IDS_SETTINGS_SAFETY_CHECK_REVIEW}, {"safetyCheckUpdatesPrimaryLabel",
{"safetyCheckUpdatesPrimaryLabel", IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL},
IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL}, {"safetyCheckUpdatesButtonAriaLabel", IDS_UPDATE_RECOMMENDED_DIALOG_TITLE},
{"safetyCheckUpdatesButtonAriaLabel", {"safetyCheckPasswordsButtonAriaLabel",
IDS_UPDATE_RECOMMENDED_DIALOG_TITLE}, IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_BUTTON_ARIA_LABEL},
{"safetyCheckPasswordsButtonAriaLabel", {"safetyCheckSafeBrowsingButton",
IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_BUTTON_ARIA_LABEL}, IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON},
{"safetyCheckSafeBrowsingButton", {"safetyCheckSafeBrowsingButtonAriaLabel",
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON}, IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON_ARIA_LABEL},
{"safetyCheckSafeBrowsingButtonAriaLabel", {"safetyCheckExtensionsPrimaryLabel",
IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_BUTTON_ARIA_LABEL}, IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL},
{"safetyCheckExtensionsPrimaryLabel", {"safetyCheckExtensionsButtonAriaLabel",
IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_PRIMARY_LABEL}, IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON_ARIA_LABEL},
{"safetyCheckExtensionsButtonAriaLabel", #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
IDS_SETTINGS_SAFETY_CHECK_EXTENSIONS_BUTTON_ARIA_LABEL}, {"safetyCheckChromeCleanerPrimaryLabel",
{"safetyCheckChromeCleanerPrimaryLabel", IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_PRIMARY_LABEL},
IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_PRIMARY_LABEL}, {"safetyCheckChromeCleanerButtonAriaLabel",
{"safetyCheckChromeCleanerButtonAriaLabel", IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_BUTTON_ARIA_LABEL},
IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_BUTTON_ARIA_LABEL}, #endif // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
}; };
AddLocalizedStringsBulk(html_source, kLocalizedStrings); AddLocalizedStringsBulk(html_source, kLocalizedStrings);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment