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

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

Issue 1084423002: Split Camera and Mic into two permissions on the Site Details page (under Site Settings). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Polish Created 5 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
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit current_release="1" latest_public_release="0"> 2 <grit current_release="1" latest_public_release="0">
3 <outputs> 3 <outputs>
4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" /> 4 <output filename="values-am/android_chrome_strings.xml" lang="am" type="andr oid" />
5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" /> 5 <output filename="values-ar/android_chrome_strings.xml" lang="ar" type="andr oid" />
6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" /> 6 <output filename="values-bg/android_chrome_strings.xml" lang="bg" type="andr oid" />
7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" /> 7 <output filename="values-ca/android_chrome_strings.xml" lang="ca" type="andr oid" />
8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" /> 8 <output filename="values-cs/android_chrome_strings.xml" lang="cs" type="andr oid" />
9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" /> 9 <output filename="values-da/android_chrome_strings.xml" lang="da" type="andr oid" />
10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" /> 10 <output filename="values-de/android_chrome_strings.xml" lang="de" type="andr oid" />
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 </message> 498 </message>
499 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_BLOCK_RECOMMENDED" desc="Summ ary text explaining that a permission is blocked, which is the recommended setti ng."> 499 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_BLOCK_RECOMMENDED" desc="Summ ary text explaining that a permission is blocked, which is the recommended setti ng.">
500 Block (recommended) 500 Block (recommended)
501 </message> 501 </message>
502 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_SENDING" desc="Sum mary text explaining that permission will be requested before sending things, e. g. notifications."> 502 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_SENDING" desc="Sum mary text explaining that permission will be requested before sending things, e. g. notifications.">
503 Ask before sending (recommended) 503 Ask before sending (recommended)
504 </message> 504 </message>
505 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING" desc="S ummary text explaining that permission will be requested before accessing someth ing, like location."> 505 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING" desc="S ummary text explaining that permission will be requested before accessing someth ing, like location.">
506 Ask before accessing (recommended) 506 Ask before accessing (recommended)
507 </message> 507 </message>
508 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING_CAMERA_M IC" desc="Summary text explaining that permission will be requested before acces sing the camera and microphone."> 508 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING_CAMERA_M IC" desc="Summary text explaining that permission will be requested before acces sing the camera and microphone.">
newt (away) 2015/04/22 17:35:55 we can delete this string, right?
Finnur 2015/04/24 13:52:00 Done.
509 Ask before accessing camera and microphone (recommended) 509 Ask before accessing camera and microphone (recommended)
510 </message> 510 </message>
511 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING_CAMERA" desc="Summary text explaining that permission will be requested before accessing the camera.">
512 Ask before accessing camera (recommended)
513 </message>
514 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING_MIC" des c="Summary text explaining that permission will be requested before accessing th e microphone.">
515 Ask before accessing microphone (recommended)
516 </message>
511 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOWED" desc="Summary text explaining that sites are allowed to use cookies and that it is the recomm ended setting."> 517 <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOWED" desc="Summary text explaining that sites are allowed to use cookies and that it is the recomm ended setting.">
512 Allow sites to save and read cookie data (recommended) 518 Allow sites to save and read cookie data (recommended)
513 </message> 519 </message>
514 <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_ALLOW" desc="Summary text explaining that the user will allow a website to access some permission, e.g. Ja vaScript: allow."> 520 <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_ALLOW" desc="Summary text explaining that the user will allow a website to access some permission, e.g. Ja vaScript: allow.">
515 Allow 521 Allow
516 </message> 522 </message>
517 <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_BLOCK" desc="Summary text explaining that the user will block a website from accessing some permission, e. g. JavaScript: block."> 523 <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_BLOCK" desc="Summary text explaining that the user will block a website from accessing some permission, e. g. JavaScript: block.">
518 Block 524 Block
519 </message> 525 </message>
520 <message name="IDS_WEBSITE_SETTINGS_SEARCH" desc="The label for the search button on the Website Settings page."> 526 <message name="IDS_WEBSITE_SETTINGS_SEARCH" desc="The label for the search button on the Website Settings page.">
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 Location 558 Location
553 </message> 559 </message>
554 <message name="IDS_GEOLOCATION_PERMISSION_TITLE" desc="Title for the permi ssion of accessing the current location of a device [CHAR-LIMIT=32]"> 560 <message name="IDS_GEOLOCATION_PERMISSION_TITLE" desc="Title for the permi ssion of accessing the current location of a device [CHAR-LIMIT=32]">
555 Location access 561 Location access
556 </message> 562 </message>
557 <message name="IDS_ANDROID_LOCATION_OFF" desc="Text at the top of the Webs ite list, explaining to the user that the location service in Android is turned off. Contains a link to the settings menu to change it."> 563 <message name="IDS_ANDROID_LOCATION_OFF" desc="Text at the top of the Webs ite list, explaining to the user that the location service in Android is turned off. Contains a link to the settings menu to change it.">
558 Turn on location in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Android Setti ngs<ph name="END_LINK">&lt;/link&gt;</ph>. 564 Turn on location in <ph name="BEGIN_LINK">&lt;link&gt;</ph>Android Setti ngs<ph name="END_LINK">&lt;/link&gt;</ph>.
559 </message> 565 </message>
560 566
561 <!-- Camera and microphone preferences --> 567 <!-- Camera and microphone preferences -->
562 <message name="IDS_WEBSITE_SETTINGS_USE_CAMERA_OR_MIC" desc="The category filter 'Camera/Mic' for content settings."> 568 <message name="IDS_WEBSITE_SETTINGS_USE_CAMERA_OR_MIC" desc="The category filter 'Camera/Mic' for content settings.">
newt (away) 2015/04/22 17:35:55 delete this?
Finnur 2015/04/24 13:52:00 Done.
563 Camera or microphone 569 Camera or microphone
564 </message> 570 </message>
565 <message name="IDS_VIDEO_PERMISSION_TITLE" desc="Title text to be shown wh en the user has allowed/denied video access for the website [CHAR-LIMIT=32]"> 571 <message name="IDS_WEBSITE_SETTINGS_USE_CAMERA" desc="The category filter 'Camera' for content settings.">
572 Camera
573 </message>
574 <message name="IDS_WEBSITE_SETTINGS_USE_MIC" desc="The category filter 'Mi c' for content settings.">
575 Microphone
576 </message>
577 <message name="IDS_CAMERA_PERMISSION_TITLE" desc="Title text to be shown w hen the user has allowed/denied video access for the website [CHAR-LIMIT=32]">
566 Access your camera 578 Access your camera
567 </message> 579 </message>
568 <message name="IDS_VOICE_PERMISSION_TITLE" desc="Title text to be shown wh en the user has allowed/denied voice access for the website [CHAR-LIMIT=32]"> 580 <message name="IDS_MIC_PERMISSION_TITLE" desc="Title text to be shown when the user has allowed/denied voice access for the website [CHAR-LIMIT=32]">
569 Access your microphone 581 Access your microphone
570 </message> 582 </message>
571 <message name="IDS_VOICE_AND_VIDEO_PERMISSION_TITLE" desc="Title text to b e shown when the user has allowed/denied voice and video access for the website [CHAR-LIMIT=32]"> 583 <message name="IDS_VOICE_AND_VIDEO_PERMISSION_TITLE" desc="Title text to b e shown when the user has allowed/denied voice and video access for the website [CHAR-LIMIT=32]">
572 Access your mic and camera 584 Access your mic and camera
573 </message> 585 </message>
574 586
575 <!-- Protected content preferences --> 587 <!-- Protected content preferences -->
576 <message name="IDS_PROTECTED_CONTENT" desc="Title for link to protected co ntent settings [CHAR-LIMIT=32]"> 588 <message name="IDS_PROTECTED_CONTENT" desc="Title for link to protected co ntent settings [CHAR-LIMIT=32]">
577 Protected content 589 Protected content
578 </message> 590 </message>
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1539 <message name="IDS_ACCESSIBILITY_PAUSE" desc="Content description for the pause button that pauses playing the media."> 1551 <message name="IDS_ACCESSIBILITY_PAUSE" desc="Content description for the pause button that pauses playing the media.">
1540 Pause 1552 Pause
1541 </message> 1553 </message>
1542 <message name="IDS_ACCESSIBILITY_STOP" desc="Content description for the s top button that stops playing the media."> 1554 <message name="IDS_ACCESSIBILITY_STOP" desc="Content description for the s top button that stops playing the media.">
1543 Stop 1555 Stop
1544 </message> 1556 </message>
1545 1557
1546 </messages> 1558 </messages>
1547 </release> 1559 </release>
1548 </grit> 1560 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698