www home.ru.html po/home.ru-en.html po/home.ru.po

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/07/14 09:59:08

Modified files:
        .              : home.ru.html 
        po             : home.ru-en.html home.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.ru.html?cvsroot=www&r1=1.335&r2=1.336
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru-en.html?cvsroot=www&r1=1.171&r2=1.172
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru.po?cvsroot=www&r1=1.581&r2=1.582

Patches:
Index: home.ru.html
===================================================================
RCS file: /web/www/www/home.ru.html,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -b -r1.335 -r1.336
--- home.ru.html        14 Jul 2018 10:33:03 -0000      1.335
+++ home.ru.html        14 Jul 2018 13:59:06 -0000      1.336
@@ -227,31 +227,31 @@
    src="/distros/screenshots/trisquel8-mate-medium.jpg"
    alt="&nbsp;[Экран Trisquel&nbsp;8 с оконной системой 
MATE]&nbsp;" /></a>
 </div>
-<p><small><a href="https://trisquel.info";>Trisquel&nbsp;8</a> with <a
-href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
-and Inkscape (vector graphics editor)</small></p>
+<p><small><a href="https://trisquel.info";>Trisquel&nbsp;8</a> с оконной
+системой <a href="https://mate-desktop.org/";>MATE</a>, 
браузером Abrowser и
+векторным графическим редактором 
Inkscape</small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = guix" -->
 <div class="screenshot">
  <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
    src="/distros/screenshots/guixSD-gnome3-medium.jpg"
-   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a>
+   alt="&nbsp;[Экран GuixSD&nbsp;0.15 с оконной системой 
GNOME&nbsp;3]&nbsp;" /></a>
 </div>
-<p><small><a href="/software/guix/">GuixSD&nbsp;0.15</a> with <a
-href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop, Epiphany web
-browser, Totem video player, and GNOME terminal emulator</small></p>
+<p><small><a href="/software/guix/">GuixSD&nbsp;0.15</a> с оконной 
системой <a
+href="https://www.gnome.org/";>GNOME&nbsp;3</a>, браузером Epiphany,
+видеопроигрывателем Totem и эмулятором 
терминала GNOME</small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = pureos8" -->
 <div class="screenshot">
  <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
    src="/distros/screenshots/gnome3-medium.jpg"
-   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
+   alt="&nbsp;[Экран PureOS&nbsp;8 с оконной системой 
GNOME&nbsp;3]&nbsp;" /></a>
 </div>
-<p><small><a href="https://www.pureos.net/";>PureOS&nbsp;8</a> with <a
-href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop, PureBrowser (web
-browser), and Gimp (image editor)</small></p>
+<p><small><a href="https://www.pureos.net/";>PureOS&nbsp;8</a> с оконной
+системой <a href="https://www.gnome.org/";>GNOME&nbsp;3</a> с 
браузером
+IceCat и графическим редактором Gimp</small></p>
 
 <!--#endif -->
 <table class="thumbs">
@@ -261,10 +261,10 @@
    alt="&nbsp;[Экран Trisquel&nbsp;8 с оконной системой 
MATE]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=guix#gnu-linux"><img
    src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
-   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a></td>
+   alt="&nbsp;[Экран GuixSD&nbsp;0.15 с оконной системой 
GNOME&nbsp;3]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=pureos8#gnu-linux"><img
    src="/distros/screenshots/gnome3-thumb.jpg"
-   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
+   alt="&nbsp;[Экран PureOS&nbsp;8 с оконной системой 
GNOME&nbsp;3]&nbsp;" /></a></td>
  </tr>
  <tr class="caption">
   <td><small>Trisquel&nbsp;8 &amp; MATE</small></td>
@@ -521,7 +521,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2018/07/14 10:33:03 $
+$Date: 2018/07/14 13:59:06 $
 
 <!-- timestamp end -->
 </p>

Index: po/home.ru-en.html
===================================================================
RCS file: /web/www/www/po/home.ru-en.html,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- po/home.ru-en.html  13 Jul 2018 09:01:26 -0000      1.171
+++ po/home.ru-en.html  14 Jul 2018 13:59:08 -0000      1.172
@@ -2,7 +2,7 @@
 <!-- Parent-Version: 1.85 -->
    <!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
 --><!--#set var="DISTRO" value="$1"
---><!--#else --><!--#set var="DISTRO" value="guix"
+--><!--#else --><!--#set var="DISTRO" value="pureos8"
 --><!--#endif -->
 <title>The GNU Operating System and the Free Software Movement</title>
 
@@ -214,25 +214,26 @@
    alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" /></a>
 </div>
 <p><small><a href="https://trisquel.info";>Trisquel&nbsp;8</a> with <a
