Backed out changeset 6e63ffafb422 (bug 1279647) for causing multiple failures.
authorMihai Alexandru Michis <malexandru@mozilla.com>
Thu, 15 Oct 2020 20:09:26 +0300
changeset 13655 c8e423a3e7fe6e5f3e817bcbc95993653b9285a7
parent 13654 55d5cc3938902f278f0a41d9d87d5c9df0ed75bc
child 13656 7875c27f12cad984b75dcd346be96215c5d0c614
push id281
push userflodolo@mozilla.com
push dateSat, 17 Oct 2020 11:19:19 +0000
bugs1279647
Backed out changeset 6e63ffafb422 (bug 1279647) for causing multiple failures. CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 07cdb26af0a309a0de360727d6a392ab438b5209 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 8067a375efaaaa32f7c40926ac3960cca6de162d X-Channel-Repo: releases/mozilla-release X-Channel-Revision: deabb2228274f7e9718e17be54010415eb119100 X-Channel-Repo: releases/mozilla-esr78 X-Channel-Revision: 34dd40076a4e0de25c2db1f619bf55367f67007b
browser/browser/browser.ftl
browser/browser/pageInfo.ftl
browser/browser/webrtcIndicator.ftl
browser/chrome/browser/tabbrowser.properties
browser/chrome/browser/webrtcIndicator.properties
devtools/client/animationinspector.properties
devtools/client/toolbox.properties
dom/chrome/layout/MediaDocument.properties
toolkit/chrome/mozapps/profile/profileSelection.properties
--- a/browser/browser/browser.ftl
+++ b/browser/browser/browser.ftl
@@ -11,38 +11,38 @@
 # private - "Mozilla Firefox (Private Browsing)"
 #
 # The last two are for use when there *is* a content title.
 # Variables:
 #  $content-title (String): the title of the web content.
 browser-main-window =
   .data-title-default = { -brand-full-name }
   .data-title-private = { -brand-full-name } (Private Browsing)
-  .data-content-title-default = { $content-title } — { -brand-full-name }
-  .data-content-title-private = { $content-title } — { -brand-full-name } (Private Browsing)
+  .data-content-title-default = { $content-title } - { -brand-full-name }
+  .data-content-title-private = { $content-title } - { -brand-full-name } (Private Browsing)
 
 # These are the default window titles on macOS. The first two are for use when
 # there is no content title:
 #
 # "default" - "Mozilla Firefox"
-# "private" - "Mozilla Firefox — (Private Browsing)"
+# "private" - "Mozilla Firefox - (Private Browsing)"
 #
 # The last two are for use when there *is* a content title.
 # Do not use the brand name in the last two attributes, as we do on non-macOS.
 #
 # Also note the other subtle difference here: we use a `-` to separate the
 # brand name from `(Private Browsing)`, which does not happen on other OSes.
 #
 # Variables:
 #  $content-title (String): the title of the web content.
 browser-main-window-mac =
   .data-title-default = { -brand-full-name }
-  .data-title-private = { -brand-full-name } — (Private Browsing)
+  .data-title-private = { -brand-full-name } - (Private Browsing)
   .data-content-title-default = { $content-title }
-  .data-content-title-private = { $content-title } — (Private Browsing)
+  .data-content-title-private = { $content-title } - (Private Browsing)
 
 # This gets set as the initial title, and is overridden as soon as we start
 # updating the titlebar based on loaded tabs or private browsing state.
 # This should match the `data-title-default` attribute in both
 # `browser-main-window` and `browser-main-window-mac`.
 browser-main-window-title = { -brand-full-name }
 
 ##
--- a/browser/browser/pageInfo.ftl
+++ b/browser/browser/pageInfo.ftl
@@ -241,13 +241,13 @@ media-file-size = { $size } KB
 #   $website (string) - The website name
 media-block-image =
     .label = Block Images from { $website }
     .accesskey = B
 
 # This string is used to display the URL of the website on top of the
 # pageInfo dialog box
 # Variables:
-#   $website (string) — The url of the website pageInfo is getting info for
+#   $website (string) - The url of the website pageInfo is getting info for
 page-info-page =
