chrome/android/java/strings/android_chrome_strings.grd - Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android

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

Issue 2785913002: [subresource_filter] Add the Content Settings UI for Android (Closed)

Patch Set: guard via feature list Created 3 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:

« chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java ('k') | chrome/browser/android/chrome_feature_list.cc » ('j') | no next file with comments »
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 2773 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2784 <!-- Custom Context Menu Informations -->	2784 <!-- Custom Context Menu Informations -->

2785 <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context m enu tab when the item pressed contains more than one type. This indicates that a ll the actions are related to the image.">	2785 <message name="IDS_CONTEXTMENU_IMAGE_TITLE" desc="The title of a context m enu tab when the item pressed contains more than one type. This indicates that a ll the actions are related to the image.">

2786 IMAGE	2786 IMAGE

2787 </message>	2787 </message>

2788 <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context me nu tab when the item pressed contains more than one type. This indicates that al l the actions are related to the link.">	2788 <message name="IDS_CONTEXTMENU_LINK_TITLE" desc="The title of a context me nu tab when the item pressed contains more than one type. This indicates that al l the actions are related to the link.">

2789 LINK	2789 LINK

2790 </message>	2790 </message>

2791 <message name="IDS_CONTEXTMENU_VIDEO_TITLE" desc="The title of a context m enu tab when the item pressed contains more than one type. This indicates that a ll the actions are related to a video.">	2791 <message name="IDS_CONTEXTMENU_VIDEO_TITLE" desc="The title of a context m enu tab when the item pressed contains more than one type. This indicates that a ll the actions are related to a video.">

2792 VIDEO	2792 VIDEO

2793 </message>	2793 </message>

	2794

	2795 <!-- Subresource Filter -->

	2796 <message name="IDS_SUBRESOURCE_FILTER_HEADER_ANDROID" desc="Header for the subresource filter setting on the Content Settings dialog.">
	Finnur 2017/03/31 10:22:34 The _ANDROID suffix is redundant. This file and th The _ANDROID suffix is redundant. This file and these strings are Android only. Also, this belongs next to ids_popup_permission_title and all those higher up in this file. There's also a CHAR_LIMIT that is needed for translators (you'll see what I mean once you move this up). Charlie Harrison 2017/03/31 13:21:42 I changed it to have the ANDROID suffix because we Show quoted text On 2017/03/31 10:22:34, Finnur wrote: > The _ANDROID suffix is redundant. This file and these strings are Android only. > > Also, this belongs next to ids_popup_permission_title and all those higher up in > this file. There's also a CHAR_LIMIT that is needed for translators (you'll see > what I mean once you move this up). I changed it to have the ANDROID suffix because we have the exact same string in chrome/app/generated_resources.grd. A few comments ago I asked what the best practice in this case is. I added the suffix because melandory was concerned that duplicate IDS names could cause issues. I've moved it and changed the name to IDS_SUBRESOURCE_FILTER_PERMISSION_TITLE.
	2797 Subresource Filter

	2798 </message>

2794 </messages>	2799 </messages>

2795 </release>	2800 </release>

2796 </grit>	2801 </grit>

OLD	NEW