-href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser web browser,
-and Inkscape vector graphics editor</small></p><!--#endif
+href="https://mate-desktop.org/";>MATE</a> desktop, Abrowser (web browser),
+and Inkscape (vector graphics editor)</small></p><!--#endif
 --><!--#if expr="$DISTRO = guix" -->
 <div class="screenshot">
  <a href="/distros/screenshots/guixSD-gnome3.jpg"><img
    src="/distros/screenshots/guixSD-gnome3-medium.jpg"
-   alt="&nbsp;[Screenshot of GuixSD with GNOME&nbsp;3 desktop]&nbsp;" /></a>
+   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a>
 </div>
-<p><small><a href="/software/guix/">GuixSD</a> with <a
+<p><small><a href="/software/guix/">GuixSD&nbsp;0.15</a> with <a
 href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop, Epiphany web
 browser, Totem video player, and GNOME terminal emulator</small></p><!--#endif
---><!--#if expr="$DISTRO = gnome3" -->
+--><!--#if expr="$DISTRO = pureos8" -->
 <div class="screenshot">
- <a href="/distros/screenshots/gnome3-medium.jpg"><img
+ <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
    src="/distros/screenshots/gnome3-medium.jpg"
-   alt="&nbsp;[Screenshot of GNOME&nbsp;3 desktop]&nbsp;" /></a>
+   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a>
 </div>
-<p><small><a href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop with
-IceCat web browser, and Gimp image editor</small></p><!--#endif -->
+<p><small><a href="https://www.pureos.net/";>PureOS&nbsp;8</a> with <a
+href="https://www.gnome.org/";>GNOME&nbsp;3</a> desktop,
+PureBrowser (web browser), and Gimp (image editor)</small></p><!--#endif -->
 
 <table class="thumbs">
  <tr class="image">
@@ -241,15 +242,15 @@
    alt="&nbsp;[Screenshot of Trisquel&nbsp;8 with MATE desktop]&nbsp;" 
/></a></td>
   <td><a href="/home.html?distro=guix#gnu-linux"><img
    src="/distros/screenshots/guixSD-gnome3-thumb.jpg"
-   alt="&nbsp;[Screenshot of GuixSD with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
-  <td><a href="/home.html?distro=gnome3#gnu-linux"><img
+   alt="&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 
desktop]&nbsp;" /></a></td>
+  <td><a href="/home.html?distro=pureos8#gnu-linux"><img
    src="/distros/screenshots/gnome3-thumb.jpg"
-   alt="&nbsp;[Screenshot of GNOME&nbsp;3 desktop]&nbsp;" /></a></td>
+   alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
  </tr>
  <tr class="caption">
   <td><small>Trisquel&nbsp;8 &amp; MATE</small></td>
   <td><small>GuixSD &amp; GNOME&nbsp;3</small></td>
-  <td><small>GNOME&nbsp;3</small></td>
+  <td><small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small></td>
  </tr>
 </table>
 </div>
@@ -487,7 +488,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/07/13 09:01:26 $
+$Date: 2018/07/14 13:59:08 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.ru.po
===================================================================
RCS file: /web/www/www/po/home.ru.po,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -b -r1.581 -r1.582
--- po/home.ru.po       14 Jul 2018 13:37:33 -0000      1.581
+++ po/home.ru.po       14 Jul 2018 13:59:08 -0000      1.582
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-07-14 10:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -106,14 +105,6 @@
 msgstr "</a>"
 
 #. type: Content of: <div><div><div><p>
-# | <small><a href=\"https://trisquel.info\";>Trisquel&nbsp;8</a> with <a
-# | href=\"https://mate-desktop.org/\";>MATE</a> desktop, Abrowser [-web
-# | browser,-] {+(web browser),+} and Inkscape {+(+}vector graphics
-# | editor{+)+}</small>
-#| msgid ""
-#| "<small><a href=\"https://trisquel.info\";>Trisquel&nbsp;8</a> with <a href="
-#| "\"https://mate-desktop.org/\";>MATE</a> desktop, Abrowser web browser, and "
-#| "Inkscape vector graphics editor</small>"
 msgid ""
 "<small><a href=\"https://trisquel.info\";>Trisquel&nbsp;8</a> with <a href="
 "\"https://mate-desktop.org/\";>MATE</a> desktop, Abrowser (web browser), and "
@@ -129,62 +120,37 @@
 msgstr "<a href=\"/distros/screenshots/guixSD-gnome3.jpg\">"
 
 #. type: Attribute 'alt' of: <div><div><div><table><tr><td><a><img>
-# | &nbsp;[Screenshot of [-GuixSD-] {+GuixSD&nbsp;0.15+} with GNOME&nbsp;3
-# | desktop]&nbsp;
-#| msgid "&nbsp;[Screenshot of GuixSD with GNOME&nbsp;3 desktop]&nbsp;"
 msgid "&nbsp;[Screenshot of GuixSD&nbsp;0.15 with GNOME&nbsp;3 desktop]&nbsp;"
 msgstr "&nbsp;[Экран GuixSD&nbsp;0.15 с оконной системой 
