Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(204)

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 1117263002: Switch on-demand update checks to the less-old GoogleUpdate3 API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync to position 329622 Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1e48ab3d1398e2bba97757a2b4c11b1667aee8e2..ee9b481abe8d48ccad7bff1cd002e772f8f375f7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7419,6 +7419,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_ABOUT_BOX_ERROR_UPDATE_CHECK_FAILED" desc="The error message for the specific case when we cannot create the Google Update component">
Update check failed to start (error code <ph name="ERROR">$1<ex>0x80000005</ex></ph>).
</message>
+ <message name="IDS_ABOUT_BOX_GOOGLE_UPDATE_ERROR" desc="An error message from Google Update with details.">
+ <ph name="ERROR">$1<ex>An error message from Google Update.</ex></ph> (error code <ph name="ERROR_CODE">$2<ex>7: 0x80000005</ex></ph>).
+ </message>
</if>
<!-- Omnibox -->
@@ -8501,16 +8504,11 @@ I don't think this site should be blocked!
Update failed (error: <ph name="ERROR_NUMBER">$1<ex>1</ex></ph>)
</message>
</if>
- <if expr="is_win or chromeos">
+ <if expr="chromeos">
<message name="IDS_UPGRADE_DISABLED_BY_POLICY" desc="Status label: Upgrades disabled by policy">
Updates are disabled by the administrator
</message>
</if>
- <if expr="is_win">
- <message name="IDS_UPGRADE_DISABLED_BY_POLICY_MANUAL" desc="Status label: Manual upgrades disabled by policy, automatic upgrades ok">
- Manual updates are disabled by the administrator. Automatic updates are enabled.
- </message>
- </if>
<message name="IDS_REPORT_AN_ISSUE" desc="Text of the button which allows the user to report an issue with Chrome.">
Report an issue
</message>
« no previous file with comments | « no previous file | chrome/browser/google/google_update_win.h » ('j') | chrome/browser/google/google_update_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698