Bug 932854 - trunk-only patch to use new strings for the buttons, r=jaws
authorBenjamin Smedberg <benjamin@smedbergs.us>
Tue, 19 Nov 2013 08:17:04 -0500
changeset 156338 1458d327affd2f599a9044e9efa85811e6401af9
parent 156337 6ce923a22a9eb94df962268b9e1ab19eafbccab3
child 156339 400b95c3beeb6fc61e3ed4ae0d6f1335a4efa37e
push id25675
push userryanvm@gmail.com
push dateTue, 19 Nov 2013 18:44:46 +0000
treeherdermozilla-central@24eb4aead1ba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs932854
milestone28.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
Bug 932854 - trunk-only patch to use new strings for the buttons, r=jaws
browser/base/content/browser-plugins.js
browser/locales/en-US/chrome/browser/browser.properties
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -999,33 +999,32 @@ var gPluginHandler = {
 
         for (let action of actions.values()) {
           if (action.fallbackType != Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY) {
             break;
           }
         }
       }
 
-      // These strings are temporary no-string-change for branch uplift
       let buttons = [
         {
-          label: gNavigatorBundle.getString("pluginBlockNow.label"),
-          accessKey: gNavigatorBundle.getString("pluginBlockNow.accesskey"),
+          label: gNavigatorBundle.getString("pluginContinueBlocking.label"),
+          accessKey: gNavigatorBundle.getString("pluginContinueBlocking.accesskey"),
           callback: function() {
             Services.telemetry.getHistogramById("PLUGINS_INFOBAR_BLOCK").
               add(true);
 
             Services.perms.addFromPrincipal(aBrowser.contentDocument.nodePrincipal,
                                             "plugin-hidden-notification",
                                             Services.perms.DENY_ACTION);
           }
         },
         {
-          label: gNavigatorBundle.getString("offlineApps.allow"),
-          accessKey: gNavigatorBundle.getString("offlineApps.allowAccessKey"),
+          label: gNavigatorBundle.getString("pluginActivateTrigger.label"),
+          accessKey: gNavigatorBundle.getString("pluginActivateTrigger.accesskey"),
           callback: function() {
             Services.telemetry.getHistogramById("PLUGINS_INFOBAR_ALLOW").
               add(true);
 
             let curNotification =
               PopupNotifications.getNotification("click-to-play-plugins",
                                                  aBrowser);
             if (curNotification) {
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -158,16 +158,24 @@ pluginBlockNow.accesskey=B
 pluginContinue.label=Continue Allowing
 pluginContinue.accesskey=C
 
 # in-page UI
 PluginClickToActivate=Activate %S.
 PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
 PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
 
+# infobar UI
+pluginContinueBlocking.label=Continue Blocking
+pluginContinueBlocking.accesskey=B
+# LOCALIZATION NOTE (pluginActivateTrigger): Use the unicode ellipsis char, \u2026,
+# or use "..." if \u2026 doesn't suit traditions in your locale.
+pluginActivateTrigger.label=Allow…
+pluginActivateTrigger.accesskey=A
+
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Clear All History
 sanitizeButtonOK=Clear Now
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
 # button between the user clicking it and the window closing.  Indicates the