GNOME&nbsp;3]&nbsp;"
 
 #. type: Content of: <div><div><div><p>
-# | <small><a [-href=\"/software/guix/\">GuixSD</a>-]
-# | {+href=\"/software/guix/\">GuixSD&nbsp;0.15</a>+} with <a
-# | href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, Epiphany web
-# | browser, Totem video player, and GNOME terminal emulator</small>
-#| msgid ""
-#| "<small><a href=\"/software/guix/\">GuixSD</a> with <a href=\"https://www.";
-#| "gnome.org/\">GNOME&nbsp;3</a> desktop, Epiphany web browser, Totem video "
-#| "player, and GNOME terminal emulator</small>"
 msgid ""
 "<small><a href=\"/software/guix/\">GuixSD&nbsp;0.15</a> with <a href="
 "\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, Epiphany web browser, "
 "Totem video player, and GNOME terminal emulator</small>"
 msgstr ""
-"<small><a href=\"/software/guix/\">GuixSD&nbsp;0.15</a> с оконной 
системой <a href="
-"\"https://www.gnome.org/\";>GNOME&nbsp;3</a>, браузером Epiphany, "
+"<small><a href=\"/software/guix/\">GuixSD&nbsp;0.15</a> с оконной 
системой "
+"<a href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a>, браузером 
Epiphany, "
 "видеопроигрывателем Totem и эмулятором 
терминала GNOME</small>"
 
 # type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><div><div><a>
-# | <a [-href=\"/distros/screenshots/guixSD-gnome3.jpg\">-]
-# | {+href=\"/distros/screenshots/pureos8-gnome3.jpg\">+}
-#| msgid "<a href=\"/distros/screenshots/guixSD-gnome3.jpg\">"
 msgid "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
 msgstr "<a href=\"/distros/screenshots/pureos8-gnome3.jpg\">"
 
 #. type: Attribute 'alt' of: <div><div><div><table><tr><td><a><img>
-# | &nbsp;[Screenshot of [-GuixSD-] {+PureOS&nbsp;8+} with GNOME&nbsp;3
-# | desktop]&nbsp;
-#| msgid "&nbsp;[Screenshot of GuixSD with GNOME&nbsp;3 desktop]&nbsp;"
 msgid "&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;"
 msgstr "&nbsp;[Экран PureOS&nbsp;8 с оконной системой 
GNOME&nbsp;3]&nbsp;"
 
 #. type: Content of: <div><div><div><p>
-# | <small><a [-href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop-]
-# | {+href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a>+} with [-IceCat web
-# | browser,-] {+<a href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop,
-# | PureBrowser (web browser),+} and Gimp [-image editor</small>-] {+(image
-# | editor)</small>+}
-#| msgid ""
-#| "<small><a href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop with "
-#| "IceCat web browser, and Gimp image editor</small>"
 msgid ""
 "<small><a href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a> with <a href="
 "\"https://www.gnome.org/\";>GNOME&nbsp;3</a> desktop, PureBrowser (web "
 "browser), and Gimp (image editor)</small>"
 msgstr ""
 "<small><a href=\"https://www.pureos.net/\";>PureOS&nbsp;8</a> с 
оконной "
-"системой <a href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> с "
-"браузером IceCat и графическим редактором 
Gimp</small>"
+"системой <a href=\"https://www.gnome.org/\";>GNOME&nbsp;3</a> с 
браузером "
+"IceCat и графическим редактором Gimp</small>"
 
 #. type: Content of: <div><div><div><table><tr><td><a>
 msgid "<a href=\"/home.html?distro=trisquel8#gnu-linux\">"
@@ -195,9 +161,6 @@
 msgstr "<a href=\"/home.html?distro=guix#gnu-linux\">"
 
 #. type: Content of: <div><div><div><table><tr><td><a>
-# | <a [-href=\"/home.html?distro=guix#gnu-linux\">-]
-# | {+href=\"/home.html?distro=pureos8#gnu-linux\">+}
-#| msgid "<a href=\"/home.html?distro=guix#gnu-linux\">"
 msgid "<a href=\"/home.html?distro=pureos8#gnu-linux\">"
 msgstr "<a href=\"/home.html?distro=pureos8#gnu-linux\">"
 
@@ -210,8 +173,6 @@
 msgstr "<small>GuixSD &amp; GNOME&nbsp;3</small>"
 
 #. type: Content of: <div><div><div><table><tr><td>
-# | [-<small>GuixSD-]{+<small>PureOS&nbsp;8+} &amp; GNOME&nbsp;3</small>
-#| msgid "<small>GuixSD &amp; GNOME&nbsp;3</small>"
 msgid "<small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small>"
 msgstr "<small>PureOS&nbsp;8 &amp; GNOME&nbsp;3</small>"