This commit was manufactured by cvs2svn to create tag 'help'.

git-svn-id: svn://10.0.0.236/tags/help@132699 18797224-902f-48f8-a5cc-f745e15eee43
Bug 175853, Update localeVersion strings for 1.2 final - and do it correctly, r=jbetak, sr=bzbarsky, a=blizzard
2002-10-30 12:41:39 +00:00 · 2002-10-30 12:41:38 +00:00 · 2002-10-30 09:20:00 +00:00 · 2002-10-30 09:09:49 +00:00 · 2002-10-30 08:29:45 +00:00 · 2002-10-30 07:46:34 +00:00
12 changed files with 605 additions and 20 deletions
--- a/mozilla/build/package/rpm/mozilla
+++ b/mozilla/build/package/rpm/mozilla
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+## 
+## Usage:
+##
+## $ mozilla
+##
+## This script is meant to run a mozilla program from the mozilla
+## rpm installation.
+##
+## The script will setup all the environment voodoo needed to make
+## mozilla work.
+
+##
+## Standard shell script disclaimer blurb thing:
+##
+## This script is a hcak.  Its brute force.  Its horrible.  
+## It doesnt use Artificial Intelligence.  It doesnt use Virtual Reality.
+## Its not perl.  Its not python.  It probably wont work unchanged on
+## the "other" thousands of unices.  But it worksforme.
+##
+## If you have an improvement, patch, idea, whatever, on how to make this
+## script better, post it here:
+##
+## news://news.mozilla.org/netscape.public.mozilla.patches
+## news://news.mozilla.org/netscape.public.mozilla.unix
+##
+## 
+
+##
+## Potential improvements:
+##
+## + Run ldd on the program and report missing dlls
+## + All the "other" unices/packages
+##
+
+cmdname=`basename $0`
+
+##
+## location of the apprunner binary.
+##
+MOZ_APPRUNNER_NAME="/usr/lib/mozilla/bin/apprunner"
+
+##
+## Variables
+##
+MOZ_DIST_BIN=""
+MOZ_PROGRAM=""
+
+##
+## Functions
+##
+moz_bail()
+{
+	message=$1
+
+	echo
+	echo "$cmdname: $message"
+	echo
+
+	exit 1
+}
+
+moz_test_binary()
+{
+	binary=$1
+
+	if [ -f "$binary" ]
+	then
+		if [ -x "$binary" ]
+		then
+			return 1
+		fi
+	fi
+
+	return 0
+}
+
+moz_test_binary $MOZ_APPRUNNER_NAME
+
+if [ $? -eq 1 ]
+then
+	MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
+fi
+
+##
+## Make sure the program is executable
+##
+if [ ! -x $MOZ_PROGRAM ]
+then
+	moz_bail "Cannot execute $MOZ_PROGRAM."
+fi
+
+##
+## Set MOZILLA_FIVE_HOME
+##
+MOZILLA_FIVE_HOME="/usr/lib/mozilla"
+
+export MOZILLA_FIVE_HOME
+
+exec ./$MOZ_PROGRAM ${1+"$@"}
--- a/mozilla/build/package/rpm/mozilla-viewer
+++ b/mozilla/build/package/rpm/mozilla-viewer
@@ -0,0 +1,111 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (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) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+## 
+## Usage:
+##
+## $ mozilla
+##
+## This script is meant to run a mozilla program from the mozilla
+## rpm installation.
+##
+## The script will setup all the environment voodoo needed to make
+## mozilla work.
+
+##
+## Standard shell script disclaimer blurb thing:
+##
+## This script is a hcak.  Its brute force.  Its horrible.  
+## It doesnt use Artificial Intelligence.  It doesnt use Virtual Reality.
+## Its not perl.  Its not python.  It probably wont work unchanged on
+## the "other" thousands of unices.  But it worksforme.
+##
+## If you have an improvement, patch, idea, whatever, on how to make this
+## script better, post it here:
+##
+## news://news.mozilla.org/netscape.public.mozilla.patches
+## news://news.mozilla.org/netscape.public.mozilla.unix
+##
+## 
+
+##
+## Potential improvements:
+##
+## + Run ldd on the program and report missing dlls
+## + All the "other" unices/packages
+##
+
+cmdname=`basename $0`
+
+##
+## location of the viewer binary.
+##
+MOZ_VIEWER_NAME="/usr/lib/mozilla/bin/viewer"
+
+##
+## Variables
+##
+MOZ_PROGRAM=""
+
+##
+## Functions
+##
+moz_bail()
+{
+	message=$1
+
+	echo
+	echo "$cmdname: $message"
+	echo
+
+	exit 1
+}
+
+moz_test_binary()
+{
+	binary=$1
+
+	if [ -f "$binary" ]
+	then
+		if [ -x "$binary" ]
+		then
+			return 1
+		fi
+	fi
+
+	return 0
+}
+
+
+MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
+
+moz_test_binary $MOZ_PROGRAM
+
+if [ $? -eq 0 ]
+then
+	moz_bail "Cannot execute $MOZ_PROGRAM."
+fi
+
+##
+## Set MOZILLA_FIVE_HOME
+##
+MOZILLA_FIVE_HOME="/usr/lib/mozilla"
+
+export MOZILLA_FIVE_HOME
+
+exec $MOZ_PROGRAM ${1+"$@"}
--- a/mozilla/build/package/rpm/mozilla.spec.in
+++ b/mozilla/build/package/rpm/mozilla.spec.in
@@ -0,0 +1,98 @@
+%define ver		@MOZ_RPM_VERSION@
+%define rel		@MOZ_RPM_RELEASE@
+%define prefix	@MOZ_RPM_PREFIX@
+%define tmp		@MOZ_RPM_TMP@
+
+Summary:	Mozilla / ButtMonkey / Gecko / Whatever
+Name:		mozilla
+Version:	%ver
+Release:	%rel
+Copyright:	NPL
+Group:		Mozilla
+Source:		mozilla-%{ver}-%{rel}.tar.gz
+BuildRoot:	%{tmp}/%{name}-root
+Packager:	Ramiro Estrugo <ramiro@netscape.com>
+URL:		http://www.mozilla.org/
+Provides:	mozilla
+Requires:	glib >= 1.2.1 gtk+ >= 1.2.1 nspr-pthreads >= 3.1
+
+%description
+Mozilla
+
+%package devel
+Summary:	Mozilla development crap
+Group:		Mozilla
+#Requires:	mozilla nspr-devel
+
+#Obsoletes: libnspr-devel
+#Conflicts: libnspr-userthreads-devel
+
+%description devel
+Mozilla development libs and headers
+
+%prep
+%setup -n mozilla
+
+%build
+./configure \
+			--with-pthreads \
+			--enable-toolkit=gtk \
+			--disable-build-nspr \
+			@MOZ_RPM_SEAMONKEY_OPTIMIZE@
+
+make
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+mkdir -p $RPM_BUILD_ROOT%{prefix}/include/mozilla
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
+mkdir -p $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+
+cp -rpv dist/bin/components/*.so $RPM_BUILD_ROOT%{prefix}/lib/mozilla/components
+cp -rpv dist/bin/res/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/res
+cp -rpv dist/bin/*.so $RPM_BUILD_ROOT%{prefix}/lib
+cp -rpv dist/include/* $RPM_BUILD_ROOT%{prefix}/include/mozilla
+cp -rpv dist/idl/* $RPM_BUILD_ROOT%{prefix}/lib/mozilla/idl
+cp -rpv dist/lib/*.a $RPM_BUILD_ROOT%{prefix}/lib
+cp -rpv dist/bin/apprunner $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+cp -rpv dist/bin/viewer $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+cp -rpv dist/bin/vreg $RPM_BUILD_ROOT%{prefix}/lib/mozilla/bin
+
+cp -rpv build/mozilla-viewer.sh $RPM_BUILD_ROOT/usr/bin/mozilla-viewer
+cp -rpv build/mozilla-apprunner.sh $RPM_BUILD_ROOT/usr/bin/mozilla-apprunner
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+
+#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
+#then
+#	:
+#else
+#	echo "/usr/mozilla/lib" >> /etc/ld.so.conf
+#fi
+#
+#/sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%attr(-, root, root)
+
+%{prefix}/lib/mozilla/components/*
+%{prefix}/lib/*.so
+%{prefix}/lib/mozilla/bin/*
+%{prefix}/lib/mozilla/res/*
+%attr(755, root, root)/usr/bin/mozilla-viewer
+%attr(755, root, root)/usr/bin/mozilla-apprunner
+
+%files devel
+%attr(-, root, root)
+
+%{prefix}/lib/*.a
+%{prefix}/include/mozilla/*
+%{prefix}/lib/mozilla/idl/*
--- a/mozilla/build/package/rpm/nspr-pthreads.spec.in
+++ b/mozilla/build/package/rpm/nspr-pthreads.spec.in
@@ -0,0 +1,76 @@
+%define ver		@MOZILLA_RPM_VERSION@
+%define rel		@MOZILLA_RPM_RELEASE@
+%define prefix	@MOZILLA_RPM_PREFIX@
+%define tmp		@MOZILLA_RPM_TMP@
+
+Summary:	Netscape Portable Runtime (NSPR)
+Name:		nspr-pthreads
+Version:	%ver
+Release:	%rel
+Copyright:	NPL
+Group:		Development/Libraries
+Source:		nspr-pthreads-%{ver}-%{rel}.tar.gz
+BuildRoot:	%{tmp}/%{name}-root
+Packager:	Ramiro Estrugo <ramiro@netscape.com>
+URL:		http://www.mozilla.org/docs/tplist/catCode/nsprdesc.htm
+Provides:	nspr
+
+%description
+Libraries that implement cross-platform runtime services from Netscape.
+
+%package devel
+Summary:	NSPR library header files for development
+Group:		Development/Libraries
+Requires:	nspr
+#Obsoletes: libnspr-devel
+#Conflicts: libnspr-userthreads-devel
+
+%description devel
+Header files for the NSPR library from Netscape
+
+%prep
+%setup -n nspr-pthreads
+
+%build
+make \
+	DIST=$RPM_BUILD_ROOT%{prefix} \
+	NSDISTMODE=copy \
+	USE_PTHREADS=1 \
+	@MOZILLA_RPM_NSPR_OPTIMIZE@ \
+	export
+
+%install
+make \
+	DIST=$RPM_BUILD_ROOT%{prefix} \
+	NSDISTMODE=copy \
+	USE_PTHREADS=1 \
+	@MOZILLA_RPM_NSPR_OPTIMIZE@ \
+	install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+
+#if grep "/usr/mozilla/lib" /etc/ld.so.conf > /dev/null 2>&1
+#then
+#	:
+#else
+#	echo "/usr/mozilla/lib" >> /etc/ld.so.conf
+#fi
+#
+#/sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%attr(-, root, root)
+
+%{prefix}/lib/*.so
+
+%files devel
+%attr(-, root, root)
+
+%{prefix}/include/*
+%{prefix}/lib/*.a
+
--- a/mozilla/l10n/nscp/readme.txt
+++ b/mozilla/l10n/nscp/readme.txt
@@ -1,20 +0,0 @@
-This directory contains Mozilla translations that leveraged from Netscape releases.
-
-IMPORTANT:
-DO NOT CHANGE OR MODIFY ANYTHING IN THIS DIRECTORY !!!
-
-Netscape localization contact: Ying-Lin Xia <yxia@netscape.com>
-
-History:
-
-2002.10.15 - checkin files and tagging as "NSCP-L10N-1-0-1-RC1"
-	- Add pt-BR files from Netscape 7.0 pt-BR translation
-
-2002.09.17 - checkin files and tagging as "NSCP-L10N-1-0-1-RC1"
-	- Translation leveraged from Netscape 7.0 release
-	- de-DE, en-CA, en-GB, es-ES, fr-FR, ja-JP, zh-CN
-	- Note:
-		- All translation leveraged from Netscape files;
-		- All contents copied from Netscape contents pack;
-		- The translated help file is fully Netscape version, not Mozilla;
-
--- a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in
+++ b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in
@@ -0,0 +1,32 @@
+#
+# 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.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= mac unix win
+
+include $(topsrcdir)/config/rules.mk
+
--- a/mozilla/xpfe/browser/resources/locale/en-US/Manifest
+++ b/mozilla/xpfe/browser/resources/locale/en-US/Manifest
@@ -0,0 +1,5 @@
+navigator.dtd
+viewSource.dtd
+pageInfo.dtd
+navigator.properties
+askViewZoom.dtd
--- a/mozilla/xpfe/browser/resources/locale/en-US/contents-region.rdf
+++ b/mozilla/xpfe/browser/resources/locale/en-US/contents-region.rdf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the locale being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:US"
+        chrome:author="mozilla.org"
+        chrome:name="US"
+        chrome:previewURL="http://www.mozilla.org/locales/US.gif">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:US:packages">
+        <RDF:li resource="urn:mozilla:locale:US:navigator-region"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:US:navigator-region"
+	chrome:localeVersion="1.2"/>
+</RDF:RDF>
--- a/mozilla/xpfe/browser/resources/locale/en-US/contents.rdf
+++ b/mozilla/xpfe/browser/resources/locale/en-US/contents.rdf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the skins being supplied by this package -->
+  <RDF:Seq about="urn:mozilla:locale:root">
+    <RDF:li resource="urn:mozilla:locale:en-US"/>
+  </RDF:Seq>
+
+  <!-- locale information -->
+  <RDF:Description about="urn:mozilla:locale:en-US">
+    <chrome:packages>
+      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+        <RDF:li resource="urn:mozilla:locale:en-US:navigator"/>
+      </RDF:Seq>
+    </chrome:packages>
+  </RDF:Description>
+
+  <!-- Version Information.  State that we work only with major version of this
+       package. -->
+  <RDF:Description about="urn:mozilla:locale:en-US:navigator"
+	chrome:localeVersion="1.2"/>
+</RDF:RDF>
--- a/mozilla/xpfe/browser/resources/locale/en-US/linkToolbar.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/linkToolbar.dtd
@@ -0,0 +1,79 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - 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 Christopher Hoess <choess@stwing.upenn.edu>'s code.
+   -
+   - The Initial Developer of the Original Code is
+   - Christopher Hoess.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -      Eric Hodel <drbrain@segment7.net>
+   -      Stuart Ballard <sballard@netreach.net>
+   -
+   - 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 LGPL or the GPL. 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 ***** -->
+
+<!-- Link Toolbar Title -->
+<!ENTITY linkToolbar.label "Site Navigation Bar">
+<!ENTITY linkToolbar.accesskey "a">
+
+<!-- Link Toolbar visibility options -->
+<!ENTITY linkToolbarAlways.label "Show Always">
+<!ENTITY linkToolbarAlways.accesskey "S">
+<!ENTITY linkToolbarAsNeeded.label "Show Only As Needed">
+<!ENTITY linkToolbarAsNeeded.accesskey "O">
+<!ENTITY linkToolbarNever.label "Hide Always">
+<!ENTITY linkToolbarNever.accesskey "H">
+
+<!-- Toolbar buttons, menus, and menuitems -->
+<!ENTITY topButton.label "Top">
+<!ENTITY upButton.label "Up">
+<!ENTITY firstButton.label "First">
+<!ENTITY prevButton.label "Previous">
+<!ENTITY nextButton.label "Next">
+<!ENTITY lastButton.label "Last">
+
+<!ENTITY documentButton.label "Document">
+
+<!ENTITY tocButton.label "Table of Contents">
+<!ENTITY chapterButton.label "Chapters">
+<!ENTITY sectionButton.label "Sections">
+<!ENTITY subSectionButton.label "Subsections">
+<!ENTITY appendixButton.label "Appendices">
+<!ENTITY glossaryButton.label "Glossary">
+<!ENTITY indexButton.label "Index">
+
+<!ENTITY moreButton.label "More">
+
+<!ENTITY helpButton.label "Help">
+<!ENTITY searchButton.label "Search">
+
+<!ENTITY authorButton.label "Authors">
+<!ENTITY copyrightButton.label "Copyright">
+
+<!ENTITY bookmarkButton.label "Bookmarks">
+
+<!ENTITY alternateButton.label "Other Versions">
--- a/mozilla/xpfe/browser/resources/locale/en-US/metadata.dtd
+++ b/mozilla/xpfe/browser/resources/locale/en-US/metadata.dtd
@@ -0,0 +1,26 @@
+<!ENTITY no-properties.label   "No properties set.">
+
+<!ENTITY caption.label         "Element Properties">
+<!ENTITY image-sec.label       "Image Properties">
+<!ENTITY image-url.label       "Location:">
+<!ENTITY image-desc.label      "Description:">
+<!ENTITY image-alt.label       "Alternate text:">
+<!ENTITY image-width.label     "Width:">
+<!ENTITY image-height.label    "Height:">
+<!ENTITY image-filesize.label  "Size of File:">
+<!ENTITY insdel-sec.label      "Insert/Delete Properties">
+<!ENTITY insdel-cite.label     "Info:">
+<!ENTITY insdel-date.label     "Date:">
+<!ENTITY link-sec.label        "Link Properties">
+<!ENTITY link-url.label        "Address:">
+<!ENTITY link-target.label     "Will open in:">
+<!ENTITY link-type.label       "Target type:">
+<!ENTITY link-lang.label       "Target language:">
+<!ENTITY link-rel.label        "Relation:">
+<!ENTITY link-rev.label        "Reversed relation:">
+<!ENTITY misc-sec.label        "Miscellaneous Properties">
+<!ENTITY misc-lang.label       "Text language:">
+<!ENTITY misc-title.label      "Title:">
+<!ENTITY misc-tblsummary.label "Table summary:">
+<!ENTITY quote-sec.label       "Quote Properties">
+<!ENTITY quote-cite.label      "Info:">
--- a/mozilla/xpfe/browser/resources/locale/en-US/metadata.properties
+++ b/mozilla/xpfe/browser/resources/locale/en-US/metadata.properties
@@ -0,0 +1,12 @@
+sameWindowText=Same window
+newWindowText=New window
+parentFrameText=Parent frame
+sameFrameText=Same frame
+embeddedText=Embedded
+unableToShowProps=No properties available.
+altTextMissing=Missing
+altTextBlank=Blank
+imageSize=%S KB (%S bytes)
+imageSizeUnknown=Unknown (not cached)
+imageWidth=%Spx
+imageHeight=%Spx