components/policy_strings.grdp - Issue 214963002: Add error message for domain mismatch on re-enrollment.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/policy_strings.grdp

Issue 214963002: Add error message for domain mismatch on re-enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move message declaration in policy_strings.grdp to work around an Android build issue. 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

OLD	NEW
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 291 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
302	302

303 <if expr="is_android or is_ios">	303 <if expr="is_android or is_ios">

304 <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">

305 <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks	305 <ph name="DOMAIN">$1<ex>google.com</ex></ph> bookmarks

306 </message>	306 </message>

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. ">	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. ">

308 Managed bookmarks	308 Managed bookmarks

309 </message>	309 </message>

310 </if>	310 </if>

311	311

	312 <!-- TODO(mnissler): Move this message up to the other IDS_POLICY_DM_STATUS

	313 messages in the file. It's here because there's a problem with the

	314 Android build failing component_unittests due to string constant

	315 mismatches between the code and the resources. -->

	316 <message name="IDS_POLICY_DM_STATUS_SERVICE_DOMAIN_MISMATCH" desc="Message ind icating this client cannot be registered with the specified domain.">

	317 Domain mismatch

	318 </message>

	319

312 </grit-part>	320 </grit-part>

OLD	NEW

« 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 »