Skip to content

Commit

Permalink
Backed out changeset a877338b4740 (bug 1259859) for failures in devto…
Browse files Browse the repository at this point in the history
…ols mochitest browser_cmd_highlight_03.js. r=backout
  • Loading branch information
Archaeopteryx committed Apr 2, 2016
1 parent 79be5fd commit 2330b58
Show file tree
Hide file tree
Showing 39 changed files with 144 additions and 292 deletions.
1 change: 0 additions & 1 deletion browser/base/content/test/general/browser.ini
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ skip-if = os == "linux" # Linux: Intermittent failures, bug 917535
skip-if = os != "win" # The Fitts Law menu button is only supported on Windows (bug 969376)
[browser_middleMouse_noJSPaste.js]
[browser_minimize.js]
[browser_misused_characters_in_strings.js]
[browser_mixedcontent_securityflags.js]
tags = mcb
[browser_offlineQuotaNotification.js]
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion browser/components/search/test/browser_contextmenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ add_task(function* () {
info("checkContextMenu");
var searchItem = contextMenu.getElementsByAttribute("id", "context-searchselect")[0];
ok(searchItem, "Got search context menu item");
is(searchItem.label, 'Search ' + ENGINE_NAME + ' for \u201ctest search\u201d', "Check context menu label");
is(searchItem.label, 'Search ' + ENGINE_NAME + ' for "test search"', "Check context menu label");
is(searchItem.disabled, false, "Check that search context menu item is enabled");

yield BrowserTestUtils.openNewForegroundTab(gBrowser, () => {
Expand Down
8 changes: 4 additions & 4 deletions browser/extensions/loop/chrome/locale/en-US/loop.properties
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ call_timeout_notification_text=Your call did not go through.
cancel_button=Cancel
rejoin_button=Rejoin Conversation

cannot_start_call_session_not_ready=Cant start call, session is not ready.
cannot_start_call_session_not_ready=Can't start call, session is not ready.
network_disconnected=The network connection terminated abruptly.
connection_error_see_console_notification=Call failed; see console for details.
no_media_failure_message=No camera or microphone found.
Expand Down Expand Up @@ -194,7 +194,7 @@ room_name_untitled_page=Untitled Page

## LOCALIZATION NOTE (door_hanger_return, door_hanger_prompt_name, door_hanger_button): Dialog message on leaving conversation
door_hanger_return=See you later! You can return to this shared session at any time through the Hello panel.
door_hanger_prompt_name=Would you like to give it a name thats easier to remember? Current name:
door_hanger_prompt_name=Would you like to give it a name that's easier to remember? Current name:
door_hanger_button=OK

# Infobar strings
Expand All @@ -213,7 +213,7 @@ infobar_button_disconnect_accesskey=D
# E10s not supported strings

e10s_not_supported_button_label=Launch New Window
e10s_not_supported_subheading={{brandShortname}} doesnt work in a multi-process window.
e10s_not_supported_subheading={{brandShortname}} doesn't work in a multi-process window.
# 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/.
Expand All @@ -228,7 +228,7 @@ chat_textbox_placeholder=Type here…
clientShortname2=Firefox Hello

conversation_has_ended=Your conversation has ended.
generic_failure_message=Were having technical difficulties…
generic_failure_message=We're having technical difficulties…

generic_failure_no_reason2=Would you like to try again?

Expand Down
20 changes: 10 additions & 10 deletions browser/locales/en-US/chrome/browser/browser.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ droponhomemsg=Do you want this document to be your new home page?

# LOCALIZATION NOTE (contextMenuSearch): %1$S is the search engine,
# %2$S is the selection string.
contextMenuSearch=Search %1$S for %2$S
contextMenuSearch=Search %1$S for "%2$S"
contextMenuSearch.accesskey=S

# bookmark dialog strings
Expand Down Expand Up @@ -135,7 +135,7 @@ popupAllow=Allow pop-ups for %S
popupBlock=Block pop-ups for %S
popupWarningDontShowFromMessage=Don’t show this message when pop-ups are blocked
popupWarningDontShowFromLocationbar=Don’t show info bar when pop-ups are blocked
popupShowPopupPrefix=Show ‘%S’
popupShowPopupPrefix=Show '%S'

# Bad Content Blocker Doorhanger Notification
# %S is brandShortName
Expand Down Expand Up @@ -164,30 +164,30 @@ keywordURIFixup.dismiss.accesskey=N
# LOCALIZATION NOTE (pluginActivateNew.message): Used for newly-installed
# plugins which are not known to be unsafe. %1$S is the plugin name and %2$S
# is the site domain.
pluginActivateNew.message=Allow %2$S to run %1$S?
pluginActivateNew.message=Allow %2$S to run "%1$S"?
pluginActivateMultiple.message=Allow %S to run plugins?
pluginActivate.learnMore=Learn More…
# LOCALIZATION NOTE (pluginActivateOutdated.message, pluginActivateOutdated.label):
# These strings are used when an unsafe plugin has an update available.
# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
pluginActivateOutdated.message=%3$S has prevented the outdated plugin %1$S from running on %2$S.
pluginActivateOutdated.message=%3$S has prevented the outdated plugin "%1$S" from running on %2$S.
pluginActivateOutdated.label=Outdated plugin
pluginActivate.updateLabel=Update now…
# LOCALIZATION NOTE (pluginActivateVulnerable.message, pluginActivateVulnerable.label):
# These strings are used when an unsafe plugin has no update available.
# %1$S is the plugin name, %2$S is the domain, and %3$S is brandShortName.
pluginActivateVulnerable.message=%3$S has prevented the unsafe plugin %1$S from running on %2$S.
pluginActivateVulnerable.message=%3$S has prevented the unsafe plugin "%1$S" from running on %2$S.
pluginActivateVulnerable.label=Vulnerable plugin!
pluginActivate.riskLabel=What’s the risk?
# LOCALIZATION NOTE (pluginActivateBlocked.message): %1$S is the plugin name, %2$S is brandShortName
pluginActivateBlocked.message=%2$S has blocked %1$S for your protection.
pluginActivateBlocked.message=%2$S has blocked "%1$S" for your protection.
pluginActivateBlocked.label=Blocked for your protection
pluginActivateDisabled.message=“%S” is disabled.
pluginActivateDisabled.message="%S" is disabled.
pluginActivateDisabled.label=Disabled
pluginActivateDisabled.manage=Manage plugins…
pluginEnabled.message=“%S” is enabled on %S.
pluginEnabledOutdated.message=Outdated plugin “%S” is enabled on %S.
pluginEnabledVulnerable.message=Insecure plugin “%S” is enabled on %S.
pluginEnabled.message="%S" is enabled on %S.
pluginEnabledOutdated.message=Outdated plugin "%S" is enabled on %S.
pluginEnabledVulnerable.message=Insecure plugin "%S" is enabled on %S.
pluginInfo.unknownPlugin=Unknown

# LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ shortTimeLeftDays=%1$Sd
statusSeparator=%1$S \u2014 %2$S
statusSeparatorBeforeNumber=%1$S \u2014 %2$S

fileExecutableSecurityWarning=“%S” is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch “%S”?
fileExecutableSecurityWarning="%S" is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch "%S"?
fileExecutableSecurityWarningTitle=Open Executable File?
fileExecutableSecurityWarningDontAsk=Don’t ask me this again

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

duplicateTitle=Duplicate Keyword
duplicateEngineMsg=You have chosen a keyword that is currently in use by “%S”. Please select another.
duplicateEngineMsg=You have chosen a keyword that is currently in use by "%S". Please select another.
duplicateBookmarkMsg=You have chosen a keyword that is currently in use by a bookmark. Please select another.
10 changes: 5 additions & 5 deletions browser/locales/en-US/chrome/browser/feeds/subscribe.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

linkTitleTextFormat=Go to %S
addHandler=Add “%S” (%S) as a Feed Reader?
addHandler=Add "%S" (%S) as a Feed Reader?
addHandlerAddButton=Add Feed Reader
addHandlerAddButtonAccesskey=A
handlerRegistered=“%S” is already registered as a Feed Reader
handlerRegistered="%S" is already registered as a Feed Reader
liveBookmarks=Live Bookmarks
subscribeNow=Subscribe Now
chooseApplicationMenuItem=Choose Application…
Expand Down Expand Up @@ -37,9 +37,9 @@ subscribeFeedUsing=Subscribe to this feed using
subscribeAudioPodcastUsing=Subscribe to this podcast using
subscribeVideoPodcastUsing=Subscribe to this video podcast using

feedSubscriptionFeed1=This is a feed of frequently changing content on this site.
feedSubscriptionAudioPodcast1=This is a podcast of frequently changing content on this site.
feedSubscriptionVideoPodcast1=This is a video podcast of frequently changing content on this site.
feedSubscriptionFeed1=This is a "feed" of frequently changing content on this site.
feedSubscriptionAudioPodcast1=This is a "podcast" of frequently changing content on this site.
feedSubscriptionVideoPodcast1=This is a "video podcast" of frequently changing content on this site.

feedSubscriptionFeed2=You can subscribe to this feed to receive updates when this content changes.
feedSubscriptionAudioPodcast2=You can subscribe to this podcast to receive updates when this content changes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dialogTitleAddBookmark=New Bookmark
dialogTitleAddLivemark=Subscribe with Live Bookmark
dialogTitleAddFolder=New Folder
dialogTitleAddMulti=New Bookmarks
dialogTitleEdit=Properties for “%S”
dialogTitleEdit=Properties for "%S"

bookmarkAllTabsDefault=[Folder Name]
newFolderDefault=New Folder
Expand Down
4 changes: 2 additions & 2 deletions browser/locales/en-US/chrome/browser/places/places.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ bookmarksRestoreParseError=Unable to process the backup file.
bookmarksLivemarkLoading=Live Bookmark loading…
bookmarksLivemarkFailed=Live Bookmark feed failed to load.

menuOpenLivemarkOrigin.label=Open “%S”
menuOpenLivemarkOrigin.label=Open "%S"

sortByName=Sort ‘%S’ by Name
sortByName=Sort '%S' by Name
sortByNameGeneric=Sort by Name
# LOCALIZATION NOTE (view.sortBy.1.name.label): sortBy properties are versioned.
# When any of these changes, all of the properties must be bumped, and the
Expand Down
2 changes: 1 addition & 1 deletion browser/locales/en-US/chrome/browser/search.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cmd_showSuggestions_accesskey=S
# LOCALIZATION NOTE (cmd_addFoundEngine): %S is replaced by the name of
# a search engine offered by a web page. Each engine is displayed as a
# menuitem at the bottom of the search panel.
cmd_addFoundEngine=Add “%S”
cmd_addFoundEngine=Add "%S"
# LOCALIZATION NOTE (cmd_addFoundEngineMenu): When more than 5 engines
# are offered by a web page, instead of listing all of them in the
# search panel using the cmd_addFoundEngine string, they will be
Expand Down
14 changes: 7 additions & 7 deletions browser/locales/en-US/chrome/browser/webrtcIndicator.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ webrtcIndicator.sharingBrowser.tooltip = A tab is being shared. Click to control

# LOCALIZATION NOTE (webrtcIndicator.sharing*With.menuitem):
# %S is the title of the tab using the share.
webrtcIndicator.sharingCameraWith.menuitem = Sharing Camera with “%S”
webrtcIndicator.sharingMicrophoneWith.menuitem = Sharing Microphone with “%S”
webrtcIndicator.sharingApplicationWith.menuitem = Sharing an Application with “%S”
webrtcIndicator.sharingScreenWith.menuitem = Sharing Screen with “%S”
webrtcIndicator.sharingWindowWith.menuitem = Sharing a Window with “%S”
webrtcIndicator.sharingBrowserWith.menuitem = Sharing a Tab with “%S”
webrtcIndicator.sharingCameraWith.menuitem = Sharing Camera with "%S"
webrtcIndicator.sharingMicrophoneWith.menuitem = Sharing Microphone with "%S"
webrtcIndicator.sharingApplicationWith.menuitem = Sharing an Application with "%S"
webrtcIndicator.sharingScreenWith.menuitem = Sharing Screen with "%S"
webrtcIndicator.sharingWindowWith.menuitem = Sharing a Window with "%S"
webrtcIndicator.sharingBrowserWith.menuitem = Sharing a Tab with "%S"
webrtcIndicator.controlSharing.menuitem = Control Sharing
# LOCALIZATION NOTE (webrtcIndicator.sharingCameraWithNTabs.menuitem):
# Semicolon-separated list of plural forms. See:
Expand Down Expand Up @@ -58,4 +58,4 @@ webrtcIndicator.sharingWindowWithNTabs.menuitem = Sharing a Window with #1 tab;S
webrtcIndicator.sharingBrowserWithNTabs.menuitem = Sharing a Tab with #1 tab;Sharing Tabs with #1 tabs
# LOCALIZATION NOTE (webrtcIndicator.controlSharingOn.menuitem):
# %S is the title of the tab using the share.
webrtcIndicator.controlSharingOn.menuitem = Control Sharing on “%S”
webrtcIndicator.controlSharingOn.menuitem = Control Sharing on "%S"
2 changes: 1 addition & 1 deletion browser/locales/en-US/pdfviewer/viewer.properties
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,4 @@ password_cancel=Cancel
printing_not_supported=Warning: Printing is not fully supported by this browser.
printing_not_ready=Warning: The PDF is not fully loaded for printing.
web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
document_colors_not_allowed=PDF documents are not allowed to use their own colors: Allow pages to choose their own colors is deactivated in the browser.
document_colors_not_allowed=PDF documents are not allowed to use their own colors: 'Allow pages to choose their own colors' is deactivated in the browser.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ function* spawnTest() {
let lines = [
'Manifest has a character encoding of ISO-8859-1. Manifests must have the ' +
'utf-8 character encoding.',
'The first line of the manifest must be \u201cCACHE MANIFEST\u201d at line 1.',
'\u201cCACHE MANIFEST\u201d is only valid on the first line but was found at line 3.',
'The first line of the manifest must be "CACHE MANIFEST" at line 1.',
'"CACHE MANIFEST" is only valid on the first line but was found at line 3.',
'images/sound-icon.png points to a resource that is not available at line 9.',
'images/background.png points to a resource that is not available at line 10.',
'/checking.cgi points to a resource that is not available at line 13.',
Expand Down Expand Up @@ -61,7 +61,7 @@ function* spawnTest() {
'any URI not listed in the manifest will be treated as if the URI was ' +
'listed in the NETWORK section. Otherwise such URIs will be treated as ' +
'unavailable. Other uses of the * character are prohibited',
'The SETTINGS section may only contain a single value, \u201cprefer-online\u201d or \u201cfast\u201d at line 47.',
'The SETTINGS section may only contain a single value, "prefer-online" or "fast" at line 47.',
'FALLBACK section line 50 (/section1/ /offline1.html) prevents caching of ' +
'line 30 (/section1/blockedbyfallback.html) in the CACHE section.',
'/offline1.html points to a resource that is not available at line 50.',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function* spawnTest() {
},
exec: {
output: '101 nodes matched, but only 100 nodes highlighted. Use ' +
'\u2018--showall\u2019 to show all'
'\'--showall\' to show all'
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion devtools/client/commandline/test/browser_cmd_pref1.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function* spawnTest() {
status: 'ERROR',
args: {
setting: { arg: ' devtools.netmonitor.enabled' },
value: { status: 'ERROR', message: 'Can\u2019t use \u20184\u2019.' },
value: { status: 'ERROR', message: 'Can\'t use \'4\'.' },
}
},
},
Expand Down
Loading

0 comments on commit 2330b58

Please sign in to comment.