Chromium Code Reviews| Index: chrome/android/java/strings/android_chrome_strings.grd |
| diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd |
| index 66047736dab79f852dc5eadef82ca969698d2efb..d9e81ee55ab4f982d9ee985fa22455e7c24471db 100644 |
| --- a/chrome/android/java/strings/android_chrome_strings.grd |
| +++ b/chrome/android/java/strings/android_chrome_strings.grd |
| @@ -558,7 +558,7 @@ Your Google account may have other forms of browsing history like searches and a |
| Background sync |
| </message> |
| <message name="IDS_WEBSITE_SETTINGS_ADD_SITE" desc="The label for the button to add a new website to the exception list."> |
| - Add site |
| + Add site exception |
| </message> |
| <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DIALOG_TITLE" desc="The title of the dialog to add a website to a list."> |
| Add site |
| @@ -570,10 +570,10 @@ Your Google account may have other forms of browsing history like searches and a |
| Site <ph name="SITE_NAME">%1$s<ex>google.com</ex></ph> added |
| </message> |
| <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DESCRIPTION_JAVASCRIPT" desc="The description for the allow Javascript for website dialog."> |
| - Allow JavaScript on the following site. |
| + Allow JavaScript for a specific site. |
| </message> |
| <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DESCRIPTION_BACKGROUND_SYNC" desc="The description for the allow Background Sync for website dialog."> |
| - Allow Background Sync on the following site. |
| + Allow Background Sync for a specific site. |
| </message> |
| <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_SITE_URL" desc="The label for the input field where the user can type a website URL."> |
| Site URL |
| @@ -630,12 +630,32 @@ particular permission."> |
| <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_SENDING" desc="Summary text explaining that permission will be requested before sending things, e.g. notifications."> |
|
Theresa
2016/05/04 16:33:10
I think this can get removed too. Same with websit
Finnur
2016/05/06 15:12:44
Done.
|
| Ask before sending (recommended) |
| </message> |
| - <message name="IDS_WEBSITE_SETTINGS_CATEGORY_ASK_BEFORE_ACCESSING" desc="Summary text explaining that permission will be requested before accessing something, like location."> |
| - Ask before accessing (recommended) |
| - </message> |
| <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOWED" desc="Summary text explaining that sites are allowed to use cookies and that it is the recommended setting."> |
| Allow sites to save and read cookie data (recommended) |
| </message> |
| + |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_JAVASCRIPT_ALLOWED" desc="Summary text explaining that sites are allowed to run Javascript and that it is the recommended setting."> |
| + Allow sites to run JavaScript (recommended) |
| + </message> |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_POPUPS_BLOCKED" desc="Summary text explaining that sites are blocked from showing popups and that it is the recommended setting."> |
| + Block sites from showing pop-ups (recommended) |
| + </message> |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_LOCATION_ASK" desc="Summary text explaining that sites need to ask for permission before knowing location and that it is the recommended setting."> |
| + Ask before allowing sites to know your location (recommended) |
| + </message> |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_NOTIFICATIONS_ASK" desc="Summary text explaining that sites need to ask for permission before sending notifications and that it is the recommended setting."> |
| + Ask before allowing sites to send notifications (recommended) |
| + </message> |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_FULLSCREEN_ASK" desc="Summary text explaining that sites need to ask for permission before going fullscreen and that it is the recommended setting."> |
| + Ask first before allowing sites to enter fullscreen (recommended) |
| + </message> |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_CAMERA_ASK" desc="Summary text explaining that sites need to ask for permission before accessing the camera and that it is the recommended setting."> |
| + Ask first before allowing sites to use your camera (recommended) |
| + </message> |
| + <message name="IDS_WEBSITE_SETTINGS_CATEGORY_MIC_ASK" desc="Summary text explaining that sites need to ask for permission before accessing the microphone and that it is the recommended setting."> |
| + Ask first before allowing sites to use your microphone (recommended) |
| + </message> |
| + |
| <message name="IDS_WEBSITE_SETTINGS_PERMISSIONS_ALLOW" desc="Summary text explaining that Chrome will allow a website to access some permission, e.g. JavaScript: allow."> |
| Allow |
| </message> |