Corrected ru translation of entities

5 files changed, 114 insertions, 35 deletions

diff --git a/common/entities/entities-ru.ent b/common/entities/entities-ru.ent
index c8c8090..0332940 100644
--- a/common/entities/entities-ru.ent
+++ b/common/entities/entities-ru.ent
@@ -1,5 +1,5 @@
 <!-- Group: Automatic Entities -->
-<!ENTITY FDPCOMMONDIR  "../../docs-common/common" > <!-- Base directory -->
+
   <!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
 
   <!-- Group: Fedora common entries -->
@@ -41,13 +41,13 @@
   
   <!-- Group: Common doc files -->
 
-    <!ENTITY LEGALNOTICE SYSTEM "../../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
-    <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
-    <!ENTITY LEGALNOTICE-OPL SYSTEM "../../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
-    <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
-    <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
-    <!ENTITY LEGALNOTICE-SECTION SYSTEM "../../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
-    <!ENTITY BUG-REPORTING SYSTEM "../../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE SYSTEM "NONE/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-CONTENT SYSTEM "NONE/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-OPL SYSTEM "NONE/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "NONE/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "NONE/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-SECTION SYSTEM "NONE/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY BUG-REPORTING SYSTEM "NONE/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
   
   <!-- Group: Common applications -->
 
@@ -58,7 +58,7 @@
   
   <!-- Group: Tutorial Titles -->
 
-    <!ENTITY IG  "Installation Guide" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY IG  "Руководство по установке" > <!-- FIXME: PLEASE DEFINE ME -->
     <!ENTITY DOCG  "Documentation Guide" > <!-- FIXME: PLEASE DEFINE ME -->
   
   <!-- Group: Tutorial URL's -->
diff --git a/common/entities/entities-ru.xml b/common/entities/entities-ru.xml
index c9420b8..b7abceb 100644
--- a/common/entities/entities-ru.xml
+++ b/common/entities/entities-ru.xml
@@ -151,7 +151,7 @@
   <group name="Tutorial Titles">
     <entity name="IG">
       <comment/>
-      <text>Installation Guide</text>
+      <text>Руководство по установке</text>
     </entity>
     <entity name="DOCG">
       <comment/>
diff --git a/common/entities/ru.po b/common/entities/ru.po
index 508bd7d..b23eda6 100644
--- a/common/entities/ru.po
+++ b/common/entities/ru.po
@@ -1,13 +1,16 @@
+# translation of ru.po to Russian
+# Andrew Martynov <andrewm@inventa.ru>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ru\n"
 "POT-Creation-Date: 2006-03-02 16:46-0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2006-03-07 22:26+0300\n"
+"Last-Translator: Andrew Martynov <andrewm@inventa.ru>\n"
+"Language-Team: Russian <fedora-trans-ru@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.1\n"
 
 #: entities-en_US.xml:4(title)
 msgid ""
@@ -134,7 +137,7 @@ msgstr ""
 
 #: entities-en_US.xml:88(text)
 msgid "Red Hat"
-msgstr ""
+msgstr "Red Hat"
 
 #: entities-en_US.xml:91(comment)
 msgid "The generic term \"Red Hat, Inc.\""
@@ -142,7 +145,7 @@ msgstr ""
 
 #: entities-en_US.xml:92(text)
 msgid "<use entity=\"RH\"/> Inc."
-msgstr ""
+msgstr "<use entity=\"RH\"/> Inc."
 
 #: entities-en_US.xml:95(comment)
 msgid "The generic term \"Red Hat Linux\""
@@ -150,7 +153,7 @@ msgstr ""
 
 #: entities-en_US.xml:96(text)
 msgid "<use entity=\"RH\"/> Linux"
-msgstr ""
+msgstr "<use entity=\"RH\"/> Linux"
 
 #: entities-en_US.xml:99(comment)
 msgid "The generic term \"Red Hat Network\""
@@ -158,7 +161,7 @@ msgstr ""
 
 #: entities-en_US.xml:100(text)
 msgid "<use entity=\"RH\"/> Network"
-msgstr ""
+msgstr "<use entity=\"RH\"/> Network"
 
 #: entities-en_US.xml:103(comment)
 msgid "The generic term \"Red Hat Enterprise Linux\""
