diff options
author | Gaming4JC <g4jc@bulletmail.org> | 2018-10-20 17:32:25 -0400 |
---|---|---|
committer | Gaming4JC <g4jc@bulletmail.org> | 2018-10-20 17:32:25 -0400 |
commit | ed7558c44bb6cf0054b0aeeae84e9dbdfbf8aa8b (patch) | |
tree | 2aeb74ad8d69f66b90901ad96bedf64ac89da12b | |
parent | 976c0fcb0e2e89b3ded27aa3f281321c835910dc (diff) | |
download | iceweasel-uxp-ed7558c44bb6cf0054b0aeeae84e9dbdfbf8aa8b.tar.gz |
backport: Remove and tidy remaining translator references
27 files changed, 15 insertions, 943 deletions
diff --git a/base/content/browser.css b/base/content/browser.css index cffe34c..02e60ed 100644 --- a/base/content/browser.css +++ b/base/content/browser.css @@ -929,11 +929,6 @@ html|*#gcli-output-frame, transition: none; } -/* Translation */ -notification[value="translation"] { - -moz-binding: url("chrome://browser/content/translation-infobar.xml#translationbar"); -} - /** See bug 872317 for why the following rule is necessary. */ #downloads-button { diff --git a/base/content/browser.js b/base/content/browser.js index 283159b..257c398 100755 --- a/base/content/browser.js +++ b/base/content/browser.js @@ -43,7 +43,6 @@ Cu.import("resource://gre/modules/NotificationDB.jsm"); ["SitePermissions", "resource:///modules/SitePermissions.jsm"], ["TabCrashHandler", "resource:///modules/ContentCrashHandlers.jsm"], ["Task", "resource://gre/modules/Task.jsm"], - ["Translation", "resource:///modules/translation/Translation.jsm"], ["UpdateUtils", "resource://gre/modules/UpdateUtils.jsm"], ["Weave", "resource://services-sync/main.js"], ["fxAccounts", "resource://gre/modules/FxAccounts.jsm"], @@ -940,7 +939,6 @@ var gBrowserInit = { // the listener is registered. DOMLinkHandler.init(); gPageStyleMenu.init(); - LanguageDetectionListener.init(); BrowserOnClick.init(); FeedHandler.init(); DevEdition.init(); @@ -5589,16 +5587,6 @@ function setStyleDisabled(disabled) { gPageStyleMenu.disableStyle(); } - -var LanguageDetectionListener = { - init: function() { - window.messageManager.addMessageListener("Translation:DocumentState", msg => { - Translation.documentStateReceived(msg.target, msg.data); - }); - } -}; - - var BrowserOffline = { _inited: false, diff --git a/base/content/browser.xul b/base/content/browser.xul index 0e6ea75..e8c9e92 100644 --- a/base/content/browser.xul +++ b/base/content/browser.xul @@ -671,12 +671,6 @@ tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/> <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button" tooltiptext="&urlbar.servicesNotificationAnchor.tooltip;"/> - <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button" - tooltiptext="&urlbar.translateNotificationAnchor.tooltip;"/> - <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button" - tooltiptext="&urlbar.translatedNotificationAnchor.tooltip;"/> - <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button" - tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/> </box> <image id="tracking-protection-icon"/> <image id="connection-icon"/> diff --git a/components/preferences/in-content/content.js b/components/preferences/in-content/content.js index ab72f3a..a2a3e8a 100644 --- a/components/preferences/in-content/content.js +++ b/components/preferences/in-content/content.js @@ -52,6 +52,8 @@ var gContentPane = { gContentPane.configureFonts); setEventListener("colors", "command", gContentPane.configureColors); + setEventListener("chooseLanguage", "command", + gContentPane.showLanguages); setEventListener("notificationsDoNotDisturb", "command", gContentPane.toggleDoNotDisturbNotifications); @@ -240,21 +242,6 @@ var gContentPane = { gSubDialog.open("chrome://browser/content/preferences/languages.xul"); }, - /** - * Displays the translation exceptions dialog where specific site and language - * translation preferences can be set. - */ - showTranslationExceptions: function () - { - gSubDialog.open("chrome://browser/content/preferences/translation.xul"); - }, - - openTranslationProviderAttribution: function () - { - Components.utils.import("resource:///modules/translation/Translation.jsm"); - Translation.openProviderAttribution(); - }, - toggleDoNotDisturbNotifications: function (event) { AlertsServiceDND.manualDoNotDisturb = event.target.checked; diff --git a/components/preferences/in-content/content.xul b/components/preferences/in-content/content.xul index 6823515..b3a7f29 100644 --- a/components/preferences/in-content/content.xul +++ b/components/preferences/in-content/content.xul @@ -145,3 +145,15 @@ </rows> </grid> </groupbox> + +<!-- Languages --> +<groupbox id="languagesGroup" data-category="paneContent" hidden="true"> + <caption><label>&languages.label;</label></caption> + + <hbox id="languagesBox" align="center"> + <description flex="1" control="chooseLanguage">&chooseLanguage.label;</description> + <button id="chooseLanguage" + label="&chooseButton.label;" + accesskey="&chooseButton.accesskey;"/> + </hbox> +</groupbox> diff --git a/components/preferences/jar.mn b/components/preferences/jar.mn index 6287c38..e23e189 100644 --- a/components/preferences/jar.mn +++ b/components/preferences/jar.mn @@ -25,5 +25,3 @@ browser.jar: content/browser/preferences/sanitize.js content/browser/preferences/selectBookmark.xul content/browser/preferences/selectBookmark.js - content/browser/preferences/translation.xul - content/browser/preferences/translation.js diff --git a/components/preferences/translation.js b/components/preferences/translation.js deleted file mode 100644 index cd570db..0000000 --- a/components/preferences/translation.js +++ /dev/null @@ -1,255 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */ -/* 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/. */ - -"use strict"; - -var {classes: Cc, interfaces: Ci, utils: Cu} = Components; - -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/Services.jsm"); - -XPCOMUtils.defineLazyGetter(this, "gLangBundle", () => - Services.strings.createBundle("chrome://global/locale/languageNames.properties")); - -const kPermissionType = "translate"; -const kLanguagesPref = "browser.translation.neverForLanguages"; - -function Tree(aId, aData) -{ - this._data = aData; - this._tree = document.getElementById(aId); - this._tree.view = this; -} - -Tree.prototype = { - get boxObject() { - return this._tree.treeBoxObject; - }, - get isEmpty() { - return !this._data.length; - }, - get hasSelection() { - return this.selection.count > 0; - }, - getSelectedItems: function() { - let result = []; - - let rc = this.selection.getRangeCount(); - for (let i = 0; i < rc; ++i) { - let min = {}, max = {}; - this.selection.getRangeAt(i, min, max); - for (let j = min.value; j <= max.value; ++j) - result.push(this._data[j]); - } - - return result; - }, - - // nsITreeView implementation - get rowCount() { - return this._data.length; - }, - getCellText: function (aRow, aColumn) { - return this._data[aRow]; - }, - isSeparator: function(aIndex) { - return false; - }, - isSorted: function() { - return false; - }, - isContainer: function(aIndex) { - return false; - }, - setTree: function(aTree) {}, - getImageSrc: function(aRow, aColumn) {}, - getProgressMode: function(aRow, aColumn) {}, - getCellValue: function(aRow, aColumn) {}, - cycleHeader: function(column) {}, - getRowProperties: function(row) { - return ""; - }, - getColumnProperties: function(column) { - return ""; - }, - getCellProperties: function(row, column) { - return ""; - }, - QueryInterface: XPCOMUtils.generateQI([Ci.nsITreeView]) -}; - -function Lang(aCode) -{ - this.langCode = aCode; - this._label = gLangBundle.GetStringFromName(aCode); -} - -Lang.prototype = { - toString: function() { - return this._label; - } -} - -var gTranslationExceptions = { - onLoad: function() { - if (this._siteTree) { - // Re-using an open dialog, clear the old observers. - this.uninit(); - } - - // Load site permissions into an array. - this._sites = []; - let enumerator = Services.perms.enumerator; - while (enumerator.hasMoreElements()) { - let perm = enumerator.getNext().QueryInterface(Ci.nsIPermission); - - if (perm.type == kPermissionType && - perm.capability == Services.perms.DENY_ACTION) { - this._sites.push(perm.principal.origin); - } - } - Services.obs.addObserver(this, "perm-changed", false); - this._sites.sort(); - - this._siteTree = new Tree("sitesTree", this._sites); - this.onSiteSelected(); - - this._langs = this.getLanguageExceptions(); - Services.prefs.addObserver(kLanguagesPref, this, false); - this._langTree = new Tree("languagesTree", this._langs); - this.onLanguageSelected(); - }, - - // Get the list of languages we don't translate as an array. - getLanguageExceptions: function() { - let langs = Services.prefs.getCharPref(kLanguagesPref); - if (!langs) - return []; - - let result = langs.split(",").map(code => new Lang(code)); - result.sort(); - - return result; - }, - - observe: function(aSubject, aTopic, aData) { - if (aTopic == "perm-changed") { - if (aData == "cleared") { - if (!this._sites.length) - return; - let removed = this._sites.splice(0, this._sites.length); - this._siteTree.boxObject.rowCountChanged(0, - removed.length); - } - else { - let perm = aSubject.QueryInterface(Ci.nsIPermission); - if (perm.type != kPermissionType) - return; - - if (aData == "added") { - if (perm.capability != Services.perms.DENY_ACTION) - return; - this._sites.push(perm.principal.origin); - this._sites.sort(); - let boxObject = this._siteTree.boxObject; - boxObject.rowCountChanged(0, 1); - boxObject.invalidate(); - } - else if (aData == "deleted") { - let index = this._sites.indexOf(perm.principal.origin); - if (index == -1) - return; - this._sites.splice(index, 1); - this._siteTree.boxObject.rowCountChanged(index, -1); - this.onSiteSelected(); - return; - } - } - this.onSiteSelected(); - } - else if (aTopic == "nsPref:changed") { - this._langs = this.getLanguageExceptions(); - let change = this._langs.length - this._langTree.rowCount; - this._langTree._data = this._langs; - let boxObject = this._langTree.boxObject; - if (change) - boxObject.rowCountChanged(0, change); - boxObject.invalidate(); - this.onLanguageSelected(); - } - }, - - _handleButtonDisabling: function(aTree, aIdPart) { - let empty = aTree.isEmpty; - document.getElementById("removeAll" + aIdPart + "s").disabled = empty; - document.getElementById("remove" + aIdPart).disabled = - empty || !aTree.hasSelection; - }, - - onLanguageSelected: function() { - this._handleButtonDisabling(this._langTree, "Language"); - }, - - onSiteSelected: function() { - this._handleButtonDisabling(this._siteTree, "Site"); - }, - - onLanguageDeleted: function() { - let langs = Services.prefs.getCharPref(kLanguagesPref); - if (!langs) - return; - - let removed = this._langTree.getSelectedItems().map(l => l.langCode); - - langs = langs.split(",").filter(l => removed.indexOf(l) == -1); - Services.prefs.setCharPref(kLanguagesPref, langs.join(",")); - }, - - onAllLanguagesDeleted: function() { - Services.prefs.setCharPref(kLanguagesPref, ""); - }, - - onSiteDeleted: function() { - let removedSites = this._siteTree.getSelectedItems(); - for (let origin of removedSites) { - let principal = Services.scriptSecurityManager.createCodebasePrincipalFromOrigin(origin); - Services.perms.removeFromPrincipal(principal, kPermissionType); - } - }, - - onAllSitesDeleted: function() { - if (this._siteTree.isEmpty) - return; - - let removedSites = this._sites.splice(0, this._sites.length); - this._siteTree.boxObject.rowCountChanged(0, -removedSites.length); - - for (let origin of removedSites) { - let principal = Services.scriptSecurityManager.createCodebasePrincipalFromOrigin(origin); - Services.perms.removeFromPrincipal(principal, kPermissionType); - } - - this.onSiteSelected(); - }, - - onSiteKeyPress: function(aEvent) { - if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE) - this.onSiteDeleted(); - }, - - onLanguageKeyPress: function(aEvent) { - if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE) - this.onLanguageDeleted(); - }, - - onWindowKeyPress: function(aEvent) { - if (aEvent.keyCode == KeyEvent.DOM_VK_ESCAPE) - window.close(); - }, - - uninit: function() { - Services.obs.removeObserver(this, "perm-changed"); - Services.prefs.removeObserver(kLanguagesPref, this); - } -}; diff --git a/components/preferences/translation.xul b/components/preferences/translation.xul deleted file mode 100644 index b5dfd1b..0000000 --- a/components/preferences/translation.xul +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0"?> - -<!-- 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/. --> - -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?> - -<!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/translation.dtd"> - -<window id="TranslationDialog" class="windowDialog" - windowtype="Browser:TranslationExceptions" - title="&window.title;" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - style="width: &window.width;;" - onload="gTranslationExceptions.onLoad();" - onunload="gTranslationExceptions.uninit();" - persist="screenX screenY width height" - onkeypress="gTranslationExceptions.onWindowKeyPress(event);"> - - <script src="chrome://browser/content/preferences/translation.js"/> - - <stringbundle id="bundlePreferences" - src="chrome://browser/locale/preferences/preferences.properties"/> - - <keyset> - <key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/> - </keyset> - - <vbox class="largeDialogContainer"> - <vbox class="contentPane" flex="1"> - <label id="languagesLabel" control="permissionsTree">&noTranslationForLanguages.label;</label> - <separator class="thin"/> - <tree id="languagesTree" flex="1" style="height: 12em;" - hidecolumnpicker="true" - onkeypress="gTranslationExceptions.onLanguageKeyPress(event)" - onselect="gTranslationExceptions.onLanguageSelected();"> - <treecols> - <treecol id="languageCol" label="&treehead.languageName.label;" flex="1"/> - </treecols> - <treechildren/> - </tree> - </vbox> - <hbox align="end"> - <hbox class="actionButtons" flex="1"> - <button id="removeLanguage" disabled="true" - accesskey="&removeLanguage.accesskey;" - icon="remove" label="&removeLanguage.label;" - oncommand="gTranslationExceptions.onLanguageDeleted();"/> - <button id="removeAllLanguages" - icon="clear" label="&removeAllLanguages.label;" - accesskey="&removeAllLanguages.accesskey;" - oncommand="gTranslationExceptions.onAllLanguagesDeleted();"/> - <spacer flex="1"/> - </hbox> - </hbox> - <separator/> - <vbox class="contentPane" flex="1"> - <label id="languagesLabel" control="permissionsTree">&noTranslationForSites.label;</label> - <separator class="thin"/> - <tree id="sitesTree" flex="1" style="height: 12em;" - hidecolumnpicker="true" - onkeypress="gTranslationExceptions.onSiteKeyPress(event)" - onselect="gTranslationExceptions.onSiteSelected();"> - <treecols> - <treecol id="siteCol" label="&treehead.siteName.label;" flex="1"/> - </treecols> - <treechildren/> - </tree> - </vbox> - </vbox> - <hbox align="end"> - <hbox class="actionButtons" flex="1"> - <button id="removeSite" disabled="true" - accesskey="&removeSite.accesskey;" - icon="remove" label="&removeSite.label;" - oncommand="gTranslationExceptions.onSiteDeleted();"/> - <button id="removeAllSites" - icon="clear" label="&removeAllSites.label;" - accesskey="&removeAllSites.accesskey;" - oncommand="gTranslationExceptions.onAllSitesDeleted();"/> - <spacer flex="1"/> - <button oncommand="close();" icon="close" - label="&button.close.label;" accesskey="&button.close.accesskey;"/> - </hbox> - </hbox> -</window> diff --git a/locales/en-US/chrome/browser/browser.dtd b/locales/en-US/chrome/browser/browser.dtd index ccdf6ee..3475af3 100644 --- a/locales/en-US/chrome/browser/browser.dtd +++ b/locales/en-US/chrome/browser/browser.dtd @@ -206,8 +206,6 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY urlbar.webRTCShareScreenNotificationAnchor.tooltip "Manage sharing your windows or screen with the site"> <!ENTITY urlbar.servicesNotificationAnchor.tooltip "Open install message panel"> -<!ENTITY urlbar.translateNotificationAnchor.tooltip "Translate this page"> -<!ENTITY urlbar.translatedNotificationAnchor.tooltip "Manage page translation"> <!ENTITY urlbar.emeNotificationAnchor.tooltip "Manage use of DRM software"> <!ENTITY urlbar.cameraBlocked.tooltip "You have blocked your camera for this website."> diff --git a/locales/en-US/chrome/browser/preferences/content.dtd b/locales/en-US/chrome/browser/preferences/content.dtd index 5d58ffa..d1d83b3 100644 --- a/locales/en-US/chrome/browser/preferences/content.dtd +++ b/locales/en-US/chrome/browser/preferences/content.dtd @@ -38,21 +38,6 @@ <!ENTITY chooseButton.label "Choose…"> <!ENTITY chooseButton.accesskey "o"> -<!ENTITY translateWebPages.label "Translate web content"> -<!ENTITY translateWebPages.accesskey "T"> -<!ENTITY translateExceptions.label "Exceptions…"> -<!ENTITY translateExceptions.accesskey "x"> - -<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo, - - translation.options.attribution.afterLogo): - - These 2 strings are displayed before and after a 'Microsoft Translator' - - logo. - - The translations for these strings should match the translations in - - browser/translation.dtd - --> -<!ENTITY translation.options.attribution.beforeLogo "Translations by"> -<!ENTITY translation.options.attribution.afterLogo ""> - <!ENTITY drmContent.label "DRM content"> <!ENTITY playDRMContent.label "Play DRM content"> diff --git a/locales/en-US/chrome/browser/preferences/translation.dtd b/locales/en-US/chrome/browser/preferences/translation.dtd deleted file mode 100644 index fc5fb2b..0000000 --- a/locales/en-US/chrome/browser/preferences/translation.dtd +++ /dev/null @@ -1,24 +0,0 @@ -<!-- 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/. --> - -<!ENTITY window.title "Exceptions - Translation"> -<!ENTITY window.width "36em"> -<!ENTITY windowClose.key "w"> - -<!ENTITY noTranslationForLanguages.label "Translation will not be offered for the following languages:"> -<!ENTITY treehead.languageName.label "Languages"> -<!ENTITY removeLanguage.label "Remove Language"> -<!ENTITY removeLanguage.accesskey "R"> -<!ENTITY removeAllLanguages.label "Remove All Languages"> -<!ENTITY removeAllLanguages.accesskey "e"> - -<!ENTITY noTranslationForSites.label "Translation will not be offered for the following sites:"> -<!ENTITY treehead.siteName.label "Sites"> -<!ENTITY removeSite.label "Remove Site"> -<!ENTITY removeSite.accesskey "S"> -<!ENTITY removeAllSites.label "Remove All Sites"> -<!ENTITY removeAllSites.accesskey "i"> - -<!ENTITY button.close.label "Close"> -<!ENTITY button.close.accesskey "C"> diff --git a/locales/en-US/chrome/browser/translation.dtd b/locales/en-US/chrome/browser/translation.dtd deleted file mode 100644 index ca8bb9d..0000000 --- a/locales/en-US/chrome/browser/translation.dtd +++ /dev/null @@ -1,75 +0,0 @@ -<!-- 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 (translation.thisPageIsIn.label, - - translation.translateThisPage.label): - - These 2 strings are used to construct a sentence that contains a dropdown - - showing the detected language of the current web page. - - In en-US it looks like this: - - This page is in [detected language] Translate this page? - - "detected language" here is a language name coming from the - - global/languageNames.properties file; for some locales it may not be in - - the correct grammar case to keep the same structure of the original - - sentence. --> -<!ENTITY translation.thisPageIsIn.label "This page is in"> -<!ENTITY translation.translateThisPage.label "Translate this page?"> -<!ENTITY translation.translate.button "Translate"> -<!ENTITY translation.notNow.button "Not Now"> - -<!ENTITY translation.translatingContent.label "Translating page content…"> - -<!-- LOCALIZATION NOTE (translation.translatedFrom.label, - - translation.translatedTo.label, - - translation.translatedToSuffix.label): - - These 3 strings are used to construct a sentence that contains 2 dropdowns - - showing the source and target language of a translated web page. - - In en-US it looks like this: - - This page has been translated from [from language] to [to language] - - "from language" and "to language" here are language names coming from the - - global/languageNames.properties file; for some locales they may not be in - - the correct grammar case to keep the same structure of the original - - sentence. - - - - translation.translatedToSuffix.label (empty in en-US) is for locales that - - need to display some text after the second drop down for the sentence to - - be grammatically correct. --> -<!ENTITY translation.translatedFrom.label "This page has been translated from"> -<!ENTITY translation.translatedTo.label "to"> -<!ENTITY translation.translatedToSuffix.label ""> - -<!ENTITY translation.showOriginal.button "Show Original"> -<!ENTITY translation.showTranslation.button "Show Translation"> - -<!ENTITY translation.errorTranslating.label "There has been an error translating this page."> -<!ENTITY translation.tryAgain.button "Try Again"> - -<!ENTITY translation.serviceUnavailable.label "Translation is not available at the moment. Please try again later."> - -<!ENTITY translation.options.menu "Options"> -<!-- LOCALIZATION NOTE (translation.options.neverForSite.accesskey, - - translation.options.preferences.accesskey): - - The accesskey values used here should not clash with the value used for - - translation.options.neverForLanguage.accesskey in translation.properties - --> -<!ENTITY translation.options.neverForSite.label "Never translate this site"> -<!ENTITY translation.options.neverForSite.accesskey "e"> -<!ENTITY translation.options.preferences.label "Translation preferences"> -<!ENTITY translation.options.preferences.accesskey "T"> - -<!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo, - - translation.options.attribution.afterLogo): - - These 2 strings are displayed before and after a 'Microsoft Translator' - - logo. - --> -<!ENTITY translation.options.attribution.beforeLogo "Translations by"> -<!ENTITY translation.options.attribution.afterLogo ""> - -<!-- LOCALIZATION NOTE (translation.options.attribution.poweredByYandex, - translation.options.attribution.beforeLogo, - - translation.options.attribution.afterLogo): - - translation.options.attribution.poweredByYandex is displayed instead of - - the other two strings when yandex translation engine is preferred by the - - user. - --> -<!ENTITY translation.options.attribution.yandexTranslate "Powered by Yandex.Translate"> diff --git a/locales/en-US/chrome/browser/translation.properties b/locales/en-US/chrome/browser/translation.properties deleted file mode 100644 index e62edbd..0000000 --- a/locales/en-US/chrome/browser/translation.properties +++ /dev/null @@ -1,12 +0,0 @@ -# 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 (translation.options.neverForLanguage.label): -# %S is a language name coming from the global/languageNames.properties file. -translation.options.neverForLanguage.label=Never translate %S - -# LOCALIZATION NOTE (translation.options.neverForLanguage.accesskey): -# The accesskey value used here should not clash with the values used for -# translation.options.*.accesskey in translation.dtd -translation.options.neverForLanguage.accesskey=N diff --git a/locales/jar.mn b/locales/jar.mn index 6295fef..dabc889 100644 --- a/locales/jar.mn +++ b/locales/jar.mn @@ -42,8 +42,6 @@ locale/browser/shellservice.properties (%chrome/browser/shellservice.properties) locale/browser/tabbrowser.properties (%chrome/browser/tabbrowser.properties) locale/browser/taskbar.properties (%chrome/browser/taskbar.properties) - locale/browser/translation.dtd (%chrome/browser/translation.dtd) - locale/browser/translation.properties (%chrome/browser/translation.properties) locale/browser/webrtcIndicator.properties (%chrome/browser/webrtcIndicator.properties) locale/browser/downloads/downloads.dtd (%chrome/browser/downloads/downloads.dtd) locale/browser/downloads/downloads.properties (%chrome/browser/downloads/downloads.properties) @@ -82,7 +80,6 @@ locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd) locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd) locale/browser/preferences/search.dtd (%chrome/browser/preferences/search.dtd) - locale/browser/preferences/translation.dtd (%chrome/browser/preferences/translation.dtd) locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd) locale/browser/syncSetup.dtd (%chrome/browser/syncSetup.dtd) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) diff --git a/themes/linux/browser.css b/themes/linux/browser.css index f9bd0bb..fbc5b65 100644 --- a/themes/linux/browser.css +++ b/themes/linux/browser.css @@ -840,80 +840,6 @@ menuitem.bookmark-item { outline: 1px dotted -moz-DialogText; } -/* Translation infobar */ - -%include ../shared/translation/infobar.inc.css - -notification[value="translation"] { - min-height: 40px; -} - -notification[value="translation"], -notification[value="translation"] button, -notification[value="translation"] menulist { - min-height: 30px; - color: #5A5959; -} - -notification[value="translation"] { - background-color: #F2F1F0; -} - -notification[value="translation"] button, -notification[value="translation"] menulist { - padding-inline-end: 1ch; -} - -notification[value="translation"] menulist { - border: 1px solid #C1C1C1; - background-color: #FFF; -} - -notification[value="translation"] button { - border: 1px solid #C1C1C1; - background-color: #F2F1F0; -} - -notification[value="translation"] button, -notification[value="translation"] menulist, -notification[value="translation"] menulist > .menulist-label-box { - margin-inline-start: 1ch; - margin-inline-end: 1ch; -} - -notification[value="translation"] button:hover, -notification[value="translation"] button:active, -notification[value="translation"] menulist:hover, -notification[value="translation"] menulist:active { - background-color: #E2E1E0; -} - -notification[value="translation"] button[anonid="translate"] { - color: #FFF; - background-image: linear-gradient(#9FB938, #8DA726); - box-shadow: none; - border: 1px solid #829C1C; -} - -notification[value="translation"] button[anonid="translate"]:hover, -notification[value="translation"] button[anonid="translate"]:active { - background-image: linear-gradient(#8DA726, #8DA726); -} - -notification[value="translation"] button > .button-box, -notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker { - padding: 0; - margin-inline-start: 3ch; -} - -notification[value="translation"] button:not([type="menu"]) > .button-box { - margin-inline-end: 3ch; -} - -notification[value="translation"] menulist > .menulist-dropmarker { - display: block; -} - /* AutoComplete */ %include ../shared/autocomplete.inc.css diff --git a/themes/linux/preferences/preferences.css b/themes/linux/preferences/preferences.css index 45e2dc2..5c1b102 100644 --- a/themes/linux/preferences/preferences.css +++ b/themes/linux/preferences/preferences.css @@ -20,12 +20,6 @@ font-weight: bold; } -/* Content Pane */ -#translationAttributionImage { - width: 70px; - cursor: pointer; -} - /* Modeless Window Dialogs */ .windowDialog, .windowDialog prefpane { diff --git a/themes/osx/browser.css b/themes/osx/browser.css index 808bb20..70f1f61 100644 --- a/themes/osx/browser.css +++ b/themes/osx/browser.css @@ -2920,139 +2920,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { 0 0 3px 2px -moz-mac-focusring; } -/* Translation */ - -%include ../shared/translation/infobar.inc.css - -notification[value="translation"] { - color: #484848; - background-color: #EFEFEF; - background-image: none; - border-top: none; - border-bottom: 1px solid #c4c4c4; - padding-top: 1px; - padding-bottom: 1px; - min-height: 35px; -} - -.translate-infobar-element { - margin-top: 0 !important; - margin-bottom: 0 !important; -} - -button.translate-infobar-element { - background: linear-gradient(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.1)) repeat scroll 0% 0% padding-box transparent; - color: #333333; - border: 1px solid; - border-color: rgba(23, 51, 78, 0.15) rgba(23, 51, 78, 0.17) rgba(23, 51, 78, 0.2); - box-shadow: 0px 0px 2px rgba(255, 255, 255, 0.5) inset, 0px 1px 0px rgba(255, 255, 255, 0.2); - transition-property: background-color, border-color, box-shadow; - transition-duration: 150ms; - min-height: 22px; - min-width: 0; - padding: 0 0.8em !important; - margin-left: 0.25em; - margin-right: 0.25em; -} - -button.translate-infobar-element .button-text { - margin-left: 0 !important; - margin-right: 0 !important; -} - -label.translate-infobar-element { - padding-top: 2px; -} - -button.translate-infobar-element:hover { - background: #f0f0f0; - box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset, 0 0 0 1px hsla(0,0%,100%,.05) inset, 0 1px 0 hsla(210,54%,20%,.01), 0 0 4px hsla(206,100%,20%,.1); -} - -button.translate-infobar-element:active { - box-shadow: 0 1px 1px hsla(211,79%,6%,.1) inset, 0 0 1px hsla(211,79%,6%,.2) inset; - transition-duration: 0ms; -} - -button.translate-infobar-element[anonid="translate"] { - color: #ffffff; - background: linear-gradient(#4cb1ff, #1793e5); - box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset, 0 0 0 1px hsla(0,0%,100%,.1) inset, 0 1px 0 hsla(210,54%,20%,.03); - border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2); - padding: 0 1.1em !important;; -} - -button.translate-infobar-element[anonid="translate"]:hover { - background-image: linear-gradient(#66bdff, #0d9eff); - box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset, 0 0 0 1px hsla(0,0%,100%,.1) inset, 0 1px 0 hsla(210,54%,20%,.03), 0 0 4px hsla(206,100%,20%,.2); -} - -button.translate-infobar-element.options-menu-button { - padding-inline-start: 0.5em !important; - padding-inline-end: 0em !important; -} - -button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker { - display: -moz-box; - list-style-image: url("chrome://global/skin/icons/glyph-dropdown.png"); - padding: 0 !important; - margin: 0 !important; -} - -@media (min-resolution: 2dppx) { - button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker { - list-style-image: url("chrome://global/skin/icons/glyph-dropdown@2x.png"); - } - - button.translate-infobar-element.options-menu-button > .button-box > .button-menu-dropmarker > .dropmarker-icon { - width: 8px; - } -} - -menulist.translate-infobar-element { - text-shadow: 0 1px 1px #FEFFFE; - border: 1px solid; - border-color: rgba(23, 51, 78, 0.15) rgba(23, 51, 78, 0.17) rgba(23, 51, 78, 0.2); - box-shadow: 0 1px 1px 0 #FFFFFF, inset 0 2px 2px 0 #FFFFFF; - background-color: #F1F1F1; - background-image: linear-gradient(#FFFFFF, rgba(255,255,255,0.1)); - color: #333333; - padding: 0; - min-height: 22px !important; -} - -menulist.translate-infobar-element > .menulist-label-box { - padding-top: 1px; - padding-inline-start: 0.3em; - margin-top: 0; - margin-bottom: 0; -} - -menulist.translate-infobar-element:hover { - background: #f0f0f0; - box-shadow: 0 1px 0 hsla(0,0%,100%,.1) inset, 0 0 0 1px hsla(0,0%,100%,.05) inset, 0 1px 0 hsla(210,54%,20%,.01), 0 0 4px hsla(206,100%,20%,.1); -} - -menulist.translate-infobar-element[open="true"] { - background-image: linear-gradient(rgba(255,255,255,0.1), - rgba(255,255,255,0.6)); -} - -menulist.translate-infobar-element > .menulist-dropmarker { - display: -moz-box; - list-style-image: url("chrome://global/skin/icons/glyph-dropdown.png"); -} - -@media (min-resolution: 2dppx) { - menulist.translate-infobar-element > .menulist-dropmarker { - list-style-image: url("chrome://global/skin/icons/glyph-dropdown@2x.png"); - } - - menulist.translate-infobar-element > .menulist-dropmarker > .dropmarker-icon { - width: 8px; - } -} - .popup-notification-body[popupid="addon-progress"], .popup-notification-body[popupid="addon-install-confirmation"] { width: 28em; diff --git a/themes/osx/preferences/preferences.css b/themes/osx/preferences/preferences.css index 4f17ec5..a8dcadc 100644 --- a/themes/osx/preferences/preferences.css +++ b/themes/osx/preferences/preferences.css @@ -49,11 +49,6 @@ caption { border-bottom: 1px solid #ccc; } -#translationAttributionImage { - width: 70px; - cursor: pointer; -} - #browserUseCurrent, #browserUseBookmark, #browserUseBlank { diff --git a/themes/shared/jar.inc.mn b/themes/shared/jar.inc.mn index f045060..eff741e 100644 --- a/themes/shared/jar.inc.mn +++ b/themes/shared/jar.inc.mn @@ -107,10 +107,6 @@ skin/classic/browser/theme-switcher-icon.png (../shared/theme-switcher-icon.png) skin/classic/browser/theme-switcher-icon@2x.png (../shared/theme-switcher-icon@2x.png) skin/classic/browser/toolbarbutton-dropdown-arrow.png (../shared/toolbarbutton-dropdown-arrow.png) - skin/classic/browser/translating-16.png (../shared/translation/translating-16.png) - skin/classic/browser/translating-16@2x.png (../shared/translation/translating-16@2x.png) - skin/classic/browser/translation-16.png (../shared/translation/translation-16.png) - skin/classic/browser/translation-16@2x.png (../shared/translation/translation-16@2x.png) skin/classic/browser/undoCloseTab.png (../shared/undoCloseTab.png) skin/classic/browser/undoCloseTab@2x.png (../shared/undoCloseTab@2x.png) skin/classic/browser/update-badge.svg (../shared/update-badge.svg) diff --git a/themes/shared/notification-icons.inc.css b/themes/shared/notification-icons.inc.css index 86dce73..c648713 100644 --- a/themes/shared/notification-icons.inc.css +++ b/themes/shared/notification-icons.inc.css @@ -269,28 +269,4 @@ html|*#webRTC-previewVideo { to { opacity: 1; } -} - -/* TRANSLATION */ - -.translation-icon { - list-style-image: url(chrome://browser/skin/translation-16.png); - -moz-image-region: rect(0px, 16px, 16px, 0px); -} - -.translation-icon.in-use { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -%ifdef XP_MACOSX -@media (min-resolution: 1.1dppx) { - .translation-icon { - list-style-image: url(chrome://browser/skin/translation-16@2x.png); - -moz-image-region: rect(0px, 32px, 32px, 0px); - } - - .translation-icon.in-use { - -moz-image-region: rect(0px, 64px, 32px, 32px); - } -} -%endif +}
\ No newline at end of file diff --git a/themes/shared/translation/infobar.inc.css b/themes/shared/translation/infobar.inc.css deleted file mode 100644 index 50d1acc..0000000 --- a/themes/shared/translation/infobar.inc.css +++ /dev/null @@ -1,95 +0,0 @@ -%if 0 -/* 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/. */ -%endif -notification[value="translation"] .messageImage { - list-style-image: url(chrome://browser/skin/translation-16.png); - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -@media (min-resolution: 1.25dppx) { - notification[value="translation"] .messageImage { - list-style-image: url(chrome://browser/skin/translation-16@2x.png); - -moz-image-region: rect(0, 64px, 32px, 32px); - } -} - -notification[value="translation"][state="translating"] .messageImage { - list-style-image: url(chrome://browser/skin/translating-16.png); - -moz-image-region: auto; -} - -@media (min-resolution: 1.25dppx) { - notification[value="translation"][state="translating"] .messageImage { - list-style-image: url(chrome://browser/skin/translating-16@2x.png); - } -} - -notification[value="translation"] hbox[anonid="details"] { - overflow: hidden; -} - -notification[value="translation"] button, -notification[value="translation"] menulist { - -moz-appearance: none; - border-width: 1px; - -moz-border-top-colors: none; - -moz-border-right-colors: none; - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - border-radius: 2px; - min-width: 0; - box-shadow: 0 1px rgba(255, 255, 255, 0.5), 0 1px rgba(255, 255, 255, 0.5) inset; -} - -notification[value="translation"] menulist > .menulist-dropmarker { - -moz-appearance: toolbarbutton-dropdown; - border: none; - background-color: transparent; - margin: auto; - padding: 5px 0; -} - -.translation-menupopup arrowscrollbox { - padding-bottom: 0; -} - -.translation-attribution { - cursor: pointer; - -moz-box-align: end; - font-size: small; -} - -.translation-attribution > label { - margin-bottom: 0; -} - -.translation-attribution > image { - width: 70px; -} - -.translation-welcome-panel { - width: 305px; -} - -.translation-welcome-logo { - height: 32px; - width: 32px; - list-style-image: url(chrome://browser/skin/translation-16@2x.png); - -moz-image-region: rect(0, 64px, 32px, 32px); -} - -.translation-welcome-content { - margin-inline-start: 16px; -} - -.translation-welcome-headline { - font-size: larger; - font-weight: bold; -} - -.translation-welcome-body { - padding: 1em 0; - margin: 0 0; -} diff --git a/themes/shared/translation/translating-16.png b/themes/shared/translation/translating-16.png Binary files differdeleted file mode 100644 index 71ca37c..0000000 --- a/themes/shared/translation/translating-16.png +++ /dev/null diff --git a/themes/shared/translation/translating-16@2x.png b/themes/shared/translation/translating-16@2x.png Binary files differdeleted file mode 100644 index ab61840..0000000 --- a/themes/shared/translation/translating-16@2x.png +++ /dev/null diff --git a/themes/shared/translation/translation-16.png b/themes/shared/translation/translation-16.png Binary files differdeleted file mode 100644 index 4b42ded..0000000 --- a/themes/shared/translation/translation-16.png +++ /dev/null diff --git a/themes/shared/translation/translation-16@2x.png b/themes/shared/translation/translation-16@2x.png Binary files differdeleted file mode 100644 index 2105a3e..0000000 --- a/themes/shared/translation/translation-16@2x.png +++ /dev/null diff --git a/themes/windows/browser.css b/themes/windows/browser.css index 2ed3e7e..334265e 100644 --- a/themes/windows/browser.css +++ b/themes/windows/browser.css @@ -2113,87 +2113,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { outline: 1px dotted -moz-DialogText; } -/* Translation infobar */ - -%include ../shared/translation/infobar.inc.css - -notification[value="translation"] { - min-height: 40px; -} - -@media (-moz-windows-default-theme) { - notification[value="translation"], - notification[value="translation"] button, - notification[value="translation"] menulist { - min-height: 30px; - color: #545454; - } - - notification[value="translation"] { - background-color: #EEE; - } - - notification[value="translation"] button, - notification[value="translation"] menulist { - padding-inline-end: 1ch; - } - - notification[value="translation"] menulist { - border: 1px solid #C1C1C1; - background-color: #FFF; - } - - notification[value="translation"] button { - border: 1px solid #C1C1C1; - background-color: #FBFBFB; - } - - notification[value="translation"] button, - notification[value="translation"] menulist, - notification[value="translation"] menulist > .menulist-label-box { - margin-inline-start: 1ch; - margin-inline-end: 1ch; - } - - notification[value="translation"] button:hover, - notification[value="translation"] button:active, - notification[value="translation"] menulist:hover, - notification[value="translation"] menulist:active { - background-color: #EBEBEB; - } - - notification[value="translation"] button[anonid="translate"] { - color: #FFF; - background-color: #0095DD; - box-shadow: none; - border: 1px solid #006B9D; - } - - notification[value="translation"] button[anonid="translate"]:hover, - notification[value="translation"] button[anonid="translate"]:active { - background-color: #008ACB; - } - - notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker, - notification[value="translation"] menulist > .menulist-dropmarker { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); - } - - notification[value="translation"] button > .button-box, - notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker { - padding: 0; - margin-inline-start: 3ch; - } - - notification[value="translation"] button:not([type="menu"]) > .button-box { - margin-inline-end: 3ch; - } -} - -.translation-menupopup { - -moz-appearance: none; -} - /* Bookmarks roots menu-items */ #subscribeToPageMenuitem:not([disabled]), #subscribeToPageMenupopup { diff --git a/themes/windows/preferences/preferences.css b/themes/windows/preferences/preferences.css index bd1ec30..0322c9e 100644 --- a/themes/windows/preferences/preferences.css +++ b/themes/windows/preferences/preferences.css @@ -16,12 +16,6 @@ font-weight: bold; } -/* Content Pane */ -#translationAttributionImage { - width: 70px; - cursor: pointer; -} - /* Modeless Window Dialogs */ .windowDialog, .windowDialog prefpane { |