diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 17:33:49 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 17:33:49 +0000 |
| commit | b24033e5ef9bddc6592a4ce643897f257cbae8f2 (patch) | |
| tree | 67fbc4ccdafb8fbb14be0052a319ef774e51c08c /components/policy_strings.grdp | |
| parent | ee5b6312b756d3dc718596d7a160b0c992eea640 (diff) | |
| download | chromium_src-b24033e5ef9bddc6592a4ce643897f257cbae8f2.zip chromium_src-b24033e5ef9bddc6592a4ce643897f257cbae8f2.tar.gz chromium_src-b24033e5ef9bddc6592a4ce643897f257cbae8f2.tar.bz2 | |
Include more pak resource files when running tests on Android.
BUG=357771
Review URL: https://codereview.chromium.org/217523002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy_strings.grdp')
| -rw-r--r-- | components/policy_strings.grdp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index bca17e8..5b1896a 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -49,6 +49,9 @@ <message name="IDS_POLICY_DM_STATUS_UNKNOWN_ERROR" desc="Message indicating an unknown error from the enterprise server."> Unknown error </message> + <message name="IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH" desc="Message indicating this client cannot be registered with the specified domain."> + Domain mismatch + </message> <message name="IDS_POLICY_VALIDATION_OK" desc="Message indicating successful policy validation."> Validation successful @@ -308,13 +311,4 @@ Managed bookmarks </message> </if> - - <!-- TODO(mnissler): Move this message up to the other IDS_POLICY_DM_STATUS - messages in the file. It's here because there's a problem with the - Android build failing component_unittests due to string constant - mismatches between the code and the resources. --> - <message name="IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH" desc="Message indicating this client cannot be registered with the specified domain."> - Domain mismatch - </message> - </grit-part> |