@@ -166,7 +169,7 @@ msgstr ""
 
 #: entities-en_US.xml:104(text)
 msgid "<use entity=\"RH\"/> Enterprise Linux"
-msgstr ""
+msgstr "<use entity=\"RH\"/> Enterprise Linux"
 
 #: entities-en_US.xml:109(comment)
 msgid "Generic technology term"
@@ -174,39 +177,39 @@ msgstr ""
 
 #: entities-en_US.xml:110(text)
 msgid "SELinux"
-msgstr ""
+msgstr "SELinux"
 
 #: entities-en_US.xml:116(text)
 msgid "legalnotice-en.xml"
-msgstr ""
+msgstr "legalnotice-en.xml"
 
 #: entities-en_US.xml:120(text)
 msgid "legalnotice-content-en.xml"
-msgstr ""
+msgstr "legalnotice-content-en.xml"
 
 #: entities-en_US.xml:124(text)
 msgid "legalnotice-opl-en.xml"
-msgstr ""
+msgstr "legalnotice-opl-en.xml"
 
 #: entities-en_US.xml:128(text)
 msgid "opl.xml"
-msgstr ""
+msgstr "opl.xml"
 
 #: entities-en_US.xml:132(text)
 msgid "legalnotice-relnotes-en.xml"
-msgstr ""
+msgstr "legalnotice-relnotes-en.xml"
 
 #: entities-en_US.xml:136(text)
 msgid "legalnotice-section-en.xml"
-msgstr ""
+msgstr "legalnotice-section-en.xml"
 
 #: entities-en_US.xml:140(text)
 msgid "bugreporting-en.xml"
-msgstr ""
+msgstr "bugreporting-en.xml"
 
 #: entities-en_US.xml:154(text)
 msgid "Installation Guide"
-msgstr ""
+msgstr "Руководство по установке"
 
 #: entities-en_US.xml:158(text)
 msgid "Documentation Guide"
@@ -214,21 +217,22 @@ msgstr ""
 
 #: entities-en_US.xml:174(text)
 msgid "draftnotice-en.xml"
-msgstr ""
+msgstr "draftnotice-en.xml"
 
 #: entities-en_US.xml:178(text)
 msgid "legacynotice-en.xml"
-msgstr ""
+msgstr "legacynotice-en.xml"
 
 #: entities-en_US.xml:182(text)
 msgid "obsoletenotice-en.xml"
-msgstr ""
+msgstr "obsoletenotice-en.xml"
 
 #: entities-en_US.xml:186(text)
 msgid "deprecatednotice-en.xml"
-msgstr ""
+msgstr "deprecatednotice-en.xml"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: entities-en_US.xml:0(None)
 msgid "translator-credits"
