зеркало из https://github.com/mozilla/gecko-dev.git
Bug #269483 --> Moving update.xul/js/dtd from mozilla/browser/preferences to mozapp/preferences so we can all
share from them. a=ben on moving these files / the toolkit changes
This commit is contained in:
scott%scott-macgregor.org
Родитель
d05170a60a
Коммит
a8fa513276
|
|
@ -149,7 +149,7 @@ var gAdvancedPane = {
|
|||
|
||||
showAutoInstallOptions: function ()
|
||||
{
|
||||
document.documentElement.openSubDialog("chrome://browser/content/preferences/update.xul",
|
||||
document.documentElement.openSubDialog("chrome://mozapps/content/preferences/update.xul",
|
||||
"", null);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -31,5 +31,3 @@ browser.jar:
|
|||
* content/browser/preferences/sanitize.js
|
||||
* content/browser/preferences/tabs.xul
|
||||
* content/browser/preferences/tabs.js
|
||||
* content/browser/preferences/update.xul
|
||||
* content/browser/preferences/update.js
|
||||
|
|
|
|||
|
|
@ -1,81 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is the Firefox Preferences System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Google Inc.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2005
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Ben Goodger <ben@mozilla.org> (Original Author)
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
<!DOCTYPE prefwindow [
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
|
||||
%brandDTD;
|
||||
<!ENTITY % updateDTD SYSTEM "chrome://browser/locale/preferences/update.dtd">
|
||||
%updateDTD;
|
||||
]>
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/"?>
|
||||
<?xml-stylesheet href="chrome://mozapps/content/update/updates.css"?>
|
||||
|
||||
<prefwindow id="UpdateSettingsDialog" type="child"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&update.title;"
|
||||
dlgbuttons="accept,cancel"
|
||||
style="width: &window.width;; height: &window.height;;">
|
||||
|
||||
<prefpane id="UpdateSettingsDialogPane">
|
||||
|
||||
<preferences id="preferences">
|
||||
<preference id="app.update.mode" name="app.update.mode" type="int"/>
|
||||
</preferences>
|
||||
|
||||
<description>&update.intro;</description>
|
||||
<radiogroup id="autoInstallMode" preference="app.update.mode">
|
||||
<hbox>
|
||||
<radio label="&ausMode0Name.label;" accesskey="&ausMode0Name.accesskey;"
|
||||
value="0" flex="1"/>
|
||||
</hbox>
|
||||
<description class="updatePrefsInfo" id="ausMode0Info">&ausMode0Name.info;</description>
|
||||
<hbox>
|
||||
<radio label="&ausMode1Name.label;" accesskey="&ausMode1Name.accesskey;"
|
||||
value="1" flex="1"/>
|
||||
</hbox>
|
||||
<description class="updatePrefsInfo" id="ausMode1Info">&ausMode1Name.info;</description>
|
||||
<radio label="&ausMode2Name.label;" accesskey="&ausMode2Name.accesskey;"
|
||||
value="2"/>
|
||||
<description class="updatePrefsInfo" id="ausMode2Info">&ausMode2Name.info;</description>
|
||||
</radiogroup>
|
||||
<separator/>
|
||||
<separator/>
|
||||
</prefpane>
|
||||
</prefwindow>
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<!ENTITY update.title "Automatic Update">
|
||||
<!ENTITY window.width "30em">
|
||||
<!ENTITY window.height "25em">
|
||||
|
||||
<!ENTITY update.intro "Automatically download and install updates for:">
|
||||
|
||||
<!ENTITY ausMode0Name.label "Security/Incremental Updates and New Releases, even if
|
||||
some of my Extensions and Themes will stop working">
|
||||
<!ENTITY ausMode0Name.accesskey "S">
|
||||
<!ENTITY ausMode0Name.info "&brandShortName; will automatically download and install all
|
||||
Updates and New Releases in the background">
|
||||
<!ENTITY ausMode1Name.label "Security/Incremental Updates and New Releases, provided
|
||||
my Extensions and Themes will still work">
|
||||
<!ENTITY ausMode1Name.accesskey "e">
|
||||
<!ENTITY ausMode1Name.info "&brandShortName; will ask your permission before downloading
|
||||
and installing any New Release that will cause some of your
|
||||
Extensions and/or Themes to stop working">
|
||||
<!ENTITY ausMode2Name.label "Security/Incremental Updates only">
|
||||
<!ENTITY ausMode2Name.accesskey "c">
|
||||
<!ENTITY ausMode2Name.info "&brandShortName; will ask your permission before downloading
|
||||
any New Release">
|
||||
|
||||
|
|
@ -44,7 +44,6 @@
|
|||
locale/browser/preferences/privacy.dtd (%chrome/browser/preferences/privacy.dtd)
|
||||
locale/browser/preferences/sanitize.dtd (%chrome/browser/preferences/sanitize.dtd)
|
||||
locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd)
|
||||
locale/browser/preferences/update.dtd (%chrome/browser/preferences/update.dtd)
|
||||
locale/browser/sidebar/sidebar.properties (%chrome/browser/sidebar/sidebar.properties)
|
||||
% locale browser-region @AB_CD@ %locale/browser-region/
|
||||
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче