ash/ash_chromeos_strings.grdp - Issue 14507003: Add tray warning for Locally managed users.

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: ash/ash_chromeos_strings.grdp

Issue 14507003: Add tray warning for Locally managed users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge w/ToT, fix nits Created 7 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

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <!-- ChromeOS-specific strings (included from ash_strings.grd).	2 <!-- ChromeOS-specific strings (included from ash_strings.grd).

3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->	3 Everything in this file is wrapped in <if expr="pp_ifdef('chromeos')">. -->

4 <grit-part>	4 <grit-part>

5	5

6 <!-- Status Tray Network strings -->	6 <!-- Status Tray Network strings -->

7 <message name="IDS_ASH_STATUS_TRAY_NETWORK" desc="The label used in the networ k dialog header.">	7 <message name="IDS_ASH_STATUS_TRAY_NETWORK" desc="The label used in the networ k dialog header.">

8 Network	8 Network

9 </message>	9 </message>

10 <message name="IDS_ASH_STATUS_TRAY_VPN" desc="The label used in the VPN detail ed view header.">	10 <message name="IDS_ASH_STATUS_TRAY_VPN" desc="The label used in the VPN detail ed view header.">

(...skipping 216 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
227 Failed to authenticate with provided username or password	227 Failed to authenticate with provided username or password

228 </message>	228 </message>

229 <message name="IDS_CHROMEOS_NETWORK_ERROR_UNRECOGNIZED" desc="Network error in about:network: Unrecognized">	229 <message name="IDS_CHROMEOS_NETWORK_ERROR_UNRECOGNIZED" desc="Network error in about:network: Unrecognized">

230 Unrecognized error	230 Unrecognized error

231 </message>	231 </message>

232	232

233 <!-- Status Tray ScreenCapture strings -->	233 <!-- Status Tray ScreenCapture strings -->

234 <message name="IDS_CHROMEOS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_STOP" desc="labe l used for screen sharing stop button">	234 <message name="IDS_CHROMEOS_MEDIA_SCREEN_CAPTURE_NOTIFICATION_STOP" desc="labe l used for screen sharing stop button">

235 Stop	235 Stop

236 </message>	236 </message>

237	237

	238 <message name="IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL" desc="label shown in stead of email for locally managed users">

	239 Locally managed user
	Dmitry Polukhin 2013/04/30 11:04:41 In mock I see that the string is "Limited user". H In mock I see that the string is "Limited user". Have you confirmed the string with Min?
	240 </message>

	241

238 </grit-part>	242 </grit-part>

OLD	NEW

« no previous file with comments | « ash/ash.gyp ('k') | ash/system/chromeos/enterprise/tray_enterprise.h » ('j') | ash/system/chromeos/enterprise/tray_enterprise.h » ('J')