mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Obsoleting pref-languages2.xul,dtd. Merging changes back into pref-languages.xul,dtd. Part of cleanup for (5236). r=slamm
This commit is contained in:
mcafee%netscape.com
parent
c6d7ffe95f
commit
80c3824d1d
@ -21,7 +21,7 @@
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages2.dtd" >
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
|
||||
|
||||
<window
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
|
||||
@ -60,7 +60,7 @@ function Init()
|
||||
} //catch
|
||||
|
||||
try {
|
||||
parent.initPanel('chrome://communicator/content/pref/pref-languages2.xul');
|
||||
parent.initPanel('chrome://communicator/content/pref/pref-languages.xul');
|
||||
}
|
||||
|
||||
catch(ex) {
|
||||
|
||||
@ -1,82 +1,97 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
|
||||
<!--
|
||||
The contents of this file are subject to the Netscape 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/NPL/
|
||||
|
||||
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 Mozilla Communicator client code, released
|
||||
March 31, 1998.
|
||||
|
||||
The Initial Developer of the Original Code is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
-->
|
||||
|
||||
The contents of this file are subject to the Netscape Public License
|
||||
Version 1.1 (the "NPL"); you may not use this file except in
|
||||
compliance with the NPL. You may obtain a copy of the NPL at
|
||||
http://www.mozilla.org/NPL/
|
||||
|
||||
Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
for the specific language governing rights and limitations under the
|
||||
NPL.
|
||||
|
||||
The Initial Developer of this code under the NPL is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1999 Netscape Communications Corporation. All Rights
|
||||
Reserved.
|
||||
|
||||
-->
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
|
||||
<window xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
class="color-dialog"
|
||||
align="vertical" title="window.title"
|
||||
onload="parent.initPanel('chrome://communicator/content/pref/pref-languages.xul');">
|
||||
|
||||
<box class="box-smallheader" title="&lHeader;"/>
|
||||
|
||||
<titledbox orient="vertical">
|
||||
<window id="langPanel"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
class="color-dialog"
|
||||
title="&languages.customize.window.title;"
|
||||
onload="Init();" orient="vertical">
|
||||
|
||||
<script language="javascript" src="chrome://communicator/content/pref/pref-languages.js"></script>
|
||||
<script language="javascript" src="chrome://global/content/strres.js"></script>
|
||||
<script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
|
||||
<script language="JavaScript">
|
||||
<![CDATA[
|
||||
_elementIDs = ["intlAcceptLanguages", "DefaultCharsetList"];
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<broadcaster id="intlAcceptLanguages"
|
||||
value=""
|
||||
preftype="string"
|
||||
prefstring="intl.accept_languages"/>
|
||||
|
||||
|
||||
<box class="box-smallheader" title="&languages.customize.lHeader;"/>
|
||||
<!--
|
||||
description="&languages.customize.rHeader;
|
||||
-->
|
||||
|
||||
<titledbox orient="vertical" flex="1">
|
||||
<title><text value="&langtitle.label;"/></title>
|
||||
<html>&prefLangDecript;</html>
|
||||
|
||||
<separator/>
|
||||
|
||||
<box>
|
||||
<box orient="vertical" flex="1">
|
||||
<tree id="langTree" class="inset" flex="1">
|
||||
<treecolgroup>
|
||||
<treecol flex="10" width="0"/>
|
||||
<treecol flex="90" width="0"/>
|
||||
</treecolgroup>
|
||||
<treehead>
|
||||
<treerow>
|
||||
<treecell />
|
||||
<treecell value="&languageColumnHeader.label;" />
|
||||
</treerow>
|
||||
</treehead>
|
||||
<treechildren flex="1">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="propertylist" value="&engOrder.label;"/>
|
||||
<treecell class="propertylist" value="&engOption.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</tree>
|
||||
<box>
|
||||
<button class="dialog push" value="&addButton.label;" accesskey="&addButton.accesskey;"/>
|
||||
<button class="dialog push" value="&deleteButton.label;" accesskey="&deleteButton.accesskey;"/>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
<!-- XXX hard coding language value for now until tree is hooked up -->
|
||||
<broadcaster id="intlAcceptLanguages" value="&engOption.label;" pref="true"
|
||||
preftype="string" prefstring="intl.accept_languages" prefattribute="value"/>
|
||||
|
||||
<box orient="vertical" valign="middle">
|
||||
<button id="up" class="dialog push" value="&moveUp.label;" accesskey="&moveUp.accesskey;"/>
|
||||
<button id="down" class="dialog push" value="&moveDown.label;" accesskey="&moveDown.accesskey;"/>
|
||||
</box>
|
||||
|
||||
</box>
|
||||
|
||||
</titledbox>
|
||||
|
||||
<html>&languages.customize.prefLangDescript;</html>
|
||||
|
||||
<box flex="1">
|
||||
<box orient="vertical" flex="1">
|
||||
<html>&languages.customize.active.label;</html>
|
||||
<tree class="inset" id="active_languages" flex="1"
|
||||
datasources="rdf:null" multiple="true">
|
||||
<treecolgroup>
|
||||
<treecol flex="1"/>
|
||||
</treecolgroup>
|
||||
<treechildren id="active_languages_root" flex="1"/>
|
||||
</tree>
|
||||
</box>
|
||||
<box orient="vertical" autostretch="never">
|
||||
<spring flex="1"/>
|
||||
<button oncommand="MoveUp();" id="up" class="up small" />
|
||||
<button oncommand="MoveDown();" id="down" class="down small" />
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
<box orient="vertical">
|
||||
<button class="dialog" value="&languages.customize.addButton.label;" oncommand="AddLanguage();"/>
|
||||
<button class="dialog" value="&languages.customize.deleteButton.label;" oncommand="RemoveActiveLanguage();"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</box>
|
||||
</titledbox>
|
||||
<titledbox orient="vertical" autostretch="never">
|
||||
<title><text value="&languages.customize.Charset.grouplabel;"/></title>
|
||||
<box autostretch="never">
|
||||
<text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
|
||||
<menulist id="DefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
|
||||
pref="true" preftype="string" prefstring="intl.charset.default"
|
||||
prefattribute="data" wsm_attributes="data">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://home.netscape.com/NC-rdf#Name" data="..." uri="..."/>
|
||||
</menupopup>
|
||||
</template>
|
||||
</menulist>
|
||||
</box>
|
||||
</titledbox>
|
||||
</window>
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-languages2.xul" value="&languages.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-languages.xul" value="&languages.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
|
||||
@ -1,23 +1,35 @@
|
||||
<!-- extracted from content/pref-languages.xul -->
|
||||
|
||||
<!-- LOCALIZATION NOTE : FILE 'Languages' preferences dialog -->
|
||||
<!ENTITY window.title "Languages">
|
||||
<!ENTITY lHeader "Languages">
|
||||
<!ENTITY langtitle.label "Languages for web pages">
|
||||
<!ENTITY prefLangDecript "Web pages are sometimes available in more than one language. Choose languages for displaying web pages, in order of preference.">
|
||||
<!-- LOCALIZATION NOTE (engOption.label): DONT_TRANSLATE -->
|
||||
<!ENTITY engOrder.label "1">
|
||||
<!ENTITY engOption.label "English">
|
||||
<!ENTITY addButton.label "Add...">
|
||||
<!ENTITY addButton.accesskey "a">
|
||||
<!ENTITY deleteButton.label "Remove">
|
||||
<!ENTITY deleteButton.accesskey "r">
|
||||
<!ENTITY moveUp.label "Move Up">
|
||||
<!ENTITY moveUp.accesskey "u">
|
||||
<!ENTITY moveDown.label "Move Down">
|
||||
<!ENTITY moveDown.accesskey "d">
|
||||
<!-- LOCALIZATION NOTE (orderColumnHeader): This column heading refers to the sequence in which the chosen items appear. -->
|
||||
<!ENTITY orderColumnHeader.label "Order">
|
||||
<!ENTITY languageColumnHeader.label "Language">
|
||||
|
||||
|
||||
<!ENTITY languages.customize.prefLangDescript "Web pages are sometimes available in more than one language.
|
||||
Choose languages for displaying web pages, in order of preference.">
|
||||
<!ENTITY languages.customize.window.title "Languages">
|
||||
<!ENTITY languages.customize.lHeader "Languages">
|
||||
<!ENTITY languages.customize.rHeader "Languages in which webpages are displayed">
|
||||
<!ENTITY langtitle.label "Languages for web pages">
|
||||
<!ENTITY languages.customize.prefAddLangDescript "Select the language(s) you would like to add.">
|
||||
<!ENTITY languages.customize.engOrder.label "1">
|
||||
<!ENTITY languages.customize.engOption.label "English">
|
||||
<!ENTITY languages.customize.addButton.label "Add...">
|
||||
<!ENTITY languages.customize.deleteButton.label "Delete...">
|
||||
<!ENTITY languages.customize.title.label "Customize Languages">
|
||||
<!ENTITY languages.customize.add.title.label "Add Languages">
|
||||
<!ENTITY languages.customize.left.header "Character Coding">
|
||||
<!ENTITY languages.customize.right.header "Select Supported Charsets">
|
||||
<!ENTITY languages.customize.available.label "Languages:">
|
||||
<!ENTITY languages.customize.active.label "Languages in order of preference:">
|
||||
<!ENTITY languages.customize.reorder.label "Reorder">
|
||||
<!ENTITY languages.customize.remove.label "Remove">
|
||||
<!ENTITY languages.customize.additional.label "Available Charactersets">
|
||||
<!ENTITY languages.customize.add.label "Add">
|
||||
<!ENTITY languages.customize.others.label "Others:">
|
||||
<!ENTITY languages.customize.Charset.grouplabel "Character Coding:">
|
||||
<!ENTITY languages.customize.DefaultCharset.label "Default Character Coding:">
|
||||
<!-- LOCALIZATION NOTE Charset Coding Preferences Dialog: Do NOT localize the terms "en-bz, ar-jo" -->
|
||||
<!ENTITY languages.customize.others.examples "e.g.: en-bz, ar-jo">
|
||||
<!ENTITY languages.customize.cancel.label "Cancel">
|
||||
<!ENTITY languages.customize.save.label "Save">
|
||||
<!ENTITY languages.customize.ok.label "OK">
|
||||
<!ENTITY languages.customize.save.popup "Please restart the browser for changes to take effect...">
|
||||
<!ENTITY languages.customize.moveUp.label "Up">
|
||||
<!ENTITY languages.customize.moveUp.accesskey "u">
|
||||
<!ENTITY languages.customize.moveDown.label "Down">
|
||||
<!ENTITY languages.customize.moveDown.accesskey "d">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user