diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 03:09:05 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 03:09:05 +0000 |
| commit | 36a26ed0faf7fb24d1991136cb5d6969f8042055 (patch) | |
| tree | f8651c491b8a25bc7bd5b56f85f099c3b3f651dd /chrome/app | |
| parent | 6502d03df070469ccc6f634f4c72d4ceda9a3bb3 (diff) | |
| download | chromium_src-36a26ed0faf7fb24d1991136cb5d6969f8042055.zip chromium_src-36a26ed0faf7fb24d1991136cb5d6969f8042055.tar.gz chromium_src-36a26ed0faf7fb24d1991136cb5d6969f8042055.tar.bz2 | |
Add a simple resource loader to Chrome Frame that is capable of finding, loading and extracting resources from the Chrome locale DLLs.
Add the Chrome Frame resource strings to the Chrome .grds so they get built directly into the Chrome locale dlls.
There is one remaining todo here, which is to load the dialog template into a grd + rc somewhere (probably in generated_resources.grd) and then get CF to load dialog templates from a different module. Will do that in another patch.
BUG=24305
TEST=Chrome Frame when loaded on machines whose locales are not US English will display strings appropriate to those locales.
Review URL: http://codereview.chromium.org/1240001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 12 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index f887489..e50b1ef 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -142,6 +142,18 @@ be available for now. --> <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name"> Chromium Frame </message> + <message name="IDS_VERSIONMISMATCH_HEADER"> + Chromium Frame Update. + </message> + <message name="IDS_VERSIONMISMATCH"> + Chromium Frame has been updated. Please restart your browser. Chrome version: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chromium Frame version: <ph name="TODO_0002">%ls<ex>TODO</ex></ph> + </message> + <message name="IDS_VERSIONUNKNOWN"> + Unknown version. + </message> + <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label"> + About Chromium Frame... + </message> </if> <message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate"> In this case, the address listed in the certificate does not match the address of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenting a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though that certificate is not valid for all of those websites. Chromium can say for sure that you reached <strong><ph name="DOMAIN2">$1<ex>paypal.com</ex></ph></strong>, but cannot verify that that is the same site as <strong><ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph></strong> which you intended to reach. If you proceed, Chromium will not check for any further name mismatches. In general, it is best not to proceed past this point. diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 5711cb9..7a61c75 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -192,6 +192,18 @@ Chrome supports. --> <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name"> Google Chrome Frame </message> + <message name="IDS_VERSIONMISMATCH_HEADER"> + Chrome Frame Update. + </message> + <message name="IDS_VERSIONMISMATCH"> + Chrome Frame has been updated. Please restart your browser. Chrome version: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chrome Frame version: <ph name="TODO_0002">%ls<ex>TODO</ex></ph> + </message> + <message name="IDS_VERSIONUNKNOWN"> + Unknown version. + </message> + <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label"> + About Chrome Frame... + </message> </if> <message name="IDS_CERT_ERROR_COMMON_NAME_INVALID_EXTRA_INFO_2" desc="2nd paragraph of extra information for an unsafe common name in an X509 certificate"> In this case, the address listed in the certificate does not match the address of the website your browser tried to go to. One possible reason for this is that your communications are being intercepted by an attacker who is presenting a certificate for a different website, which would cause a mismatch. Another possible reason is that the server is set up to return the same certificate for multiple websites, including the one you are attempting to visit, even though that certificate is not valid for all of those websites. Google Chrome can say for sure that you reached <strong><ph name="DOMAIN2">$1<ex>paypal.com</ex></ph></strong>, but cannot verify that that is the same site as <strong><ph name="DOMAIN">$2<ex>www.paypal.com</ex></ph></strong> which you intended to reach. If you proceed, Chrome will not check for any further name mismatches. In general, it is best not to proceed past this point. |