chrome/android/java/strings/android_chrome_strings.grd - Issue 1332063003: permissions: implement coalesced permissions on Android

Side by Side Diff: chrome/android/java/strings/android_chrome_strings.grd

Issue 1332063003: permissions: implement coalesced permissions on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@request-multiple

Patch Set: Fix minor issues Created 5 years, 3 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

« chrome/android/java/res/layout/permission_group_infobar_item.xml ('K') | « chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionGroupInfoBarAndroid.java ('k') | chrome/app/generated_resources.grd » ('j') | chrome/app/generated_resources.grd » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

2	2

3 <!-- android_chrome_strings.grd contains strings for Chrome for Android.	3 <!-- android_chrome_strings.grd contains strings for Chrome for Android.

4	4

5 FAQ:	5 FAQ:

6 - How do I add, change, or remove a string?	6 - How do I add, change, or remove a string?

7 Just update this file.	7 Just update this file.

8 - Translations will happen automatically??	8 - Translations will happen automatically??

9 Yes, indeed. Just add your string before the branch point and	9 Yes, indeed. Just add your string before the branch point and

10 make the description good.	10 make the description good.

(...skipping 2246 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2257 </message>	2257 </message>

2258	2258

2259 <!-- Client certificate selection failure strings. -->	2259 <!-- Client certificate selection failure strings. -->

2260 <message name="IDS_CLIENT_CERT_UNSUPPORTED_TITLE" desc="Title of a dialog box for when the operating system does not support client SSL certificate select ion">	2260 <message name="IDS_CLIENT_CERT_UNSUPPORTED_TITLE" desc="Title of a dialog box for when the operating system does not support client SSL certificate select ion">

2261 Unable to select certificate.	2261 Unable to select certificate.

2262 </message>	2262 </message>

2263 <message name="IDS_CLIENT_CERT_UNSUPPORTED_MESSAGE" desc="The message in a dialog box for when the operating system does not support client SSL certificat e selection">	2263 <message name="IDS_CLIENT_CERT_UNSUPPORTED_MESSAGE" desc="The message in a dialog box for when the operating system does not support client SSL certificat e selection">

2264 Client side certificate selection is not supported by the operating syst em.	2264 Client side certificate selection is not supported by the operating syst em.

2265 </message>	2265 </message>

2266	2266

	2267 <!-- Coalesced Permission Infobar -->

	2268 <message name="IDS_COALESCED_PERMISSION_INFOBAR_GEOLOCATION" desc="Descrip tion used on the info bar when the user's location is one of several requested p ermissions.">
	gone 2015/09/25 11:02:57 why can't you use the ones that are already in gen why can't you use the ones that are already in generated_resources.grd, or even the ones that already exist in this file? e.g. chrome/app/generated_resources.grd: Know your location chrome/app/generated_resources.grd: Receive push messages chrome/app/generated_resources.grd: MIDI devices full control chrome/android/java/strings/android_chrome_strings.grd: Allow full control of MIDI devices etc etc Lalit Maganti 2015/09/25 13:09:23 Done. Show quoted text On 2015/09/25 11:02:57, dfalcantara wrote: > why can't you use the ones that are already in generated_resources.grd, or even > the ones that already exist in this file? > > e.g. > chrome/app/generated_resources.grd: Know your location > chrome/app/generated_resources.grd: Receive push messages > chrome/app/generated_resources.grd: MIDI devices full control > chrome/android/java/strings/android_chrome_strings.grd: Allow full > control of MIDI devices > etc etc Done.
	2269 Know your location

	2270 </message>

	2271 <message name="IDS_COALESCED_PERMISSION_INFOBAR_NOTIFICATIONS" desc="Descr iption used on the info bar when sending notifications is one of several request ed permissions.">

	2272 Send notifications

	2273 </message>

	2274 <message name="IDS_COALESCED_PERMISSION_INFOBAR_MIDI" desc="Description us ed on the info bar when control of MIDI devices is one of several requested perm issions.">

	2275 Have full control of MIDI devices

	2276 </message>

	2277 <message name="IDS_COALESCED_PERMISSION_INFOBAR_PUSH" desc="Description us ed on the info bar when receiving push messages is one of several requested perm issions.">

	2278 Receive push messages

	2279 </message>

	2280 <message name="IDS_COALESCED_PERMISSION_INFOBAR_PROTECTED_MEDIA" desc="Des cription used on the info bar when knowing the media device identifier is one of several requested permissions.">

	2281 Know your unique device identifier

	2282 </message>

	2283 <message name="IDS_COALESCED_PERMISSION_INFOBAR_DURABLE_STORAGE" desc="Des cription used on the info bar when storing files on the device is one of several requested permissions.">

	2284 Store files

	2285 </message>

	2286 <message name="IDS_COALESCED_PERMISSION_INFOBAR_AUDIO_CAPTURE" desc="Descr iption used on the info bar when using the microphone is one of several requeste d permissions.">

	2287 Use your microphone

	2288 </message>

	2289 <message name="IDS_COALESCED_PERMISSION_INFOBAR_VIDEO_CAPTURE" desc="Descr iption used on the info bar when using the camera is one of several requested pe rmissions.">

	2290 Use your camera

	2291 </message>

	2292

2267 </messages>	2293 </messages>

2268 </release>	2294 </release>

2269 </grit>	2295 </grit>

OLD	NEW