Russian doc - from KOI8-R to UTF-8

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1882453 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/style/lang-targets.xml b/docs/manual/style/lang-targets.xml
index cff861f4c23fbf247940195ff9032b4df5fe0d88..22b18950ce266e4ba0b075eabedf46bdf6a39782 100644 (file)
--- a/docs/manual/style/lang-targets.xml
+++ b/docs/manual/style/lang-targets.xml
@@ -217,7 +217,7 @@
 <!-- Russian                                                              -->
 <!-- ==================================================================== -->
 <property value=".xml.ru" name="inputext.ru"/>
-<property value=".html.ru.koi8-r" name="outputext.ru"/>
+<property value=".html.ru.utf8" name="outputext.ru"/>
 
 <target description="- builds Russian HTML files" name="ru">
     <html.generic lang="ru"/>
@@ -312,4 +312,4 @@
     </xmlvalidate>
 </target>
 
-</project>
\ No newline at end of file
+</project>

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 0a7d3df89cd5a843556bd476fab73de5a124d329..670651bf53f621ada5b269ba0e8bcd6a3960409c 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="KOI8-R"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "../lang.dtd">
 <!-- English revision: 106753 -->
 
@@ -21,9 +21,9 @@
 
 <language id="ru">
     <name>Russian</name>
-    <charset>KOI8-R</charset>
+    <charset>UTF-8</charset>
     <source-ext>.xml.ru</source-ext>
-    <target-ext>.html.ru.koi8-r</target-ext>
+    <target-ext>.html.ru.utf8</target-ext>
 
 <!-- No CHM so far (no sitemap)
     <chm>
@@ -41,31 +41,31 @@
         <message id="nativename">Russian</message>
 
         <!-- Used for the moduleindex -->
-        <message id="corefeatures">ïÓÏÂÅÎÎÏÓÔÉ ÑÄÒÁ É ÍÕÌØÔÉ-ÐÒÏÃÅÓÓÎÙÅ
-            ÍÏÄÕÌÉ</message>
-        <message id="othermodules">äÒÕÇÉÅ ÍÏÄÕÌÉ</message>
+        <message id="corefeatures">Особенности ядра и мульти-процессные
+            модули</message>
+        <message id="othermodules">Другие модули</message>
         <message id="obsoletemodules">Obsolete Modules</message>
 
         <!-- Used for the modulesynopsis and sitemap -->
         <message id="obsoleteapachemodule">Obsolete Apache Module</message>
-        <message id="apachemodule">íÏÄÕÌØ Apache</message>
-        <message id="apachecore">ïÓÏÂÅÎÎÏÓÔÉ ÑÄÒÁ Apache</message>
-        <message id="apachempmcommon">ïÂÝÉÅ ÄÌÑ ×ÓÅÈ íð-ÍÏÄÕÌÅÊ ÄÉÒÅËÔÉ×Ù
+        <message id="apachemodule">Модуль Apache</message>
+        <message id="apachecore">Особенности ядра Apache</message>
+        <message id="apachempmcommon">Общие для всех МП-модулей директивы
             Apache</message>
-        <message id="apachempm">íÕÌØÔÉ-ÐÒÏÃÅÓÓÎÙÅ ÍÏÄÕÌÉ Apache</message>
+        <message id="apachempm">Мульти-процессные модули Apache</message>
 
         <!-- Used in description box for modulesynopsis -->
-        <message id="description">ïÐÉÓÁÎÉÅ</message>
-        <message id="seealso">óÍ. ÔÁËÖÅ</message>
-        <message id="topics">ôÅÍÙ</message>
-        <message id="status">óÔÁÔÕÓ</message>
-        <message id="moduleidentifier">éÄÅÎÔÉÆÉËÁÔÏÒ&nbsp;ÍÏÄÕÌÑ</message>
-        <message id="sourcefile">éÓÈÏÄÎÙÊ&nbsp;ËÏÄ</message>
-        <message id="compatibility">óÏ×ÍÅÓÔÉÍÏÓÔØ</message>
+        <message id="description">Описание</message>
+        <message id="seealso">См. также</message>
+        <message id="topics">Темы</message>
+        <message id="status">Статус</message>
+        <message id="moduleidentifier">Идентификатор&nbsp;модуля</message>
+        <message id="sourcefile">Исходный&nbsp;код</message>
+        <message id="compatibility">Совместимость</message>
 
         <!-- Used in manualpage -->
-        <message id="relatedmodules">óÍÏÔÒÉÔÅ ÔÁËÖÅ ÍÏÄÕÌÉ</message>
-        <message id="relateddirectives">óÍÏÔÒÉÔÅ ÔÁËÖÅ ÄÉÒÅËÔÉ×Ù</message>
+        <message id="relatedmodules">Смотрите также модули</message>
+        <message id="relateddirectives">Смотрите также директивы</message>
         <message id="lowercase">abcdefghijklmnopqrstuvwxyz</message>
         <message id="uppercase">ABCDEFGHIJKLMNOPQRSTUVWXYZ</message>
         <message id="name-section">NAME</message>
@@ -76,12 +76,12 @@
         <message id="httpdreportabug">Report a bug</message>
 
         <!-- Used in description box for directives -->
-        <message id="syntax">óÉÎÔÁËÓÉÓ</message>
-        <message id="default">úÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ</message>
-        <message id="context">ëÏÎÔÅËÓÔ</message>
-        <message id="override">òÁÚÒÅÛÅÎÉÅ</message>
-        <message id="status">óÔÁÔÕÓ</message>
-        <message id="module">íÏÄÕÌØ</message>
+        <message id="syntax">Синтаксис</message>
+        <message id="default">Значение по умолчанию</message>
+        <message id="context">Контекст</message>
+        <message id="override">Разрешение</message>
+        <message id="status">Статус</message>
+        <message id="module">Модуль</message>
 
         <!-- Status descriptions -->
         <message id="base" letter="B">Base</message>