-msgstr ""
+msgstr "Andrew Martynov <andrewm@inventa.ru>, 2006"
+
diff --git a/common/fedora-entities-ru.ent b/common/fedora-entities-ru.ent
new file mode 100644
index 0000000..cbeebc3
--- /dev/null
+++ b/common/fedora-entities-ru.ent
@@ -0,0 +1,76 @@
+<!-- $Id: fedora-entities-ru.ent,v 1.1 2006/03/14 16:19:50 andrmart Exp $ -->
+
+<!--
+  These common entities are useful shorthand
+  terms and names, which may be subject to
+  change at anytime.  This is an important
+  value the entity provides, a single location
+  to update terms and common names.
+-->
+
+<!-- *************** Fedora common entities *************** -->
+<!ENTITY FED "Fedora">  <!-- Generic root term -->
+<!ENTITY CORE "Core">  <!-- Generic root term -->
+<!ENTITY FC "&FED; &CORE;">  <!-- Generic main project name -->
+<!ENTITY DISTRO "&FC;">  <!-- Legacy entity -->
+<!ENTITY FCX "FC">  <!-- Short project name -->
+<!ENTITY FP "&FED; Project">  <!-- Generic overall project name -->
+<!ENTITY FDP "&FED; Documentation Project">  <!-- Generic docs project name -->
+<!ENTITY FDPX "&FED; Docs Project">  <!-- Short docs project name -->
+<!ENTITY EX "Extras"> <!-- cf. Core  -->
+<!ENTITY FEX "&FED; &EX;"> <!-- cf. Fedora Core  -->
+
+<!ENTITY FP-URL "<ulink url='http://fedora.redhat.com/'>http://fedora.redhat.com/</ulink>"> <!-- Fedora Project URL -->
+<!ENTITY FDP-URL "<ulink url='http://fedora.redhat.com/projects/docs/'>http://fedora.redhat.com/projects/docs/</ulink>"> <!-- Fedora Docs Project URL -->
+<!ENTITY FDPDOCS-URL "<ulink url='http://fedora.redhat.com/docs/'>http://fedora.redhat.com/docs/</ulink>"> <!-- Fedora Documentation (repository) URL -->
+
+<!ENTITY BZ "Bugzilla"> <!-- Bugzilla -->
+<!ENTITY BZ-URL "<ulink url='http://bugzilla.redhat.com/'>http://bugzilla.redhat.com/</ulink>"> <!-- Bugzilla URL -->
+<!ENTITY BZ-PROD "&FED; Documentation"> <!-- Bugzilla product for Fedora docs -->
+
+<!-- *************** Fedora version numbers *************** -->
+<!ENTITY FCVER "4">  <!-- Current release version of main project -->
+<!ENTITY TESTVER "test3"> <!-- Current test number of main project -->
+<!ENTITY FCTESTVER "5 &TESTVER;">  <!-- Current test version of main project  -->
+
+
+<!-- ************** other common names *********** -->
+<!ENTITY RH "Red Hat"> <!-- The generic term "Red Hat" -->
+<!ENTITY FORMAL-RHI "&RH;, Inc."> <!-- The generic term "Red Hat, Inc. -->
+<!ENTITY RHL "&RH; Linux"> <!-- The generic term "Red Hat Linux" -->
+<!ENTITY RHN "&RH; Network"> <!-- The generic term "Red Hat Network" -->
+<!ENTITY RHEL "&RH; Enterprise Linux"> <!-- The generic term "Red Hat Enterprise Linux" -->
+
+<!-- ************** technology terms *********** -->
+<!ENTITY SEL "SELinux"> <!-- Generic technology term -->
+
+<!-- ************** common doc files *********** -->
+<!ENTITY LEGALNOTICE SYSTEM "./legalnotice-en.xml">
+<!ENTITY LEGALNOTICE-CONTENT SYSTEM "./legalnotice-content-en.xml">
+<!ENTITY LEGALNOTICE-OPL SYSTEM "./legalnotice-opl-en.xml">
+<!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "./opl.xml">
+<!ENTITY LEGALNOTICE-RELNOTES SYSTEM "./legalnotice-relnotes-ru.xml">
+<!ENTITY LEGALNOTICE-SECTION SYSTEM "./legalnotice-section-en.xml">
+<!ENTITY BUG-REPORTING SYSTEM "./bugreporting-en.xml">
+
+<!-- ************** common applications? *********** -->
+
+<!-- ************** required by build scripts *********** -->
+
+<!ENTITY PROJECT "&FP;">
+
+<!-- ************** tutorial titles ********** -->
+
+<!ENTITY IG "Руководство по установке">
+<!ENTITY DOCG "Documentation Guide">
+
+<!-- ************** tutorial URLs *********** -->
+
+<!ENTITY IG-URL "<ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'/>">
+<!ENTITY DOCG-URL "<ulink url='http://fedora.redhat.com/participate/documentation-guide/'/>">
+
+<!-- ************** status notices ************* -->
+<!ENTITY DRAFTNOTICE SYSTEM "./draftnotice-en.xml">
+<!ENTITY LEGACYNOTICE SYSTEM "./legacynotice-en.xml">
+<!ENTITY OBSOLETENOTICE SYSTEM "./obsoletenotice-en.xml">
+<!ENTITY DEPRECATEDNOTICE SYSTEM "./deprecatednotice-en.xml">
diff --git a/common/legalnotice-relnotes-ru.xml b/common/legalnotice-relnotes-ru.xml
index d3459e3..230a8b0 100644
--- a/common/legalnotice-relnotes-ru.xml
+++ b/common/legalnotice-relnotes-ru.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!-- This needs to be fixed when there are "ru" entities! -->
-<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-en_US.ent">
+<!ENTITY % FEDORA-ENTITIES SYSTEM "fedora-entities-ru.ent">
 %FEDORA-ENTITIES;
 
 ]>