From 0a8c494cb1e2e014f3e30a58a1b7e99d569d184b Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Tue, 22 Apr 2014 15:47:37 -0400 Subject: [PATCH] Bug 997684 - Tooltips in the panel menu shouldn't end with an ellipsis and shouldn't use title capitalization. r=dao --- .../src/CustomizableWidgets.jsm | 15 ++++--- .../customizableWidgets.properties | 43 ++++++++----------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/browser/components/customizableui/src/CustomizableWidgets.jsm b/browser/components/customizableui/src/CustomizableWidgets.jsm index 8e2700d6f62..c10bf77c8d1 100644 --- a/browser/components/customizableui/src/CustomizableWidgets.jsm +++ b/browser/components/customizableui/src/CustomizableWidgets.jsm @@ -284,7 +284,7 @@ const CustomizableWidgets = [{ }, { id: "save-page-button", shortcutId: "key_savePage", - tooltiptext: "save-page-button.tooltiptext2", + tooltiptext: "save-page-button.tooltiptext3", defaultArea: CustomizableUI.AREA_PANEL, onCommand: function(aEvent) { let win = aEvent.target && @@ -297,7 +297,7 @@ const CustomizableWidgets = [{ }, { id: "find-button", shortcutId: "key_find", - tooltiptext: "find-button.tooltiptext2", + tooltiptext: "find-button.tooltiptext3", defaultArea: CustomizableUI.AREA_PANEL, onCommand: function(aEvent) { let win = aEvent.target && @@ -310,7 +310,7 @@ const CustomizableWidgets = [{ }, { id: "open-file-button", shortcutId: "openFileKb", - tooltiptext: "open-file-button.tooltiptext2", + tooltiptext: "open-file-button.tooltiptext3", defaultArea: CustomizableUI.AREA_PANEL, onCommand: function(aEvent) { let win = aEvent.target @@ -325,6 +325,7 @@ const CustomizableWidgets = [{ type: "view", viewId: "PanelUI-developer", shortcutId: "key_devToolboxMenuItem", + tooltiptext: "developer-button.tooltiptext2", defaultArea: CustomizableUI.AREA_PANEL, onViewShowing: function(aEvent) { // Populate the subview with whatever menuitems are in the developer @@ -350,6 +351,7 @@ const CustomizableWidgets = [{ id: "sidebar-button", type: "view", viewId: "PanelUI-sidebar", + tooltiptext: "sidebar-button.tooltiptext2", onViewShowing: function(aEvent) { // Largely duplicated from the developer-button above with a couple minor // alterations. @@ -377,7 +379,7 @@ const CustomizableWidgets = [{ }, { id: "add-ons-button", shortcutId: "key_openAddons", - tooltiptext: "add-ons-button.tooltiptext2", + tooltiptext: "add-ons-button.tooltiptext3", defaultArea: CustomizableUI.AREA_PANEL, onCommand: function(aEvent) { let win = aEvent.target && @@ -412,6 +414,7 @@ const CustomizableWidgets = [{ }, { id: "zoom-controls", type: "custom", + tooltiptext: "zoom-controls.tooltiptext2", defaultArea: CustomizableUI.AREA_PANEL, onBuild: function(aDocument) { const kPanelId = "PanelUI-popup"; @@ -584,6 +587,7 @@ const CustomizableWidgets = [{ }, { id: "edit-controls", type: "custom", + tooltiptext: "edit-controls.tooltiptext2", defaultArea: CustomizableUI.AREA_PANEL, onBuild: function(aDocument) { let buttons = [{ @@ -675,6 +679,7 @@ const CustomizableWidgets = [{ id: "feed-button", type: "view", viewId: "PanelUI-feeds", + tooltiptext: "feed-button.tooltiptext2", defaultArea: CustomizableUI.AREA_PANEL, onClick: function(aEvent) { let win = aEvent.target.ownerDocument.defaultView; @@ -877,7 +882,7 @@ const CustomizableWidgets = [{ } }, { id: "email-link-button", - tooltiptext: "email-link-button.tooltiptext2", + tooltiptext: "email-link-button.tooltiptext3", onCommand: function(aEvent) { let win = aEvent.view; win.MailIntegration.sendLinkForWindow(win.content); diff --git a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties index 35d80cf3bac..fcc94adb574 100644 --- a/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties +++ b/browser/locales/en-US/chrome/browser/customizableui/customizableWidgets.properties @@ -11,45 +11,42 @@ privatebrowsing-button.label = New Private Window privatebrowsing-button.tooltiptext = Open a new Private Browsing window (%S) save-page-button.label = Save Page -# LOCALIZATION NOTE(save-page-button.tooltiptext2): %S is the keyboard shortcut -# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -save-page-button.tooltiptext2 = Save this page… (%S) +# LOCALIZATION NOTE(save-page-button.tooltiptext3): %S is the keyboard shortcut +save-page-button.tooltiptext3 = Save this page (%S) find-button.label = Find -# LOCALIZATION NOTE(find-button.tooltiptext2): %S is the keyboard shortcut. -# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -find-button.tooltiptext2 = Find in this page… (%S) +# LOCALIZATION NOTE(find-button.tooltiptext3): %S is the keyboard shortcut. +find-button.tooltiptext3 = Find in this page (%S) open-file-button.label = Open File -# LOCALIZATION NOTE (open-file-button.tooltiptext2): %S is the keyboard shortcut. -# Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -open-file-button.tooltiptext2 = Open file… (%S) +# LOCALIZATION NOTE (open-file-button.tooltiptext3): %S is the keyboard shortcut. +open-file-button.tooltiptext3 = Open a file (%S) developer-button.label = Developer # LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut -developer-button.tooltiptext = Web Developer Tools (%S) +developer-button.tooltiptext2 = Open Web developer tools (%S) sidebar-button.label = Sidebars -sidebar-button.tooltiptext = Show Sidebars +sidebar-button.tooltiptext2 = Show sidebars add-ons-button.label = Add-ons -# LOCALIZATION NOTE(add-ons-button.tooltiptext2): %S is the keyboard shortcut -add-ons-button.tooltiptext2 = Open Add-ons Manager (%S) +# LOCALIZATION NOTE(add-ons-button.tooltiptext3): %S is the keyboard shortcut +add-ons-button.tooltiptext3 = Manage your add-ons (%S) switch-to-metro-button2.label = Windows 8 Touch # LOCALIZATION NOTE(switch-to-metro-button2.tooltiptext): %S is the brand short name switch-to-metro-button2.tooltiptext = Relaunch in %S for Windows 8 Touch preferences-button.label = Preferences -preferences-button.tooltiptext2 = Open Preferences -preferences-button.tooltiptext.withshortcut = Open Preferences (%S) +preferences-button.tooltiptext2 = Open preferences +preferences-button.tooltiptext.withshortcut = Open preferences (%S) # LOCALIZATION NOTE (preferences-button.labelWin): Windows-only label for Options preferences-button.labelWin = Options # LOCALIZATION NOTE (preferences-button.tooltipWin): Windows-only tooltip for Options -preferences-button.tooltipWin2 = Open Options +preferences-button.tooltipWin2 = Open options zoom-controls.label = Zoom Controls -zoom-controls.tooltiptext = Zoom Controls +zoom-controls.tooltiptext2 = Zoom controls zoom-out-button.label = Zoom out # LOCALIZATION NOTE(zoom-out-button.tooltiptext2): %S is the keyboard shortcut. @@ -67,7 +64,7 @@ zoom-in-button.label = Zoom in zoom-in-button.tooltiptext2 = Zoom in (%S) edit-controls.label = Edit Controls -edit-controls.tooltiptext = Edit Controls +edit-controls.tooltiptext2 = Edit controls cut-button.label = Cut # LOCALIZATION NOTE(cut-button.tooltiptext2): %S is the keyboard shortcut. @@ -81,21 +78,17 @@ paste-button.label = Paste # LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut. paste-button.tooltiptext2 = Paste (%S) -# LOCALIZATION NOTE (feed-button.tooltiptext): Use the unicode ellipsis char, -# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. feed-button.label = Subscribe -feed-button.tooltiptext = Subscribe to this page… +feed-button.tooltiptext2 = Subscribe to this page # LOCALIZATION NOTE (characterencoding-button.label): The \u00ad character at the beginning # of the string is used to disable auto hyphenation on the button text when it is displayed # in the menu panel. characterencoding-button.label = \u00adCharacter Encoding -characterencoding-button.tooltiptext2 = Show Character Encoding options +characterencoding-button.tooltiptext2 = Show character encoding options email-link-button.label = Email Link -# LOCALIZATION NOTE (email-link-button.tooltiptext2): Use the unicode ellipsis char, -# \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -email-link-button.tooltiptext2 = Email Link… +email-link-button.tooltiptext3 = Email a link to this page # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox), # %2$S is the keyboard shortcut