chrome/android/java/strings/android_chrome_strings.grd - Issue 1091253005: [Android] Update Protected Media Identifier Settings UI to reflect exceptions.

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

Issue 1091253005: [Android] Update Protected Media Identifier Settings UI to reflect exceptions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Newton's Comments Created 5 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 | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsiteSettingsCategoryFilter.java ('k') | chrome/app/generated_resources.grd » ('j') | chrome/browser/media/protected_media_identifier_infobar_delegate.cc » ('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 <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 594 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
605 Reset device credentials	605 Reset device credentials

606 </message>	606 </message>

607 <message name="IDS_PROTECTED_CONTENT_RESET_TITLE" desc="Title for device c redential reset menu preference">	607 <message name="IDS_PROTECTED_CONTENT_RESET_TITLE" desc="Title for device c redential reset menu preference">

608 Confirm device credential deletion	608 Confirm device credential deletion

609 </message>	609 </message>

610 <message name="IDS_PROTECTED_CONTENT_RESET_MESSAGE" desc="Title for device credential reset menu preference">	610 <message name="IDS_PROTECTED_CONTENT_RESET_MESSAGE" desc="Title for device credential reset menu preference">

611 Content (movies, music, etc.) downloaded in other applications may no lo nger be playable until those application re-acquire licenses based on a new devi ce credential.	611 Content (movies, music, etc.) downloaded in other applications may no lo nger be playable until those application re-acquire licenses based on a new devi ce credential.

612	612

613 To obtain new licenses, connect to the internet and play your downloaded content .	613 To obtain new licenses, connect to the internet and play your downloaded content .

614 </message>	614 </message>

	615 <!-- Keep in sync with chrome/common/url_constants.cc -->

615 <message name="IDS_PROTECTED_CONTENT_LEARN_MORE_URL" desc="URL for learnin g more about device credential reset menu preference" translateable="false">	616 <message name="IDS_PROTECTED_CONTENT_LEARN_MORE_URL" desc="URL for learnin g more about device credential reset menu preference" translateable="false">

616 https://support.google.com/chrome/?p=mobile_protected_content	617 https://support.google.com/chrome/?p=mobile_protected_content

617 </message>	618 </message>

618	619

619 <!-- Google translate preferences -->	620 <!-- Google translate preferences -->

620 <message name="IDS_GOOGLE_TRANSLATE" desc='Title for the Google Translate settings screen. [CHAR-LIMIT=32]'>	621 <message name="IDS_GOOGLE_TRANSLATE" desc='Title for the Google Translate settings screen. [CHAR-LIMIT=32]'>

621 Google Translate	622 Google Translate

622 </message>	623 </message>

623 <message name="IDS_TRANSLATE_PREFS_DESCRIPTION" desc="Translate preference description">	624 <message name="IDS_TRANSLATE_PREFS_DESCRIPTION" desc="Translate preference description">

624 When this feature is turned on, Chrome will offer to translate pages wri tten in other languages using Google Translate.	625 When this feature is turned on, Chrome will offer to translate pages wri tten in other languages using Google Translate.

(...skipping 925 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1550 <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.">

1551 Pause	1552 Pause

1552 </message>	1553 </message>

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

1554 Stop	1555 Stop

1555 </message>	1556 </message>

1556	1557

1557 </messages>	1558 </messages>

1558 </release>	1559 </release>

1559 </grit>	1560 </grit>

OLD	NEW