Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: components/policy_strings.grdp

Issue 216923002: Revert "Add error message for domain mismatch on re-enrollment." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « components/policy/core/common/cloud/enterprise_metrics.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <grit-part> 2 <grit-part>
3 3
4 <message name="IDS_POLICY_DM_STATUS_SUCCESS" desc="Message indicating a succes sful device management server call."> 4 <message name="IDS_POLICY_DM_STATUS_SUCCESS" desc="Message indicating a succes sful device management server call.">
5 Request succeeded 5 Request succeeded
6 </message> 6 </message>
7 <message name="IDS_POLICY_DM_STATUS_REQUEST_INVALID" desc="Message indicating a bad request to the enterprise server."> 7 <message name="IDS_POLICY_DM_STATUS_REQUEST_INVALID" desc="Message indicating a bad request to the enterprise server.">
8 Invalid request or request parameters 8 Invalid request or request parameters
9 </message> 9 </message>
10 <message name="IDS_POLICY_DM_STATUS_REQUEST_FAILED" desc="Message indicating t he request to the enterprise server failed in the network."> 10 <message name="IDS_POLICY_DM_STATUS_REQUEST_FAILED" desc="Message indicating t he request to the enterprise server failed in the network.">
(...skipping 25 matching lines...) Expand all
36 </message> 36 </message>
37 <message name="IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT" desc="Message indicating the chosen device identifier is already used."> 37 <message name="IDS_POLICY_DM_STATUS_SERVICE_DEVICE_ID_CONFLICT" desc="Message indicating the chosen device identifier is already used.">
38 Conflicting device identifier 38 Conflicting device identifier
39 </message> 39 </message>
40 <message name="IDS_POLICY_DM_STATUS_SERVICE_MISSING_LICENSES" desc="Message in dicating the enterprise server doesn't have enough licenses to allow management. "> 40 <message name="IDS_POLICY_DM_STATUS_SERVICE_MISSING_LICENSES" desc="Message in dicating the enterprise server doesn't have enough licenses to allow management. ">
41 Licenses exhausted 41 Licenses exhausted
42 </message> 42 </message>
43 <message name="IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED" desc="Message indic ating the administrator has deprovisioned this client on the server."> 43 <message name="IDS_POLICY_DM_STATUS_SERVICE_DEPROVISIONED" desc="Message indic ating the administrator has deprovisioned this client on the server.">
44 Deprovisioned 44 Deprovisioned
45 </message> 45 </message>
46 <message name="IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH" desc="Message ind icating this client cannot be registered with the specified domain.">
47 Domain mismatch
48 </message>
49 <message name="IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND" desc="Message in dicating that the enterprise server failed to find the policy to be applied to t he device."> 46 <message name="IDS_POLICY_DM_STATUS_SERVICE_POLICY_NOT_FOUND" desc="Message in dicating that the enterprise server failed to find the policy to be applied to t he device.">
50 Policy not found 47 Policy not found
51 </message> 48 </message>
52 <message name="IDS_POLICY_DM_STATUS_UNKNOWN_ERROR" desc="Message indicating an unknown error from the enterprise server."> 49 <message name="IDS_POLICY_DM_STATUS_UNKNOWN_ERROR" desc="Message indicating an unknown error from the enterprise server.">
53 Unknown error 50 Unknown error
54 </message> 51 </message>
55 52
56 <message name="IDS_POLICY_VALIDATION_OK" desc="Message indicating successful p olicy validation."> 53 <message name="IDS_POLICY_VALIDATION_OK" desc="Message indicating successful p olicy validation.">
57 Validation successful 54 Validation successful
58 </message> 55 </message>
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 <if expr="is_android or is_ios"> 303 <if expr="is_android or is_ios">
307 <message name="IDS_POLICY_MANAGED_BOOKMARKS" desc="Mobile: name of the manag ed bookmarks folder"> 304 <message name="IDS_POLICY_MANAGED_BOOKMARKS" desc="Mobile: name of the manag ed bookmarks folder">
308 <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks 305 <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks
309 </message> 306 </message>
310 <message name="IDS_POLICY_MANAGED_BOOKMARKS_DEFAULT_NAME" desc="Mobile: name of the managed bookmarks folder when the management domain can't be determined. "> 307 <message name="IDS_POLICY_MANAGED_BOOKMARKS_DEFAULT_NAME" desc="Mobile: name of the managed bookmarks folder when the management domain can't be determined. ">
311 Managed bookmarks 308 Managed bookmarks
312 </message> 309 </message>
313 </if> 310 </if>
314 311
315 </grit-part> 312 </grit-part>
OLDNEW
« no previous file with comments | « components/policy/core/common/cloud/enterprise_metrics.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698