Oops, my mistake. This wasn't suppose to be checked in. Reverting now. Brad
Brad Nicholes Senior Software Engineer Novell, Inc., the leading provider of Net business solutions http://www.novell.com >>> [EMAIL PROTECTED] Wednesday, August 25, 2004 2:15:25 PM >>> bnicholes 2004/08/25 13:15:25 Modified: docs/manual/style build.properties lang-targets.xml docs/manual/style/css manual-zip.css docs/manual/style/lang de.xml en.xml fr.xml ja.xml ko.xml ru.xml docs/manual/style/xsl common.xsl Log: Update 8/25/04 Revision Changes Path 1.3 +2 -1 httpd-2.0/docs/manual/style/build.properties Index: build.properties =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/build.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- build.properties 1 Aug 2004 12:41:55 -0000 1.2 +++ build.properties 25 Aug 2004 20:15:24 -0000 1.3 @@ -1,7 +1,8 @@ # This file contains version specific properties # No xml files yet +noxml.ja=howto/auth.html.ja.euc-jp developer/modules.html.ja.euc-jp noxml.fr=new_features_2_0.html.fr upgrading.html.fr # (pending) httpd version -httpd.version=2.1.0-dev +httpd.version=2.0.51 1.4 +2 -15 httpd-2.0/docs/manual/style/lang-targets.xml Index: lang-targets.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang-targets.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lang-targets.xml 29 Jul 2004 17:58:55 -0000 1.3 +++ lang-targets.xml 25 Aug 2004 20:15:24 -0000 1.4 @@ -21,8 +21,8 @@ <!-- ==================================================================== --> <project name="lang-targets"> -<target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, fr, ja, ko, ru"/> -<target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-fr, zip-ja, zip-ko, zip-ru"/> +<target description="- builds all HTML files and nroff man pages" name="all" depends="de, en, es, ja, ko, ru"/> +<target description="- builds all zip download packages" name="zip-all" depends="zip-de, zip-en, zip-es, zip-ja, zip-ko, zip-ru"/> <!-- German --> <!-- ==================================================================== --> @@ -76,18 +76,6 @@ <chm.generic lang="es"/> </target> -<!-- French --> -<!-- ==================================================================== --> -<property value=".xml.fr" name="inputext.fr"/> -<property value=".html.fr" name="outputext.fr"/> - -<target description="- builds French HTML files" name="fr"> - <html.generic lang="fr"/> -</target> -<target description="- builds the French zipped download package" name="zip-fr"> - <zip.generic lang="fr"/> -</target> - <!-- Japanese --> <!-- ==================================================================== --> <property value=".xml.ja" name="inputext.ja"/> @@ -141,7 +129,6 @@ <include name="**/*.xml.de"/> <include name="**/*.xml"/> <include name="**/*.xml.es"/> - <include name="**/*.xml.fr"/> <include name="**/*.xml.ja"/> <include name="**/*.xml.ko"/> <include name="**/*.xml.ru"/> 1.4 +0 -1 httpd-2.0/docs/manual/style/css/manual-zip.css Index: manual-zip.css =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/css/manual-zip.css,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- manual-zip.css 9 Feb 2004 20:22:53 -0000 1.3 +++ manual-zip.css 25 Aug 2004 20:15:24 -0000 1.4 @@ -15,7 +15,6 @@ * limitations under the License. */ - h1 { margin: 0 0 0.5em 0; } 1.20 +5 -7 httpd-2.0/docs/manual/style/lang/de.xml Index: de.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/de.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- de.xml 2 May 2004 22:53:22 -0000 1.19 +++ de.xml 25 Aug 2004 20:15:24 -0000 1.20 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE language [ <!ENTITY nbsp " "> ]> -<!-- English Revision: 1.9 --> +<!DOCTYPE messages [ <!ENTITY nbsp " "> ]> +<!-- English revision: 1.6.2.4 --> <!-- Copyright 2002-2004 The Apache Software Foundation @@ -84,8 +84,7 @@ in directivesynopsis headings will be replaced by the given string. (see de.xml for an example) --> <message id="directive" replace-space-with="-">Direktive</message> - <message id="nodirectives">Dieses Modul enthält keine - Direktiven.</message> + <message id="nodirectives">Dieses Modul enthält keine Direktiven.</message> <!-- Used in summaries --> <message id="summary">Zusammenfassung</message> @@ -95,8 +94,7 @@ <!-- Used in headers and footers --> <message id="apachetitle">- Apache HTTP Server</message> - <message id="apachehttpserver">Apache HTTP Server Version - 2.1</message> + <message id="apachehttpserver">Apache HTTP Server Version 2.0</message> <message id="apachedocalt">[APACHE DOCUMENTATION]</message> <message id="search">Google-Suche</message> <!-- search button --> <message id="index">Index</message> <!-- deprecated --> @@ -106,7 +104,7 @@ <message id="apache">Apache</message> <message id="http-server">HTTP-Server</message> <message id="documentation">Dokumentation</message> - <message id="version">Version 2.1</message> + <message id="version">Version 2.0</message> <!-- super menu --> <message id="modules">Module</message> 1.19 +5 -7 httpd-2.0/docs/manual/style/lang/en.xml Index: en.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/en.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- en.xml 3 May 2004 19:19:14 -0000 1.18 +++ en.xml 25 Aug 2004 20:15:24 -0000 1.19 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE language [ <!ENTITY nbsp " "> ]> -<!-- $Revision$ --> +<!DOCTYPE messages [ <!ENTITY nbsp " "> ]> <!-- Copyright 2002-2004 The Apache Software Foundation @@ -41,7 +40,7 @@ <!-- language link titles --> <message id="nativename">English</message> - <!-- Used for the moduleindex --> + <!-- Used for the moduleindex --> <message id="corefeatures">Core Features and Multi-Processing Modules</message> <message id="othermodules">Other Modules</message> @@ -88,15 +87,14 @@ in directivesynopsis headings will be replaced by the given string. (see de.xml for an example) --> <message id="directive">Directive</message> - <message id="nodirectives">This module provides no - directives.</message> + <message id="nodirectives">This module provides no directives.</message> <!-- Used in summaries --> <message id="summary">Summary</message> <!-- Used in headers and footers --> <message id="apachetitle">- Apache HTTP Server</message> - <message id="apachehttpserver">Apache HTTP Server Version 2.1</message> + <message id="apachehttpserver">Apache HTTP Server Version 2.0</message> <message id="apachedocalt">[APACHE DOCUMENTATION]</message> <message id="search">Google Search</message> <!-- search button --> <message id="index">Index</message> <!-- deprecated --> @@ -106,7 +104,7 @@ <message id="apache">Apache</message> <message id="http-server">HTTP Server</message> <message id="documentation">Documentation</message> - <message id="version">Version 2.1</message> + <message id="version">Version 2.0</message> <!-- super menu --> <message id="modules">Modules</message> 1.6 +1 -92 httpd-2.0/docs/manual/style/lang/fr.xml Index: fr.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/fr.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fr.xml 12 May 2004 17:55:56 -0000 1.5 +++ fr.xml 25 Aug 2004 20:15:24 -0000 1.6 @@ -23,7 +23,7 @@ <source-ext>.xml.fr</source-ext> <target-ext>.html.fr</target-ext> -<!-- No sitemap -> no CHM +<!-- No sitemap so far <chm> <lang>0x40c French (France)</lang> <toc-font>,8,0</toc-font> @@ -31,95 +31,4 @@ <settings>French (France)</settings> </chm> --> - -<!-- currently no deployment of non-english man pages - <man> - <charset>ISO-8859-1</charset> - </man> ---> - <!-- Some strings might be used in other contexts, than stated in the --> - <!-- comments... --> - <messages> - <!-- language link titles --> - <message id="nativename">Français</message> - - <!-- Used for the moduleindex --> - <message id="corefeatures">Fonctionalités de Base et Modules Multi-Processus (MPM)</message> - <message id="othermodules">Autres Modules</message> - <message id="obsoletemodules">Modules Désuets</message> - - <!-- Used for the modulesynopsis and sitemap --> - <message id="obsoleteapachemodule">Module Apache Désuet</message> - <message id="apachemodule">Mudule Apache</message> - <message id="apachecore">Fonctionalités de Base Apache</message> - <message id="apachempmcommon">Apache MPM: Directives Communes</message> - <message id="apachempm">Apache MPM</message> - - <!-- Used in description box for modulesynopsis --> - <message id="description">Description</message> - <message id="seealso">Voir aussi</message> - <message id="topics">Sujets</message> - <message id="status">Status</message> - <message id="moduleidentifier">Identificateur de Module</message> - <message id="sourcefile">Fichier Source</message> - <message id="compatibility">Compatibilité</message> - - <!-- Used in manualpage --> - <message id="relatedmodules">Modules Apparentés</message> - <message id="relateddirectives">Directives Apparentées</message> - - <!-- Used in description box for directives --> - <message id="syntax">Syntaxe</message> - <message id="default">Defaut</message> - <message id="context">Contexte</message> - <message id="override">Annuler</message> - <message id="status">Status</message> - <message id="module">Module</message> - - <!-- Used in directive context lists --> - <message id="serverconfig">configuration du serveur</message> - <message id="virtualhost">serveur virtuel</message> - <message id="directory">répertoire</message> - <message id="htaccess">.htaccess</message> - - <!-- Used for directive lists --> - <message id="directives">Directives</message> - <!-- the optional attribute replace-space-with takes a string. - if present, the space between <directive name> and 'Directive' - in directivesynopsis headings will be replaced by the given string. - (see de.xml for an example) --> - <message id="directive">Directive</message> - <message id="nodirectives">Ce module ne fournit aucune directive.</message> - - <!-- Used in summaries --> - <message id="summary">Sommaire</message> - - <!-- Used in headers and footers --> - <message id="apachetitle">- Serveur Apache HTTP</message> - <message id="apachehttpserver">Serveur Apache HTTP Version 2.1</message> - <message id="apachedocalt">[DOCUMENTATION APACHE]</message> - <message id="search">Recherche Google</message> <!-- search button --> - <message id="index">Index</message> <!-- deprecated --> - <message id="home">Accueil</message> <!-- deprecated --> - - <!-- breadcrumb links --> - <message id="apache">Apache</message> - <message id="http-server">Serveur HTTP</message> - <message id="documentation">Documentation</message> - <message id="version">Version 2.1</message> - - <!-- super menu --> - <message id="modules">Modules</message> - <message id="faq">FAQ</message> - <message id="glossary">Glossaire</message> - <message id="sitemap">Plan du site</message> - - <!-- footer line --> - <message id="licensed">Authorisé sous</message> - <message id="langavail">Langues Disponibles</message> - - <!-- not up to date --> - <message id="outofdate">Cette traduction peut être périmée. Verifiez la version - Anglaise pour les changements récents.</message> - </messages> </language> 1.18 +4 -4 httpd-2.0/docs/manual/style/lang/ja.xml Index: ja.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/ja.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ja.xml 29 Jul 2004 17:57:15 -0000 1.17 +++ ja.xml 25 Aug 2004 20:15:24 -0000 1.18 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-2022-jp"?> -<!DOCTYPE language [ <!ENTITY nbsp " "> ]> +<!DOCTYPE messages [ <!ENTITY nbsp " "> ]> <!-- English revision: 1.5 --> <!-- @@ -37,7 +37,7 @@ <!-- language link titles --> <message id="nativename">Japanese</message> - <!-- Used for the moduleindex --> + <!-- Used for the moduleindex --> <message id="corefeatures">$B%3%"5!G=$H(B MPM</message> <message id="othermodules">$BB>$N%b%8%e!<%k(B</message> @@ -84,7 +84,7 @@ <!-- Used in headers and footers --> <message id="apachetitle">- Apache HTTP $B%5!<%P(B</message> - <message id="apachehttpserver">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.1</message> + <message id="apachehttpserver">Apache HTTP $B%5!<%P(B $B%P!<%8%g%s(B 2.0</message> <message id="apachedocalt">[APACHE DOCUMENTATION]</message> <message id="search">Google Search</message> <!-- search button --> <message id="index">$B:w0z(B</message> <!-- deprecated --> @@ -94,7 +94,7 @@ <message id="apache">Apache</message> <message id="http-server">HTTP $B%5!<%P(B</message> <message id="documentation">$B%I%-%e%a%s%F!<%7%g%s(B</message> - <message id="version">$B%P!<%8%g%s(B 2.1</message> + <message id="version">$B%P!<%8%g%s(B 2.0</message> <!-- super menu --> <message id="modules">$B%b%8%e!<%k(B</message> 1.10 +4 -4 httpd-2.0/docs/manual/style/lang/ko.xml Index: ko.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/ko.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ko.xml 9 Jul 2004 13:20:16 -0000 1.9 +++ ko.xml 25 Aug 2004 20:15:24 -0000 1.10 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="EUC-KR"?> <!DOCTYPE language [ <!ENTITY nbsp " "> ]> -<!-- English Revision: 1.18 --> +<!-- English Revision: 1.6.2.10 --> <!-- Copyright 2003-2004 The Apache Software Foundation @@ -43,7 +43,7 @@ <!-- language link titles --> <message id="nativename">Korean</message> - <!-- Used for the moduleindex --> + <!-- Used for the moduleindex --> <message id="corefeatures">гы╫и ╠Б╢и╟З ╢ыаъцЁ╦╝ ╦П╣Б</message> <message id="othermodules">╢ы╦╔ ╦П╣Б</message> <message id="obsoletemodules">юлюЭ ╦П╣Б</message> @@ -99,7 +99,7 @@ <!-- Used in headers and footers --> <message id="apachetitle">- Apache HTTP Server</message> - <message id="apachehttpserver">Apache HTTP Server Version 2.1</message> + <message id="apachehttpserver">Apache HTTP Server Version 2.0</message> <message id="apachedocalt">[APACHE DOCUMENTATION]</message> <message id="search">Google ╟к╩Ж</message> <!-- search button --> <message id="index">Index</message> <!-- deprecated --> @@ -109,7 +109,7 @@ <message id="apache">Apache</message> <message id="http-server">HTTP Server</message> <message id="documentation">Documentation</message> - <message id="version">Version 2.1</message> + <message id="version">Version 2.0</message> <!-- super menu --> <message id="modules">╦П╣Б</message> 1.13 +18 -13 httpd-2.0/docs/manual/style/lang/ru.xml Index: ru.xml =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/lang/ru.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ru.xml 3 May 2004 18:20:30 -0000 1.12 +++ ru.xml 25 Aug 2004 20:15:24 -0000 1.13 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="KOI8-R"?> -<!DOCTYPE language [ <!ENTITY nbsp " "> ]> +<!DOCTYPE messages [ <!ENTITY nbsp " "> ]> <!-- English revision: 1.4 --> <!-- @@ -40,15 +40,15 @@ <message id="nativename">Russian</message> <!-- Used for the moduleindex --> - <message id="corefeatures">Особенности ядра и мульти-процессные - модули</message> + <message id="corefeatures">Ядро и мульти-процессные модули</message> <message id="othermodules">Другие модули</message> + <message id="obsoletemodules">Устаревшие модули</message> <!-- Used for the modulesynopsis and sitemap --> + <message id="obsoleteapachemodule">Устаревший модуль Apache</message> <message id="apachemodule">Модуль Apache</message> - <message id="apachecore">Особенности ядра Apache</message> - <message id="apachempmcommon">Общие для всех МП-модулей директивы - Apache</message> + <message id="apachecore">Ядро Apache</message> + <message id="apachempmcommon">Общие для всех МП-модулей директивы Apache</message> <message id="apachempm">Мульти-процессные модули Apache</message> <!-- Used in description box for modulesynopsis --> @@ -71,21 +71,26 @@ <message id="override">Разрешение</message> <message id="status">Статус</message> <message id="module">Модуль</message> - + + <!-- Used in directive context lists --> + <message id="serverconfig">server config</message> + <message id="virtualhost">virtual host</message> + <message id="directory">directory</message> + <message id="htaccess">.htaccess</message> + <!-- Used for directive lists --> <message id="directives">Директивы</message> <message id="directive">Директива</message> - <message id="nodirectives">Этот модуль не предоставляет никаких - директив.</message> + <message id="nodirectives">Этот модуль не предоставляет никаких директив.</message> <!-- Used in summaries --> <message id="summary">Резюме</message> <!-- Used in headers and footers --> <message id="apachetitle">- HTTP сервер Apache</message> - <message id="apachehttpserver">HTTP сервер Apache Версия 2.1</message> + <message id="apachehttpserver">HTTP сервер Apache версии 2.0</message> <message id="apachedocalt">[ДОКУМЕНТАЦИЯ APACHE]</message> - <message id="search">Google Search</message> <!-- search button --> + <message id="search">Поиск в Google</message> <!-- search button --> <message id="index">Оглавление</message> <!-- deprecated --> <message id="home">На главную страницу</message> <!-- deprecated --> @@ -93,7 +98,7 @@ <message id="apache">Apache</message> <message id="http-server">HTTP сервер</message> <message id="documentation">Документация</message> - <message id="version">Версия 2.1</message> + <message id="version">Версия 2.0</message> <!-- super menu --> <message id="modules">Модули</message> @@ -103,7 +108,7 @@ <!-- footer line --> <message id="licensed">Licensed under the</message> - <message id="langavail">Available Languages</message> + <message id="langavail">Доступные языки</message> <!-- not up to date --> <message id="outofdate">This translation may be out of date. Check the 1.49 +11 -4 httpd-2.0/docs/manual/style/xsl/common.xsl Index: common.xsl =================================================================== RCS file: /home/cvs/httpd-2.0/docs/manual/style/xsl/common.xsl,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- common.xsl 12 May 2004 17:57:21 -0000 1.48 +++ common.xsl 25 Aug 2004 20:15:25 -0000 1.49 @@ -325,10 +325,17 @@ <xsl:attribute name="rel">alternate</xsl:attribute> </xsl:if> <xsl:attribute name="title"> - <xsl:value-of select="document(concat('../lang/', ., - '.xml')) - /language/messages/message - [EMAIL PROTECTED]'nativename']" /> + <xsl:choose> + <xsl:when test=". != 'fr'"> <!-- no language file avail. --> + <xsl:value-of select="document(concat('../lang/', ., + '.xml')) + /language/messages/message + [EMAIL PROTECTED]'nativename']" /> + </xsl:when> + <xsl:otherwise> + <xsl:text>Français</xsl:text> + </xsl:otherwise> + </xsl:choose> </xsl:attribute>