Index: chrome/app/google_chrome_strings.grd |
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd |
index ec2818515ff3edeb57437f9eb141d683beb2ea22..d4ca188f6c3d12ce376858fcfa2753b1a6d7f04b 100644 |
--- a/chrome/app/google_chrome_strings.grd |
+++ b/chrome/app/google_chrome_strings.grd |
@@ -46,11 +46,11 @@ Chrome supports. --> |
<output filename="google_chrome_strings_nb.pak" type="data_package" lang="no" /> |
<!-- 'no' for Norwegian Bokmål. It should be 'nb'. --> |
<output filename="google_chrome_strings_pl.pak" type="data_package" lang="pl" /> |
- <if expr="pp_ifdef('ios')"> |
+ <if expr="is_ios"> |
<!-- iOS uses pt for pt-BR --> |
<output filename="google_chrome_strings_pt.pak" type="data_package" lang="pt-BR" /> |
</if> |
- <if expr="not pp_ifdef('ios')"> |
+ <if expr="not is_ios"> |
<output filename="google_chrome_strings_pt-BR.pak" type="data_package" lang="pt-BR" /> |
</if> |
<output filename="google_chrome_strings_pt-PT.pak" type="data_package" lang="pt-PT" /> |
@@ -213,13 +213,13 @@ Chrome supports. --> |
<message name="IDS_CERT_ERROR_NOT_YET_VALID_DETAILS" desc="Details for an X509 certificate that is not yet valid"> |
You attempted to reach <strong><ph name="DOMAIN">$1<ex>paypal.com</ex></ph></strong>, but the server presented a certificate that is not yet valid. No information is available to indicate whether that certificate can be trusted. Google Chrome cannot reliably guarantee that you are communicating with <strong><ph name="DOMAIN2">$2<ex>paypal.com</ex></ph></strong> and not an attacker. Your computer's clock is currently set to <ph name="CURRENT_TIME">$3<ex>Monday, July 18th, 2012 12:31PM</ex></ph>. Does that look right? If not, you should correct your system's clock and then refresh this page. |
</message> |
- <if expr="pp_ifdef('ios')"> |
+ <if expr="is_ios"> |
<message name="IDS_CERT_ERROR_AUTHORITY_INVALID_DETAILS" desc="Details for an X509 certificate with an invalid authority"> |
You attempted to reach <strong><ph |
name="DOMAIN">$1<ex>paypal.com</ex></ph></strong>, but the server presented a certificate issued by an entity that is not trusted by Google Chrome. This may mean that the server has generated its own security credentials, which Chrome cannot rely on for identity information, or an attacker may be trying to intercept your communications. |
</message> |
</if> |
- <if expr="not pp_ifdef('ios')"> |
+ <if expr="not is_ios"> |
<message name="IDS_CERT_ERROR_AUTHORITY_INVALID_DETAILS" desc="Details for an X509 certificate with an invalid authority"> |
You attempted to reach <strong><ph name="DOMAIN">$1<ex>paypal.com</ex></ph></strong>, but the server presented a certificate issued by an entity that is not trusted by your computer's operating system. This may mean that the server has generated its own security credentials, which Chrome cannot rely on for identity information, or an attacker may be trying to intercept your communications. |
</message> |
@@ -316,13 +316,13 @@ name="DOMAIN">$1<ex>paypal.com</ex></ph></strong>, but the server presente |
Get Started with Chrome OS |
</message> |
</if> |
- <if expr="pp_ifdef('ios')"> |
+ <if expr="is_ios"> |
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE" |
desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show. [Length: 14em]"> |
Welcome |
</message> |
</if> |
- <if expr="not pp_ifdef('chromeos') and not pp_ifdef('ios')"> |
+ <if expr="not pp_ifdef('chromeos') and not is_ios"> |
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE" |
desc="Title for the hard-coded thumbnail that represents the Google Chrome OS Welcome page. This is used on the NTP when there aren't enough thumbnails to show."> |
Welcome to Google Chrome |
@@ -595,7 +595,7 @@ Google Chrome is unable to recover your settings. |
</message> |
<!-- "Create application shortcuts" dialog --> |
- <if expr="is_posix and not is_macosx"> |
+ <if expr="is_posix and not is_macosx and not is_ios"> |
<message name="IDS_CREATE_SHORTCUTS_ERROR_LABEL" desc="Contents of the main label in the error dialog box when creating an application shortcut failed for unknown reasons."> |
Google Chrome could not create an application shortcut. |
</message> |
@@ -690,7 +690,7 @@ For Google Chrome, processes used to display diagnostics information (such as th |
</if> |
<!-- iOS Upgrade available info bar--> |
- <if expr="pp_ifdef('ios')"> |
+ <if expr="is_ios"> |
<message name="IDS_UPGRADE_AVAILABLE" desc="Text to inform the user of the presence of a new version of the application"> |
Chrome just got better! A new version is available. |
</message> |
@@ -862,18 +862,18 @@ Signing in anyway will merge Chrome information like bookmarks, history, and oth |
Allow Chrome to access the network in your firewall or antivirus |
settings. |
</message> |
- <if expr="is_macosx and not pp_ifdef('ios')"> |
+ <if expr="is_macosx"> |
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Mac OSX instructions for disabling use of a proxy server."> |
Go to |
Applications > System Preferences > Network > Advanced > Proxies |
and deselect any proxies that have been selected. |
</message> |
</if> |
- <if expr="is_android or pp_ifdef('ios')"> |
+ <if expr="is_android or is_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 is_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 is_ios"> |
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> |
Go to |
the Chrome menu > |