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

Side by Side Diff: chrome/app/chromeos_strings.grdp

Issue 1892873002: Add CheckAndroidManagement to ARC sign-in flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@check_android_management
Patch Set: Rebased. Created 4 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_auth_service.h » ('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 <!-- ChromeOS-specific strings (included from generated_resources.grd). 2 <!-- ChromeOS-specific strings (included from generated_resources.grd).
3 Everything in this file is wrapped in <if expr="chromeos">. --> 3 Everything in this file is wrapped in <if expr="chromeos">. -->
4 <grit-part> 4 <grit-part>
5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required."> 5 <message name="IDS_EMPTY_STRING" desc="Empty string, exist only to make code g eneric. No translation required.">
6 </message> 6 </message>
7 <!-- Idle logout dialog for retail mode --> 7 <!-- Idle logout dialog for retail mode -->
8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only."> 8 <message name="IDS_IDLE_LOGOUT_TITLE" desc="Dialog title for the idle logout d ialog. Used in retail mode only.">
9 Are you still there? 9 Are you still there?
10 </message> 10 </message>
(...skipping 6565 matching lines...) Expand 10 before | Expand all | Expand 10 after
6576 </message> 6576 </message>
6577 <message name="IDS_ARC_SIGN_IN_CLOUD_PROVISION_FLOW_FAIL_ERROR" desc="Android sign-in error because of cloud provision flow failed"> 6577 <message name="IDS_ARC_SIGN_IN_CLOUD_PROVISION_FLOW_FAIL_ERROR" desc="Android sign-in error because of cloud provision flow failed">
6578 Cloud provision flow failed 6578 Cloud provision flow failed
6579 </message> 6579 </message>
6580 <message name="IDS_ARC_SIGN_IN_UNKNOWN_ERROR" desc="Android sign-in error beca use of unknown error"> 6580 <message name="IDS_ARC_SIGN_IN_UNKNOWN_ERROR" desc="Android sign-in error beca use of unknown error">
6581 Unknown error 6581 Unknown error
6582 </message> 6582 </message>
6583 <message name="IDS_ARC_SERVER_COMMUNICATION_ERROR" desc="Android sign-in error because of server communication error"> 6583 <message name="IDS_ARC_SERVER_COMMUNICATION_ERROR" desc="Android sign-in error because of server communication error">
6584 Server communication error 6584 Server communication error
6585 </message> 6585 </message>
6586 <message name="IDS_ARC_ANDROID_MANAGEMENT_REQUIRED_ERROR" desc="Error message shown when Android management is required for an unmanaged Chrome OS user.">
6587 Access to Android apps is disabled for the current user.
6588 </message>
6586 <message name="IDS_FLAGS_ENABLE_IME_MENU_NAME" desc="Name of the about: flag f or enabling opt-in IME menu."> 6589 <message name="IDS_FLAGS_ENABLE_IME_MENU_NAME" desc="Name of the about: flag f or enabling opt-in IME menu.">
6587 Enable opt-in IME menu 6590 Enable opt-in IME menu
6588 </message> 6591 </message>
6589 <message name="IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION" desc="Description of the about: flag for enabling opt-in IME menu."> 6592 <message name="IDS_FLAGS_ENABLE_IME_MENU_DESCRIPTION" desc="Description of the about: flag for enabling opt-in IME menu.">
6590 Enable access to the new IME menu in the Language Settings page. 6593 Enable access to the new IME menu in the Language Settings page.
6591 </message> 6594 </message>
6592 </grit-part> 6595 </grit-part>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_auth_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698