[kde-doc-english] [kdelibs/KDE/4.14] kdoctools/customization/ru: Update customization/ru

[Alexander Potashev]

Git commit e043a1fa3494ec706f20e8f9c6eebca16082dc52 by Alexander Potashev.
Committed on 29/05/2015 at 15:02.
Pushed by aspotashev into branch 'KDE/4.14'.

Update customization/ru

M  +2    -2    kdoctools/customization/ru/catalog.xml
M  +5    -4    kdoctools/customization/ru/entities/install-intro.docbook
M  +2    -0    kdoctools/customization/ru/strings.entities
M  +6    -8    kdoctools/customization/ru/user.entities

http://commits.kde.org/kdelibs/e043a1fa3494ec706f20e8f9c6eebca16082dc52

diff --git a/kdoctools/customization/ru/catalog.xml b/kdoctools/customization/ru/catalog.xml
index 1093312..dcc420f 100644
--- a/kdoctools/customization/ru/catalog.xml
+++ b/kdoctools/customization/ru/catalog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//RU" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
   <public publicId="-//KDE//ENTITIES Russian Documentation V1.0//RU"
           uri="lang.entities"/>
@@ -18,7 +18,7 @@
   <public publicId="-//GNU//DOCUMENT GNU Free Documentation License V1.1//RU"
           uri="common/fdl-translated"/>
   <public publicId="-//KDE//DOCUMENT GPL Licence Declaration//RU"
-          uri="entities/underGPL.docbook"/> />
+          uri="entities/underGPL.docbook"/>
   <public publicId="-//KDE//DOCUMENT LGPL Licence Declaration//RU"
           uri="entities/underLGPL.docbook"/> 
   <public publicId="-//KDE//DOCUMENT FDL Licence Declaration//RU"
diff --git a/kdoctools/customization/ru/entities/install-intro.docbook b/kdoctools/customization/ru/entities/install-intro.docbook
index 8d796f2..f6dc124 100644
--- a/kdoctools/customization/ru/entities/install-intro.docbook
+++ b/kdoctools/customization/ru/entities/install-intro.docbook
@@ -1,5 +1,6 @@
-<!-- requires that packagename is defined in the documentation prologue -->
-<para>&kappname; - это часть проекта &kde; &kde-http;.</para>
+<!-- requires that kappname is defined in the documentation prologue
+ -->
+<para>&kappname; — часть проекта &kde; &kde-http;.</para>
 
-<para>&kappname; входит в пакет &package; на &kde-ftp;, 
-основном &FTP;-сервере &kde;.</para>
+<para>&kappname; можно загрузить с <ulink url="http://download.kde.org/">
+файлового сервера</ulink> проекта &kde;.</para>
diff --git a/kdoctools/customization/ru/strings.entities b/kdoctools/customization/ru/strings.entities
index d497ed9..1e85abe 100644
--- a/kdoctools/customization/ru/strings.entities
+++ b/kdoctools/customization/ru/strings.entities
@@ -26,3 +26,5 @@
 <!ENTITY kde.modespec '
  <modespec id="kdems-help">help:</modespec>
   <modespec id="kdems-man">man:</modespec>'>
+
+<!ENTITY olinktype "kde-installation">
diff --git a/kdoctools/customization/ru/user.entities b/kdoctools/customization/ru/user.entities
index f6f139e..455e494 100644
--- a/kdoctools/customization/ru/user.entities
+++ b/kdoctools/customization/ru/user.entities
@@ -6,21 +6,20 @@
      names (which if they occur will cost you a _lot_ of time)
  -->
 
-<!ENTITY kcontrol "<application>Центр управления &kde;</application>" ><!-- kde help -->
 <!ENTITY khelpcenter "<application>Центр справки &kde;</application>" ><!-- khelpcenter -->
 <!ENTITY LMB    "<mousebutton>левая</mousebutton> кнопка мыши">
 <!ENTITY MMB    "<mousebutton>средняя</mousebutton> кнопка мыши">
 <!ENTITY RMB    "<mousebutton>правая</mousebutton> кнопка мыши">
 
 <!ENTITY dpi    '<acronym>dpi</acronym>'>
-<!ENTITY etc    "<abbrev>и т.д.</abbrev>">
 <!ENTITY FAQ    '<acronym>FAQ</acronym>'>
+<!ENTITY etc    "<abbrev>и т.д.</abbrev>">
+<!ENTITY eg     "<abbrev>например</abbrev>">
+<!ENTITY ie     "<abbrev>т.е.</abbrev>">
 
-<!-- Temporary hack - please translate to Russian:
+<!ENTITY kcontrol "<application>Параметры системы</application>">
+<!ENTITY kcontrolcenter	"<application>Параметры системы</application>">
 
-     (you may adapt the entity's name to transliterated Russian as well)
--->
-<!ENTITY kcontrolcenter	"<application>&kde; Control Center</application>">
 <!ENTITY kicon	"<guiicon>
 <inlinemediaobject>
  <objectinfo><title>K-нопка</title></objectinfo>
@@ -30,6 +29,7 @@
 </guiicon> icon"><!-- if image is localised, then entityref should be used 
                       instead of fileref -->
 <!ENTITY kmenu  "<guimenu>K</guimenu>-меню">
+
 <!ENTITY Shift  "<keycap>Shift</keycap>">
 <!ENTITY Alt    "<keycap>Alt</keycap>">
 <!ENTITY Tab    "<keycap>Tab</keycap>">
@@ -37,5 +37,3 @@
 <!ENTITY Enter  "<keycap>Enter</keycap>">
 <!ENTITY OS     "ОС">
 <!ENTITY Ctrl   "<keycap>Ctrl</keycap>">
-<!ENTITY eg     "<abbrev>например</abbrev>">
-<!ENTITY ie     "<abbrev>т.е.</abbrev>">