-    .title = Page Info — { $website }
+    .title = Page Info - { $website }
 page-info-frame =
-    .title = Frame Info — { $website }
+    .title = Frame Info - { $website }
--- a/browser/browser/webrtcIndicator.ftl
+++ b/browser/browser/webrtcIndicator.ftl
@@ -4,17 +4,17 @@
 
 # Note: This is currently placed under browser/base/content so that we can
 # get the strings to appear without having our localization community need
 # to go through and translate everything. Once these strings are ready for
 # translation, we'll move it to the locales folder.
 
 # This string is used so that the window has a title in tools that enumerate/look for window
 # titles. It is not normally visible anywhere.
-webrtc-indicator-title = { -brand-short-name } — Sharing Indicator
+webrtc-indicator-title = { -brand-short-name } - Sharing Indicator
 
 webrtc-sharing-window = You are sharing another application window.
 webrtc-sharing-browser-window = You are sharing { -brand-short-name }.
 webrtc-sharing-screen = You are sharing your entire screen.
 webrtc-stop-sharing-button = Stop Sharing
 webrtc-microphone-button =
   .title = Your microphone is being shared. Click to control sharing.
 webrtc-camera-button =
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -108,17 +108,17 @@ tabs.unblockAudio2.tooltip=Play tab;Play
 # LOCALIZATION NOTE (tabs.allowTabFocusByPromptForSite):
 # %S is the hostname of the site where dialogs are allowed to switch tabs
 tabs.allowTabFocusByPromptForSite=Allow dialogs from %S to take you to their tab
 
 # LOCALIZATION NOTE (tabs.containers.tooltip):
 # Displayed as a tooltip on container tabs
 # %1$S is the title of the current tab
 # %2$S is the name of the current container
-tabs.containers.tooltip=%1$S — %2$S
+tabs.containers.tooltip=%1$S - %2$S
 
 # LOCALIZATION NOTE (tabs.openWarningTitle, tabs.openWarningMultipleBranded, tabs.openButtonMultiple, tabs.openWarningPromptMeBranded):
 # These items are moved from chrome/browser/places/places.properties
 # Now they are not specific to bookmark.
 tabs.openWarningTitle=Confirm open
 tabs.openWarningMultipleBranded=You are about to open %S tabs.  This might slow down %S while the pages are loading.  Are you sure you want to continue?
 tabs.openButtonMultiple=Open tabs
 tabs.openWarningPromptMeBranded=Warn me when opening multiple tabs might slow down %S
--- a/browser/chrome/browser/webrtcIndicator.properties
+++ b/browser/chrome/browser/webrtcIndicator.properties
@@ -2,17 +2,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE : FILE This file contains the webrtc global indicator strings
 
 # LOCALIZATION NOTE (webrtcIndicator.windowtitle): %S is the brand name (e.g. Firefox).
 # This string is used so that the window has a title in tools that enumerate/look for window
 # titles. It is not normally visible anywhere.
-webrtcIndicator.windowtitle = %S — Sharing Indicator
+webrtcIndicator.windowtitle = %S - Sharing Indicator
 
 webrtcIndicator.sharingCameraAndMicrophone.tooltip = Your camera and microphone are being shared. Click to control sharing.
 webrtcIndicator.sharingCamera.tooltip              = Your camera is being shared. Click to control sharing.
 webrtcIndicator.sharingMicrophone.tooltip          = Your microphone is being shared. Click to control sharing.
 webrtcIndicator.sharingApplication.tooltip = An application is being shared. Click to control sharing.
 webrtcIndicator.sharingScreen.tooltip = Your screen is being shared. Click to control sharing.
 webrtcIndicator.sharingWindow.tooltip = A window is being shared. Click to control sharing.
 webrtcIndicator.sharingBrowser.tooltip = A tab is being shared. Click to control sharing.
--- a/devtools/client/animationinspector.properties
+++ b/devtools/client/animationinspector.properties
@@ -144,29 +144,29 @@ timeline.rewindButtonTooltip=Rewind the 
 # graduation, to indicate what duration (in milliseconds) this graduation
 # corresponds to.
 timeline.timeGraduationLabel=%Sms
 
 # LOCALIZATION NOTE (timeline.cssanimation.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Animation in the timeline UI.
 # %S will be replaced by the name of the animation at run-time.
