Index: chrome/app/generated_resources.grd |
=================================================================== |
--- chrome/app/generated_resources.grd (revision 175222) |
+++ chrome/app/generated_resources.grd (working copy) |
@@ -6117,12 +6117,6 @@ |
<message name="IDS_FLAGS_ENABLE_PNACL_DESCRIPTION" desc="Description of the 'Enable Portable Native Client' lab."> |
Enable support for Portable Native Client. |
</message> |
- <message name="IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_NAME" desc="Name of the 'Enable Native Client SRPC Proxy' lab."> |
- Native Client SRPC Proxy. |
- </message> |
- <message name="IDS_FLAGS_ENABLE_NACL_SRPC_PROXY_DESCRIPTION" desc="Description of the 'Enable Native Client SRPC Proxy' lab."> |
- Use NaCl SRPC, rather than Chrome IPC, to proxy Pepper calls between Chrome and the plugin. |
- </message> |
<message name="IDS_FLAGS_DOWNLOADS_NEW_UI_NAME" desc="Name of the 'New Downloads UI' lab."> |
New Downloads UI |
</message> |
@@ -9317,7 +9311,7 @@ |
<if expr="pp_ifdef('android') or pp_ifdef('ios')"> |
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG" desc="When a webpage fails to load, in some cases we suggest checking the proxy server configuration, or disabling the proxy server."> |
If you use a proxy server, check your proxy settings or contact your |
- network administrator to make sure the proxy server is working. |
+ network administrator to make sure the proxy server is working. |
</message> |
</if> |
<if expr="not pp_ifdef('android') and not pp_ifdef('ios')"> |