author | Chenxia Liu <liuche@mozilla.com> |
Mon, 10 Aug 2015 16:21:13 -0700 | |
changeset 257412 | d85445174174fb2f74b30296643b41c1c99a0499 |
parent 257411 | 1175ddebd4f35ad3afaef0f4d8d49a67fff5f717 |
child 257413 | 7726e996f847be791c4a61cf8c0a053bb61d45f4 |
push id | 63615 |
push user | ryanvm@gmail.com |
push date | Wed, 12 Aug 2015 14:48:55 +0000 |
treeherder | mozilla-inbound@aa6830e2abd8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mcomella |
bugs | 1192099 |
milestone | 43.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
mobile/android/base/locales/en-US/android_strings.dtd | file | annotate | diff | comparison | revisions | |
mobile/android/base/strings.xml.in | file | annotate | diff | comparison | revisions |
--- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -559,24 +559,20 @@ Example Enterprises, Inc. The layout of the identity dialog prevents combining this into a single string with substitution variables. If it is difficult to translate the sense of the string with that structure, consider a translation which ignores the preceding domain and just addresses the organization to follow, e.g. "This site is run by " --> <!ENTITY identity_connection_secure "Secure Connection"> <!ENTITY identity_connection_insecure "Insecure connection"> <!-- Mixed content notifications in site identity popup --> -<!ENTITY mixed_content_blocked_all "&brandShortName; has blocked insecure elements on this page."> -<!ENTITY mixed_content_blocked_some "&brandShortName; has blocked some insecure elements on this page."> -<!ENTITY mixed_content_display_loaded "This page has some insecure elements."> -<!ENTITY mixed_content_protection_disabled "You have disabled protection from insecure elements."> - -<!ENTITY loaded_mixed_content_message "This page is displaying content that isn\'t secure."> -<!ENTITY blocked_mixed_content_message_top "&brandShortName; has blocked content that isn\'t secure."> -<!ENTITY blocked_mixed_content_message_bottom "Most websites will still work properly even when this content is blocked."> +<!ENTITY mixed_content_blocked_all1 "&brandShortName; has blocked insecure content on this page."> +<!ENTITY mixed_content_blocked_some1 "&brandShortName; has blocked some of the insecure content on this page."> +<!ENTITY mixed_content_display_loaded1 "Parts of this page are not secure (such as images)."> +<!ENTITY mixed_content_protection_disabled1 "You have disabled protection from insecure content."> <!-- Tracking content notifications in site identity popup --> <!ENTITY doorhanger_tracking_title "Tracking protection"> <!ENTITY doorhanger_tracking_state_enabled "Enabled"> <!ENTITY doorhanger_tracking_state_disabled "Disabled"> <!ENTITY doorhanger_tracking_message_enabled1 "Attempts to track your online behavior have been blocked."> <!ENTITY doorhanger_tracking_message_disabled2 "This page includes elements that may track your browsing.">
--- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -464,20 +464,20 @@ <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_marketplace --> <string name="bookmarkdefaults_title_marketplace">@bookmarks_marketplace@</string> <string name="bookmarkdefaults_url_marketplace">https://marketplace.firefox.com/</string> <!-- Site identity popup --> <string name="identity_connection_secure">&identity_connection_secure;</string> <string name="identity_connection_insecure">&identity_connection_insecure;</string> - <string name="mixed_content_blocked_all">&mixed_content_blocked_all;</string> - <string name="mixed_content_blocked_some">&mixed_content_blocked_some;</string> - <string name="mixed_content_display_loaded">&mixed_content_display_loaded;</string> - <string name="mixed_content_protection_disabled">&mixed_content_protection_disabled;</string> + <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string> + <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</string> + <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</string> + <string name="mixed_content_protection_disabled">&mixed_content_protection_disabled1;</string> <string name="doorhanger_tracking_title">&doorhanger_tracking_title;</string> <string name="doorhanger_tracking_state_enabled">&doorhanger_tracking_state_enabled;</string> <string name="doorhanger_tracking_state_disabled">&doorhanger_tracking_state_disabled;</string> <string name="doorhanger_tracking_message_enabled">&doorhanger_tracking_message_enabled1;</string> <string name="doorhanger_tracking_message_disabled">&doorhanger_tracking_message_disabled2;</string> <string name="learn_more">&learn_more;</string>