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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed typos Created 6 years, 6 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 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 2350 matching lines...) Expand 10 before | Expand all | Expand 10 after
2361 </message> 2361 </message>
2362 <message name="IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION" desc="Radio button c hoice to allow a site to access microphone, displayed in bubble when a page is a ccessing microphone."> 2362 <message name="IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION" desc="Radio button c hoice to allow a site to access microphone, displayed in bubble when a page is a ccessing microphone.">
2363 Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to acc ess your microphone 2363 Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to acc ess your microphone
2364 </message> 2364 </message>
2365 <message name="IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION" desc="Radio butto n choice to allow a site to access camera, displayed in bubble when a page is ac cessing camera."> 2365 <message name="IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION" desc="Radio butto n choice to allow a site to access camera, displayed in bubble when a page is ac cessing camera.">
2366 Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to acc ess your camera 2366 Continue allowing <ph name="HOST">$1<ex>mail.google.com</ex></ph> to acc ess your camera
2367 </message> 2367 </message>
2368 <message name="IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT" desc="Explanatory anim ated text that appears (and then disappears) in the address line when popup is b locked"> 2368 <message name="IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT" desc="Explanatory anim ated text that appears (and then disappears) in the address line when popup is b locked">
2369 Pop-up blocked 2369 Pop-up blocked
2370 </message> 2370 </message>
2371 <message name="IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT" desc="Explanatory anim ated text that appears (and then disappears) in the address line when plugin is blocked">
2372 Plug-in blocked
2373 </message>
2371 <message name="IDS_BLOCKED_JAVASCRIPT_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to run JavaScript."> 2374 <message name="IDS_BLOCKED_JAVASCRIPT_TITLE" desc="Tooltip and bubble info header text when a page is not allowed to run JavaScript.">
2372 JavaScript was blocked on this page. 2375 JavaScript was blocked on this page.
2373 </message> 2376 </message>
2374 <message name="IDS_BLOCKED_JAVASCRIPT_UNBLOCK" desc="Radio button choice t o unblock a site from running JavaScript, displayed in bubble when a page tries to run JavaScript."> 2377 <message name="IDS_BLOCKED_JAVASCRIPT_UNBLOCK" desc="Radio button choice t o unblock a site from running JavaScript, displayed in bubble when a page tries to run JavaScript.">
2375 Always allow JavaScript on <ph name="HOST">$1<ex>mail.google.com</ex></p h> 2378 Always allow JavaScript on <ph name="HOST">$1<ex>mail.google.com</ex></p h>
2376 </message> 2379 </message>
2377 <message name="IDS_BLOCKED_JAVASCRIPT_NO_ACTION" desc="Radio button choice to continue blocking a site from running JavaScript, displayed in bubble when a page tries to run JavaScript."> 2380 <message name="IDS_BLOCKED_JAVASCRIPT_NO_ACTION" desc="Radio button choice to continue blocking a site from running JavaScript, displayed in bubble when a page tries to run JavaScript.">
2378 Continue blocking JavaScript 2381 Continue blocking JavaScript
2379 </message> 2382 </message>
2380 <message name="IDS_BLOCKED_JAVASCRIPT_LINK" desc="Link to JavaScript secti on of content blocking management dialog, displayed in bubble when a page tries to run JavaScript."> 2383 <message name="IDS_BLOCKED_JAVASCRIPT_LINK" desc="Link to JavaScript secti on of content blocking management dialog, displayed in bubble when a page tries to run JavaScript.">
2381 Manage JavaScript blocking... 2384 Manage JavaScript blocking...
2382 </message> 2385 </message>
2383 <if expr="is_macosx"> 2386 <if expr="is_macosx">
2384 <message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to display plug-ins."> 2387 <message name="IDS_BLOCKED_PLUGINS_TITLE" desc="Bubble info header text when a page is not allowed to display plug-ins.">
2385 The following plug-ins were blocked on this page: 2388 The following plug-ins were blocked on this page:
2386 </message> 2389 </message>
2387 </if> 2390 </if>
2388 <message name="IDS_BLOCKED_PLUGINS_MESSAGE" desc="Tooltip and message when a page is not allowed to display plug-ins."> 2391 <message name="IDS_BLOCKED_PLUGINS_MESSAGE" desc="Tooltip and message when a page is not allowed to display plug-ins.">
2389 Plug-ins were blocked on this page. 2392 Plug-ins were blocked on this page.
2390 </message> 2393 </message>
2391 <message name="IDS_BLOCKED_PLUGINS_UNBLOCK_ALL" desc="Radio button choice to unblock a site from using plug-ins, displayed in bubble when a page tries to use plug-ins."> 2394 <message name="IDS_BLOCKED_PLUGINS_UNBLOCK_ALL" desc="Radio button choice to unblock a site from using plug-ins, displayed in bubble when a page tries to use plug-ins.">
2392 Always allow plug-ins on <ph name="HOST">$1<ex>mail.google.com</ex></ph> 2395 Always run on this site
2393 </message> 2396 </message>
2394 <if expr="is_macosx"> 2397 <if expr="is_macosx">
2395 <message name="IDS_BLOCKED_PLUGINS_UNBLOCK" desc="Radio button choice to unblock a site from using *a specific set* of plug-ins, displayed in bubble whe n a page tries to use plug-ins."> 2398 <message name="IDS_BLOCKED_PLUGINS_UNBLOCK" desc="Radio button choice to unblock a site from using *a specific set* of plug-ins, displayed in bubble whe n a page tries to use plug-ins.">
2396 Always allow these plug-ins on <ph name="HOST">$1<ex>mail.google.com</ ex></ph> 2399 Always allow these plug-ins on <ph name="HOST">$1<ex>mail.google.com</ ex></ph>
2397 </message> 2400 </message>
2398 </if> 2401 </if>
2399 <message name="IDS_BLOCKED_PLUGINS_NO_ACTION" desc="Radio button choice to continue blocking a site from using plug-ins, displayed in bubble when a page t ries to use plug-ins."> 2402 <message name="IDS_BLOCKED_PLUGINS_NO_ACTION" desc="Radio button choice to continue blocking a site from using plug-ins, displayed in bubble when a page t ries to use plug-ins.">
2400 Continue blocking plug-ins 2403 Block plug-ins on this site
2401 </message> 2404 </message>
2402 <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 di splay plug-ins."> 2405 <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 di splay plug-ins.">
2403 Manage plug-in blocking... 2406 Manage plug-in blocking...
2404 </message> 2407 </message>
2405 <message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all bloc ked plugins on a page, displayed in bubble when a page tries to display plug-ins ."> 2408 <message name="IDS_BLOCKED_PLUGINS_LOAD_ALL" desc="Button to load all bloc ked plugins on a page, displayed in bubble when a page tries to display plug-ins .">
2406 Run all plug-ins this time 2409 Run this time
2407 </message> 2410 </message>
2408 2411
2409 <!-- Certificate error strings --> 2412 <!-- Certificate error strings -->
2410 <message name="IDS_CERT_ERROR_EXTRA_INFO_TITLE" desc="The title for the ex tra information section displayed when a page contains a certificate error"> 2413 <message name="IDS_CERT_ERROR_EXTRA_INFO_TITLE" desc="The title for the ex tra information section displayed when a page contains a certificate error">
2411 Help me understand 2414 Help me understand
2412 </message> 2415 </message>
2413 <if expr="is_android or is_ios"> 2416 <if expr="is_android or is_ios">
2414 <message name="IDS_CERT_ERROR_EXTRA_INFO_1" desc="Mobile: 1st paragraph of extra information for any certificate error"> 2417 <message name="IDS_CERT_ERROR_EXTRA_INFO_1" desc="Mobile: 1st paragraph of extra information for any certificate error">
2415 When you connect to a secure website, the server hosting that site pre sents your browser with something called a "certificate" to verify its identity. This certificate contains identity information, such as the address of the webs ite, which is verified by a third party that your device trusts. By checking tha t the address in the certificate matches the address of the website, it is possi ble to verify that you are securely communicating with the website you intended, and not a third party (such as an attacker on your network). 2418 When you connect to a secure website, the server hosting that site pre sents your browser with something called a "certificate" to verify its identity. This certificate contains identity information, such as the address of the webs ite, which is verified by a third party that your device trusts. By checking tha t the address in the certificate matches the address of the website, it is possi ble to verify that you are securely communicating with the website you intended, and not a third party (such as an attacker on your network).
2416 </message> 2419 </message>
(...skipping 11722 matching lines...) Expand 10 before | Expand all | Expand 10 after
14139 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode"> 14142 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE" desc="Descr iption of the 'Extension Content Verification' enforce mode">
14140 Enforce (try to get hashes, and enforce them if successful) 14143 Enforce (try to get hashes, and enforce them if successful)
14141 </message> 14144 </message>
14142 14145
14143 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode"> 14146 <message name="IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT" desc ="Description of the 'Extension Content Verification' enforce strict mode">
14144 Enforce strict (hard fail if we can't get hashes) 14147 Enforce strict (hard fail if we can't get hashes)
14145 </message> 14148 </message>
14146 </messages> 14149 </messages>
14147 </release> 14150 </release>
14148 </grit> 14151 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698