@@ -98,7 +98,7 @@
         <message id="htaccess" letter="h">.htaccess</message>
 
         <!-- Used for directive lists -->
-        <message id="directives">äÉÒÅËÔÉ×Ù</message>
+        <message id="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.
@@ -106,37 +106,37 @@
         <!-- the optional attribute before-name takes a string.
              if "yes", the 'Directive' word is place before the name instead of
              being placed behind. See fr.xml for an example. -->
-        <message id="directive">äÉÒÅËÔÉ×Á</message>
-        <message id="nodirectives">üÔÏÔ ÍÏÄÕÌØ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÎÉËÁËÉÈ
-            ÄÉÒÅËÔÉ×.</message>
+        <message id="directive">Директива</message>
+        <message id="nodirectives">Этот модуль не предоставляет никаких
+            директив.</message>
 
         <!-- Used in summaries -->
-        <message id="summary">òÅÚÀÍÅ</message>
+        <message id="summary">Резюме</message>
 
         <!-- Used for glossary link titles -->
         <message id="glossarylink">see glossary</message>
 
         <!-- Used in headers and footers -->
-        <message id="apachetitle">- HTTP ÓÅÒ×ÅÒ Apache</message>
-        <message id="apachehttpserver">HTTP ÓÅÒ×ÅÒ Apache ÷ÅÒÓÉÑ
+        <message id="apachetitle">- HTTP сервер Apache</message>
+        <message id="apachehttpserver">HTTP сервер Apache Версия
             &httpd.major;.&httpd.minor;</message>
-        <message id="apachedocalt">[äïëõíåîôáãéñ APACHE]</message>
+        <message id="apachedocalt">[ДОКУМЕНТАЦИЯ APACHE]</message>
         <message id="search">Google Search</message> <!-- search button -->
-        <message id="index">ïÇÌÁ×ÌÅÎÉÅ</message> <!-- deprecated -->
-        <message id="home">îÁ ÇÌÁ×ÎÕÀ ÓÔÒÁÎÉÃÕ</message> <!-- deprecated -->
+        <message id="index">Оглавление</message> <!-- deprecated -->
+        <message id="home">На главную страницу</message> <!-- deprecated -->
         <message id="comments">Comments</message>
 
         <!-- breadcrumb links -->
         <message id="apache">Apache</message>
-        <message id="http-server">HTTP ÓÅÒ×ÅÒ</message>
-        <message id="documentation">äÏËÕÍÅÎÔÁÃÉÑ</message>
-        <message id="version">÷ÅÒÓÉÑ &httpd.major;.&httpd.minor;</message>
+        <message id="http-server">HTTP сервер</message>
+        <message id="documentation">Документация</message>
+        <message id="version">Версия &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
-        <message id="modules">íÏÄÕÌÉ</message>
+        <message id="modules">Модули</message>
         <message id="faq">FAQ</message>
-        <message id="glossary">çÌÏÓÓÁÒÉÊ</message>
-        <message id="sitemap">ëÁÒÔÁ ÓÁÊÔÁ</message>
+        <message id="glossary">Глоссарий</message>
+        <message id="sitemap">Карта сайта</message>
 
         <!-- footer line -->
         <message id="before-license">Licensed under the</message>

diff --git a/docs/manual/style/manual.ru.xsl b/docs/manual/style/manual.ru.xsl
index 5e2f208be452ed903f2e7378d657eb083247c32c..b6c3c134a1b8e20de65e2b49a3e294dcb9a14360 100644 (file)
--- a/docs/manual/style/manual.ru.xsl
+++ b/docs/manual/style/manual.ru.xsl
@@ -18,7 +18,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:output method="xml" encoding="KOI8-R" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
+<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
 
 <!-- Read the localized messages from the specified language file -->
 <xsl:variable name="message" select="document('lang/ru.xml')/language/messages/message"/>
@@ -26,7 +26,7 @@
 <xsl:variable name="allmodules" select="document('xsl/util/allmodules.xml')/items/item[@lang=$doclang]"/>
 
 <!-- some meta information have to be passed to the transformation -->
-<xsl:variable name="output-encoding">KOI8-R</xsl:variable>
+<xsl:variable name="output-encoding">UTF-8</xsl:variable>
 <xsl:variable name="is-chm" select="false()"/>
 <xsl:variable name="is-zip" select="false()"/>
 <xsl:variable name="is-retired" select="false()"/>
@@ -34,4 +34,4 @@
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

diff --git a/docs/manual/style/xsl/util/designations.xml b/docs/manual/style/xsl/util/designations.xml
index c61899da8038a4f1b8cf874370629e97cc616f6b..c1c73a57de00159fa2b20ee7d6d0715468dfb9cc 100644 (file)
--- a/docs/manual/style/xsl/util/designations.xml
+++ b/docs/manual/style/xsl/util/designations.xml
@@ -7,7 +7,7 @@
 <item charset="UTF-8" lang="ja">.html.ja.utf8</item>
 <item charset="EUC-KR" lang="ko">.html.ko.euc-kr</item>
 <item charset="ISO-8859-1" lang="pt-br">.html.pt-br</item>
-<item charset="KOI8-R" lang="ru">.html.ru.koi8-r</item>
+<item charset="UTF-8" lang="ru">.html.ru.utf8</item>
 <item charset="UTF-8" lang="tr">.html.tr.utf8</item>
 <item charset="UTF-8" lang="zh-cn">.html.zh-cn.utf8</item>
 </items>