Skip to content

GitLab

T
tangled
Commit e72f82db authored by Rainhard Findling's avatar Rainhard Findling Committed by Commit Bot
Browse files
Options

Remove |IDS_SHORT_PRODUCT_NAME| from password check strings 

* Removes |IDS_SHORT_PRODUCT_NAME| from the strings, and moves the
  strings into the Chrome and Chromium string files.
* This is done for translation reasons, see
  chrome/app/PRESUBMIT.py for details.

Bug: 1067175
Change-Id: I963a94a6684f2a2dbdba76c4d790da6c1eb06a8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2141104
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Reviewed-by: default avatarGreg Thompson <grt@chromium.org>
Reviewed-by: default avatarAndrey Zaytsev <andzaytsev@google.com>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758211}
parent 1d77714f
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 59 deletions
chrome/app/settings_chromium_strings.grdp
View file @ e72f82db
...@@ -43,6 +43,27 @@ ...@@ -43,6 +43,27 @@
<message name="IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED" desc="Label that will be used to show that a credit card comes from Google Pay and is saved locally. This should follow the casing of the 'Google Pay' and 'Chrome' brands. 'Copied to Chromium' is short for 'The credit card is copied to Chromium'. 'Google Pay' should not be translated as it is the product name."> <message name="IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED" desc="Label that will be used to show that a credit card comes from Google Pay and is saved locally. This should follow the casing of the 'Google Pay' and 'Chrome' brands. 'Copied to Chromium' is short for 'The credit card is copied to Chromium'. 'Google Pay' should not be translated as it is the product name.">
Google Pay (copied to Chromium) Google Pay (copied to Chromium)
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE" desc="Error message when the password check can't be completed because the user is offline.">
Chromium 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.">
Chromium can check your passwords when you sign in with your Google Account
</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. Chromium 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 Google account.">
Chromium 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 Google Account<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.">
Chromium can't check your passwords. Try again after 24 hours.
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC" desc="Error message when the password check can't be completed for an unspecified reason.">
Chromium can't check your passwords. Try again later.
</message>
<message name="IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL" desc="Label which is shown when there were no compromised passwords detected.">
Chromium will notify you when you sign in with a compromised password
</message>
<!-- Default Browser Page --> <!-- Default Browser Page -->
<if expr="not chromeos"> <if expr="not chromeos">
......
chrome/app/settings_google_chrome_strings.grdp
View file @ e72f82db
...@@ -43,6 +43,27 @@ ...@@ -43,6 +43,27 @@
<message name="IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED" desc="Label that will be used to show that a credit card comes from Google Pay and is saved locally. This should follow the casing of the 'Google Pay' and 'Chrome' brands. 'Copied to Chrome' is short for 'The credit card is copied to Chrome'. 'Google Pay' should not be translated as it is the product name."> <message name="IDS_SETTINGS_GOOGLE_PAYMENTS_CACHED" desc="Label that will be used to show that a credit card comes from Google Pay and is saved locally. This should follow the casing of the 'Google Pay' and 'Chrome' brands. 'Copied to Chrome' is short for 'The credit card is copied to Chrome'. 'Google Pay' should not be translated as it is the product name.">
Google Pay (copied to Chrome) Google Pay (copied to Chrome)
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE" desc="Error message when the password check can't be completed because the user is offline.">
Chrome 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.">
Chrome can check your passwords when you sign in with your Google Account
</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. Chrome 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 Google account.">
Chrome 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 Google Account<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.">
Chrome can't check your passwords. Try again after 24 hours.
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC" desc="Error message when the password check can't be completed for an unspecified reason.">
Chrome can't check your passwords. Try again later.
</message>
<message name="IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL" desc="Label which is shown when there were no compromised passwords detected.">
Chrome will notify you when you sign in with a compromised password
</message>
<!-- Default Browser Page --> <!-- Default Browser Page -->
<if expr="not chromeos"> <if expr="not chromeos">
......
chrome/app/settings_google_chrome_strings_grdp/IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC.png.sha1 0 → 100644
View file @ e72f82db
c9510ef8ee4d1eecf4a4f7b73bc3157636ee7071
\ No newline at end of file
chrome/app/settings_google_chrome_strings_grdp/IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE.png.sha1 0 → 100644
View file @ e72f82db
014f118ca023ad004523e7860746aae0a96f981d
\ No newline at end of file
chrome/app/settings_strings.grdp
View file @ e72f82db
...@@ -301,24 +301,6 @@ ...@@ -301,24 +301,6 @@
<message name="IDS_SETTINGS_CHECK_PASSWORDS_DESCRIPTION" desc="Explanation of the passwords bulk check feature found within the password settings."> <message name="IDS_SETTINGS_CHECK_PASSWORDS_DESCRIPTION" desc="Explanation of the passwords bulk check feature found within the password settings.">
Keep your passwords safe from data breaches and other security issues Keep your passwords safe from data breaches and other security issues
</message> </message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE" desc="Error message when the password check can't be completed because the user is offline.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> 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.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can check your passwords when you sign in with your Google Account
</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. <ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> 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 Google account.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again after 24 hours or <ph name="BEGIN_LINK">&lt;a href="$2" target="_blank"&gt;</ph>check passwords in your Google Account<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.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again after 24 hours.
</message>
<message name="IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC" desc="Error message when the password check can't be completed for an unspecified reason.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> can't check your passwords. Try again later.
</message>
<message name="IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT" desc="Number of compromised passwords present in the database"> <message name="IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT" desc="Number of compromised passwords present in the database">
{COUNT, plural, {COUNT, plural,
=0 {No compromised passwords found} =0 {No compromised passwords found}
...@@ -361,9 +343,6 @@ ...@@ -361,9 +343,6 @@
<message name="IDS_SETTINGS_COMPROMISED_PASSWORD_REASON_PHISHED_AND_LEAKED" desc="Password compromise reason shown when a password was reused on a phishing site and found in a data breach."> <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_REASON_PHISHED_AND_LEAKED" desc="Password compromise reason shown when a password was reused on a phishing site and found in a data breach.">
Entered on deceptive site and found in data breach Entered on deceptive site and found in data breach
</message> </message>
<message name="IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL" desc="Label which is shown when there were no compromised passwords detected.">
<ph name="IDS_SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph> will notify you when you sign in with a compromised password
</message>
<message name="IDS_SETTINGS_COMPROMISED_PASSWORD_SHOW" desc="Action menu item for a row which displays a compromised password. The password value, which is initialy obfuscated, will be show in plain text."> <message name="IDS_SETTINGS_COMPROMISED_PASSWORD_SHOW" desc="Action menu item for a row which displays a compromised password. The password value, which is initialy obfuscated, will be show in plain text.">
Show password Show password
</message> </message>
......
chrome/browser/ui/webui/settings/safety_check_handler.cc
View file @ e72f82db
...@@ -368,8 +368,6 @@ base::string16 SafetyCheckHandler::GetStringForPasswords( ...@@ -368,8 +368,6 @@ base::string16 SafetyCheckHandler::GetStringForPasswords(
Compromised compromised, Compromised compromised,
Done done, Done done,
Total total) { Total total) {
const base::string16 short_product_name =
l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
switch (status) { switch (status) {
case PasswordsStatus::kChecking: { case PasswordsStatus::kChecking: {
// Unable to get progress for some reason. // Unable to get progress for some reason.
...@@ -387,20 +385,20 @@ base::string16 SafetyCheckHandler::GetStringForPasswords( ...@@ -387,20 +385,20 @@ base::string16 SafetyCheckHandler::GetStringForPasswords(
return l10n_util::GetPluralStringFUTF16( return l10n_util::GetPluralStringFUTF16(
IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT, compromised.value()); IDS_SETTINGS_COMPROMISED_PASSWORDS_COUNT, compromised.value());
case PasswordsStatus::kOffline: case PasswordsStatus::kOffline:
return l10n_util::GetStringFUTF16( return l10n_util::GetStringUTF16(
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE, short_product_name); IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE);
case PasswordsStatus::kNoPasswords: case PasswordsStatus::kNoPasswords:
return l10n_util::GetStringFUTF16( return l10n_util::GetStringUTF16(
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS, short_product_name); IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS);
case PasswordsStatus::kSignedOut: case PasswordsStatus::kSignedOut:
return l10n_util::GetStringUTF16( return l10n_util::GetStringUTF16(
IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_SIGNED_OUT); IDS_SETTINGS_SAFETY_CHECK_PASSWORDS_SIGNED_OUT);
case PasswordsStatus::kQuotaLimit: case PasswordsStatus::kQuotaLimit:
return l10n_util::GetStringFUTF16( return l10n_util::GetStringUTF16(
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT, short_product_name); IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT);
case PasswordsStatus::kError: case PasswordsStatus::kError:
return l10n_util::GetStringFUTF16( return l10n_util::GetStringUTF16(
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC, short_product_name); IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC);
} }
} }
......
chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
View file @ e72f82db
...@@ -735,6 +735,18 @@ void AddAutofillStrings(content::WebUIDataSource* html_source, ...@@ -735,6 +735,18 @@ void AddAutofillStrings(content::WebUIDataSource* html_source,
{"checkPasswordsCanceled", IDS_SETTINGS_CHECK_PASSWORDS_CANCELED}, {"checkPasswordsCanceled", IDS_SETTINGS_CHECK_PASSWORDS_CANCELED},
{"checkedPasswords", IDS_SETTINGS_CHECKED_PASSWORDS}, {"checkedPasswords", IDS_SETTINGS_CHECKED_PASSWORDS},
{"checkPasswordsDescription", IDS_SETTINGS_CHECK_PASSWORDS_DESCRIPTION}, {"checkPasswordsDescription", IDS_SETTINGS_CHECK_PASSWORDS_DESCRIPTION},
{"checkPasswordsErrorOffline",
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE},
{"checkPasswordsErrorSignedOut",
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT},
{"checkPasswordsErrorNoPasswords",
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS},
{"checkPasswordsErrorQuota",
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT},
{"checkPasswordsErrorGeneric",
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC},
{"noCompromisedCredentials",
IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL},
{"checkPasswordsAgain", IDS_SETTINGS_CHECK_PASSWORDS_AGAIN}, {"checkPasswordsAgain", IDS_SETTINGS_CHECK_PASSWORDS_AGAIN},
{"checkPasswordsAgainAfterError", {"checkPasswordsAgainAfterError",
IDS_SETTINGS_CHECK_PASSWORDS_AGAIN_AFTER_ERROR}, IDS_SETTINGS_CHECK_PASSWORDS_AGAIN_AFTER_ERROR},
...@@ -859,33 +871,6 @@ void AddAutofillStrings(content::WebUIDataSource* html_source, ...@@ -859,33 +871,6 @@ void AddAutofillStrings(content::WebUIDataSource* html_source,
{"savedToThisDeviceOnly", {"savedToThisDeviceOnly",
IDS_SETTINGS_PAYMENTS_SAVED_TO_THIS_DEVICE_ONLY}}; IDS_SETTINGS_PAYMENTS_SAVED_TO_THIS_DEVICE_ONLY}};
const base::string16 short_product_name =
l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
html_source->AddString(
"checkPasswordsErrorOffline",
l10n_util::GetStringFUTF16(IDS_SETTINGS_CHECK_PASSWORDS_ERROR_OFFLINE,
short_product_name));
html_source->AddString(
"checkPasswordsErrorSignedOut",
l10n_util::GetStringFUTF16(IDS_SETTINGS_CHECK_PASSWORDS_ERROR_SIGNED_OUT,
short_product_name));
html_source->AddString(
"checkPasswordsErrorNoPasswords",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_NO_PASSWORDS, short_product_name));
html_source->AddString(
"checkPasswordsErrorQuota",
l10n_util::GetStringFUTF16(IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT,
short_product_name));
html_source->AddString(
"checkPasswordsErrorGeneric",
l10n_util::GetStringFUTF16(IDS_SETTINGS_CHECK_PASSWORDS_ERROR_GENERIC,
short_product_name));
html_source->AddString(
"noCompromisedCredentials",
l10n_util::GetStringFUTF16(IDS_SETTINGS_NO_COMPROMISED_CREDENTIALS_LABEL,
short_product_name));
GURL google_password_manager_url = GetGooglePasswordManagerURL( GURL google_password_manager_url = GetGooglePasswordManagerURL(
password_manager::ManagePasswordsReferrer::kChromeSettings); password_manager::ManagePasswordsReferrer::kChromeSettings);
...@@ -898,7 +883,6 @@ void AddAutofillStrings(content::WebUIDataSource* html_source, ...@@ -898,7 +883,6 @@ void AddAutofillStrings(content::WebUIDataSource* html_source,
"checkPasswordsErrorQuotaGoogleAccount", "checkPasswordsErrorQuotaGoogleAccount",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT, IDS_SETTINGS_CHECK_PASSWORDS_ERROR_QUOTA_LIMIT_GOOGLE_ACCOUNT,
short_product_name,
base::UTF8ToUTF16( base::UTF8ToUTF16(
password_manager::GetPasswordCheckupURL( password_manager::GetPasswordCheckupURL(
password_manager::PasswordCheckupReferrer::kPasswordCheck) password_manager::PasswordCheckupReferrer::kPasswordCheck)
......
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