Index: chrome/app/generated_resources.grd |
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd |
index d5fb024248c6b829a97f9c7682ad0374f07898d9..05fa4fc6d95d71cc578e8b2defc5957916d96747 100644 |
--- a/chrome/app/generated_resources.grd |
+++ b/chrome/app/generated_resources.grd |
@@ -2353,7 +2353,19 @@ each locale. --> |
<message name="IDS_BLOCKED_PLUGINS_LINK" desc="Link to plug-ins section of content blocking management dialog, displayed in bubble when a page tries to display plug-ins."> |
Manage plug-in blocking... |
</message> |
- |
+ <message name="IDS_GEOLOCATION_RADIO_TITLE" desc="Label shown above the radio buttons asking the user to set geolocation permission for this site."> |
+ <ph name="PAGE_URL">$1<ex>www.google.com</ex></ph> wants to track your physical location. |
+ </message> |
+ <message name="IDS_GEOLOCATION_RADIO_ALLOW" desc="Label for radio button to allow a site to use geolocation."> |
+ Allow this site to track me |
+ </message> |
+ <message name="IDS_GEOLOCATION_RADIO_BLOCK" desc="Label for radio button to block a site from using geolocation."> |
+ Prevent this site from tracking me |
+ </message> |
+ <message name="IDS_GEOLOCATION_LINK" desc="Link to geolocation section of content blocking management dialog, displayed in bubble when a page tries to write cookies or other site data."> |
+ Manage geolocation settings... |
+ </message> |
+ |
<!-- SSL error strings --> |
<message name="IDS_SEVERAL_SSL_ERRORS" desc="Bubble info header text when there is more than 1 error"> |
There are several SSL errors on this page: |
@@ -4068,8 +4080,23 @@ Keep your key file in a safe place. You will need it to create new versions of y |
<message name="IDS_JS_DONOTALLOW_RADIO" desc="A radio button in the Content Settings dialog for preventing JavaScript use on any site."> |
Do not allow any site to run JavaScript |
</message> |
- |
- <!-- Cookie/Images/JavaScript/Plugins exception dialogs --> |
+ <message name="IDS_GEOLOCATION_TAB_LABEL" desc="Label for Geolocation tab on Content Settings dialog"> |
+ Geolocation |
+ </message> |
+ <message name="IDS_GEOLOCATION_SETTING_LABEL" desc="A label on top of Geolocation tab on Content Settings dialog"> |
+ Geolocation Settings: |
+ </message> |
+ <message name="IDS_GEOLOCATION_ASK_ALL_RADIO" desc="A radio button in the Content Settings dialog for prompting the user for Geolocation permission on any site."> |
+ Ask me when a site tries to track my physical location (recommended) |
+ </message> |
+ <message name="IDS_GEOLOCATION_BLOCK_ALL_RADIO" desc="A radio button in the Content Settings dialog for blocking Geolocation use on any site."> |
+ Do not allow any site to track my physical location |
+ </message> |
+ <message name="IDS_GEOLOCATION_ALLOW_ALL_RADIO" desc="A radio button in the Content Settings dialog for allowing any site to use Geolocation."> |
+ Allow any site to track my physical location |
+ </message> |
+ |
+ <!-- Cookie/Images/JavaScript/Plugins/Geolocation exception dialogs --> |
<message name="IDS_COOKIE_EXCEPTION_TITLE" desc="Title for cookie exceptions dialog"> |
Cookie Exceptions |
</message> |
@@ -4085,6 +4112,9 @@ Keep your key file in a safe place. You will need it to create new versions of y |
<message name="IDS_POPUP_EXCEPTION_TITLE" desc="Title for pop-up exceptions dialog"> |
Pop-up Exceptions |
</message> |
+ <message name="IDS_GEOLOCATION_EXCEPTION_TITLE" desc="Title for geolocation exceptions dialog"> |
+ Geolocation Exceptions |
+ </message> |
<message name="IDS_EXCEPTIONS_HOSTNAME_HEADER" desc="A column header for the hostname column of the cookie/image/javascript/plugins exceptions dialog"> |
Site |
</message> |
@@ -6729,9 +6759,20 @@ Keep your key file in a safe place. You will need it to create new versions of y |
<message name="IDS_GEOLOCATION_DENY_BUTTON" desc="A button in geolocation infobar for denying access to geolocation for a given domain."> |
Deny |
</message> |
+ <message name="IDS_GEOLOCATION_ALLOWED_TOOLTIP" desc="Tooltip text when a page is allowed to use geolocation."> |
+ <ph name="PAGE_URL">$1<ex>www.google.com</ex></ph> is tracking your physical location. |
+ </message> |
+ <message name="IDS_GEOLOCATION_MULTIPLE_ALLOWED_TOOLTIP" desc="Tooltip text when multiple frames in the current page are allowed to use geolocation."> |
+ Multiple sites are tracking your physical location. |
+ </message> |
+ <message name="IDS_GEOLOCATION_BLOCKED_TOOLTIP" desc="Tooltip text when a page is blocked from using geolocation."> |
+ <ph name="PAGE_URL">$1<ex>www.google.com</ex></ph> is blocked from tracking your physical location. |
+ </message> |
+ <message name="IDS_GEOLOCATION_MULTIPLE_BLOCKED_TOOLTIP" desc="Tooltip text when multiple frames in the current page are blocked from using geolocation."> |
+ Multiple sites are blocked from tracking your physical location. |
+ </message> |
- |
- <!-- ProcessSingleton --> |
+ <!-- ProcessSingleton --> |
<message name="IDS_PROFILE_IN_USE_LINUX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> |
The profile appears to be in use by process <ph name="PROCESS_ID">$1<ex>12345</ex></ph> on host <ph name="HOST_NAME">$2<ex>example.com</ex></ph>. If you are sure no other processes are using this profile, delete the file <ph name="LOCK_FILE">$3<ex>/home/user/.config/google-chrome/SingletonLock</ex></ph> and restart <ph name="PRODUCT_NAME">$4<ex>Google Chrome</ex></ph>. |
</message> |