-timeline.cssanimation.nameLabel=%S — CSS Animation
+timeline.cssanimation.nameLabel=%S - CSS Animation
 
 # LOCALIZATION NOTE (timeline.csstransition.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a CSS Transition in the timeline UI.
 # %S will be replaced by the name of the transition at run-time.
-timeline.csstransition.nameLabel=%S — CSS Transition
+timeline.csstransition.nameLabel=%S - CSS Transition
 
 # LOCALIZATION NOTE (timeline.scriptanimation.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over the name of a script-generated animation in the timeline UI.
 # %S will be replaced by the name of the animation at run-time.
-timeline.scriptanimation.nameLabel=%S — Script Animation
+timeline.scriptanimation.nameLabel=%S - Script Animation
 
 # LOCALIZATION NOTE (timeline.scriptanimation.unnamedLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
 # when hovering over an unnamed script-generated animation in the timeline UI.
 timeline.scriptanimation.unnamedLabel=Script Animation
 
 # LOCALIZATION NOTE (timeline.unknown.nameLabel):
 # This string is displayed in a tooltip of the animation panel that is shown
--- a/devtools/client/toolbox.properties
+++ b/devtools/client/toolbox.properties
@@ -1,22 +1,22 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # LOCALIZATION NOTE (toolbox.titleTemplate1): This is the template
 # used to format the title of the toolbox.
 # The URL of the page being targeted: %1$S.
-toolbox.titleTemplate1=Developer Tools — %1$S
+toolbox.titleTemplate1=Developer Tools - %1$S
 
 # LOCALIZATION NOTE (toolbox.titleTemplate2): This is the template
 # used to format the title of the toolbox.
 # The page title or other name for the thing being targeted: %1$S
 # The URL of the page being targeted: %2$S.
-toolbox.titleTemplate2=Developer Tools — %1$S — %2$S
+toolbox.titleTemplate2=Developer Tools - %1$S - %2$S
 
 # LOCALIZATION NOTE (toolbox.multiProcessBrowserToolboxTitle): Title used for
 # the Browser Toolbox when the pref `devtools.browsertoolbox.fission` is true.
 # This Browser Toolbox allows to debug the parent process as well as the content
 # processes in the same toolbox.
 toolbox.multiProcessBrowserToolboxTitle=Multiprocess Browser Toolbox
 
 # LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -13,9 +13,9 @@ ImageTitleWithoutDimensions=%S (%S Image
 ImageTitleWithDimensions2=(%S Image, %S\u00A0\u00D7\u00A0%S pixels)
 ImageTitleWithNeitherDimensionsNorFile=(%S Image)
 MediaTitleWithFile=%S (%S Object)
 MediaTitleWithNoInfo=(%S Object)
 
 InvalidImage=The image \u201c%S\u201d cannot be displayed because it contains errors.
 ScaledImage=Scaled (%S%%)
 
-TitleWithStatus=%S — %S
+TitleWithStatus=%S - %S
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -9,17 +9,17 @@
 restartTitle=Close %S
 restartMessageNoUnlocker2=%S is already running, but is not responding. To use %S, you must first close the existing %S process, restart your device, or use a different profile.
 restartMessageUnlocker=%S is already running, but is not responding. The old %S process must be closed to open a new window.
 restartMessageNoUnlockerMac=A copy of %S is already open. Only one copy of %S can be open at a time.
 restartMessageUnlockerMac=A copy of %S is already open. The running copy of %S will quit in order to open this one.
 
 # Profile manager
 # LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S is the path to the profile folder.
-profileTooltip=Profile: ‘%S’ — Path: ‘%S’
+profileTooltip=Profile: ‘%S’ - Path: ‘%S’
 
 pleaseSelectTitle=Select Profile
 pleaseSelect=Please select a profile to begin %S, or create a new profile.
 
 renameProfileTitle=Rename Profile
 renameProfilePrompt=Rename the profile “%S” to:
 
 profileNameInvalidTitle=Invalid profile name