| Index: chrome/app/google_chrome_strings.grd
|
| diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
|
| index 934310bffc9e2eece0e29a6cc31a3b504a84e090..3142ad5f2f603d21cc48f3cc8443d072abc07549 100644
|
| --- a/chrome/app/google_chrome_strings.grd
|
| +++ b/chrome/app/google_chrome_strings.grd
|
| @@ -395,12 +395,12 @@ Google Chrome is unable to recover your settings.
|
| <message name="IDS_CRASH_RECOVERY_CONTENT" desc="Text content telling the user the browser has crashed.">
|
| Whoa! Google Chrome has crashed. Relaunch now?
|
| </message>
|
| - <if expr="not pp_ifdef('android')">
|
| + <if expr="not is_android">
|
| <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Info bar message to save a password">
|
| Do you want Google Chrome to save your password?
|
| </message>
|
| </if>
|
| - <if expr="pp_ifdef('android')">
|
| + <if expr="is_android">
|
| <message name="IDS_PASSWORD_MANAGER_SAVE_PASSWORD_PROMPT" desc="Mobile: Info bar message to save a password">
|
| Do you want Google Chrome to save your password for this site?
|
| </message>
|
| @@ -613,14 +613,14 @@ Google Chrome is unable to recover your settings.
|
| </message>
|
|
|
| <!-- about:memory -->
|
| - <if expr="not pp_ifdef('android')">
|
| + <if expr="not is_android">
|
| <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browser summary table in the about memory page, which shows memory usage for Google Chrome and any other active browsers." translateable="false">
|
| Summary of memory used by currently active browsers. For browsers which use multiple processes, memory reflects aggregate memory used across all browser processes.
|
|
|
| For Google Chrome, processes used to display diagnostics information (such as this "about:memory") are excluded.
|
| </message>
|
| </if>
|
| - <if expr="pp_ifdef('android')">
|
| + <if expr="is_android">
|
| <message name="IDS_MEMORY_USAGE_SUMMARY_DESC" desc="Describes the browser summary table in the about memory page, which shows memory usage for Google Chrome." translateable="false">
|
| Summary of memory used by Google Chrome. Since Google Chrome uses multiple processes, memory reflects aggregate memory used across all browser processes.
|
|
|
| @@ -821,11 +821,11 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth
|
| and deselect any proxies that have been selected.
|
| </message>
|
| </if>
|
| - <if expr="pp_ifdef('android') or pp_ifdef('ios')">
|
| + <if expr="is_android or pp_ifdef('ios')">
|
| <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Instructions for disabling use of a proxy server (leave empty for Android and iOS).">
|
| </message>
|
| </if>
|
| - <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not pp_ifdef('android') and not pp_ifdef('ios')">
|
| + <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx and not is_android and not pp_ifdef('ios')">
|
| <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
|
| Go to
|
| the Chrome menu >
|
|
|