www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: GNUN
Subject: www home.ru.html gnu/gnu.ru.html gnu/po/gnu.ru-...
Date: Sat, 29 Mar 2014 09:58:54 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/03/29 09:58:54

Modified files:
        .              : home.ru.html 
        gnu            : gnu.ru.html 
        gnu/po         : gnu.ru-en.html gnu.ru.po 
        po             : home.ru-en.html home.ru.po 
        server         : body-include-1.ru.html footer-text.ru.html 
        server/po      : body-include-1.ru.po footer-text.ru.po 
        software       : software.ru.html 
        software/po    : software.ru-en.html software.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.241&r2=1.242
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu.ru.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.ru-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.ru.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru-en.html?cvsroot=www&r1=1.111&r2=1.112
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ru.po?cvsroot=www&r1=1.432&r2=1.433
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-1.ru.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/footer-text.ru.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-1.ru.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/footer-text.ru.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.ru.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ru-en.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ru.po?cvsroot=www&r1=1.65&r2=1.66

Patches:
Index: home.ru.html
===================================================================
RCS file: /web/www/www/home.ru.html,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- home.ru.html        29 Mar 2014 08:33:05 -0000      1.241
+++ home.ru.html        29 Mar 2014 09:58:51 -0000      1.242
@@ -203,8 +203,8 @@
 
 <div id="fs-gang">
 <div class="img-container">
-<a href="http://www.fsf.org/working-together/gang";>meet the free software
-gang<img src="/graphics/fs-gang.png" alt="[FS gang]"/></a>
+<a href="http://www.fsf.org/working-together/gang";>пообщайтесь со 
свободными
+программами<img src="/graphics/fs-gang.png" alt="[Ватага 
свободных программ]"/></a>
 </div> 
 
 <!-- /img-container -->
@@ -252,7 +252,7 @@
  <p></p><p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/03/29 08:33:05 $
+$Date: 2014/03/29 09:58:51 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/gnu.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu.ru.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gnu/gnu.ru.html     27 Mar 2014 05:00:20 -0000      1.39
+++ gnu/gnu.ru.html     29 Mar 2014 09:58:51 -0000      1.40
@@ -9,17 +9,26 @@
 <title>Операционная система GNU - Проект GNU - 
Фонд свободного программного
 обеспечения</title>
 
+<style type="text/css" media="print,screen">
+#dynamic-duo { float: right; width: 24em; font-style: normal; text-align:
+center; padding: .8em; margin: .3em 1em 1em 1em; border: .5em solid #acc890;
+} #dynamic-duo p strong { font-size: 1.3em; } #dynamic-duo img { width:
+100%; } #dynamic-duo p.highlight-para { text-align: left; padding: .5em .8em
+.7em .8em; margin: .5em; border-width: 1px; }
+</style>
+
 <!--#include virtual="/gnu/po/gnu.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Операционная система GNU</h2>
 
-<div style="width: 300px; padding: 15px; margin: 15px; margin-top: 0; float: 
right; border: 6px solid #bd0;">
-<h4 class="center">Дистрибутивы</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU и Linux" /></a></p>
-<p><span class="highlight">Если вы хотите установить 
полную систему, обратитесь
-к нашему <a href="/distros/free-distros.html">списку 
дистрибутивов
-GNU/Linux, полностью состоящих из свободных 
программ</a>.</span></p>
-</div>
+<blockquote id="dynamic-duo">
+<p><strong>Дистрибутивы</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU и Linux" 
/></a></p>
+<p class="highlight-para">Если вы хотите установить 
полную систему, обратитесь к нашему <a
+href="/distros/free-distros.html">списку дистрибутивов 
GNU/Linux, полностью
+состоящих из свободных программ</a>.</p>
+</blockquote>
 
 <ul>
   <li><a href="/gnu/about-gnu.html">Об операционной 
системе GNU</a></li>
@@ -145,7 +154,7 @@
  <p></p><p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/03/27 05:00:20 $
+$Date: 2014/03/29 09:58:51 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/gnu.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu.ru-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/po/gnu.ru-en.html       27 Mar 2014 05:00:21 -0000      1.22
+++ gnu/po/gnu.ru-en.html       29 Mar 2014 09:58:51 -0000      1.23
@@ -2,18 +2,40 @@
 <!-- Parent-Version: 1.76 -->
 <title>The GNU Operating System
 - GNU project - Free Software Foundation</title>
+
+<style type="text/css" media="print,screen">
+#dynamic-duo {
+   float: right;
+   width: 24em;
+   font-style: normal;
+   text-align: center;
+   padding: .8em;
+   margin: .3em 1em 1em 1em;
+   border: .5em solid #acc890;
+}
+#dynamic-duo p strong {
+   font-size: 1.3em;
+}
+#dynamic-duo img { width: 100%; }
+#dynamic-duo p.highlight-para {
+   text-align: left;
+   padding: .5em .8em .7em .8em;
+   margin: .5em;
+   border-width: 1px;
+}
+</style>
 <!--#include virtual="/gnu/po/gnu.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>The GNU Operating System</h2>
 
-<div style="width: 300px; padding: 15px; margin: 15px; margin-top: 0; float: 
right; border: 6px solid #bd0;">
-<h4 class="center">Download distributions</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" /></a></p>
-<p><span class="highlight">If you're looking for a whole system to
-install, see
-our <a href="/distros/free-distros.html">list of
-GNU/Linux distributions which are entirely free software</a>.</span></p>
-</div>
+<blockquote id="dynamic-duo">
+<p><strong>Download distributions</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" 
/></a></p>
+<p class="highlight-para">If you're looking for a whole system to
+install, see our <a href="/distros/free-distros.html">list of
+GNU/Linux distributions which are entirely free software</a>.</p>
+</blockquote>
 
 <ul>
   <li><a href="/gnu/about-gnu.html">About the GNU Operating System</a></li>
@@ -121,7 +143,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/27 05:00:21 $
+$Date: 2014/03/29 09:58:51 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu.ru.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/gnu.ru.po    29 Mar 2014 09:38:01 -0000      1.32
+++ gnu/po/gnu.ru.po    29 Mar 2014 09:58:52 -0000      1.33
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-29 07:43+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -45,8 +44,6 @@
 msgstr "Операционная система GNU"
 
 #. type: Content of: <blockquote><p>
-# | [-Download distributions-]{+<strong>Download distributions</strong>+}
-#| msgid "Download distributions"
 msgid "<strong>Download distributions</strong>"
 msgstr "<strong>Дистрибутивы</strong>"
 
@@ -63,22 +60,14 @@
 msgstr "</a>"
 
 #. type: Content of: <blockquote><p>
-# | [-<span class=\"highlight\">If-]{+If+} you're looking for a whole system
-# | to install, see our <a href=\"/distros/free-distros.html\">list of
-# | GNU/Linux distributions which are entirely free [-software</a>.</span>-]
-# | {+software</a>.+}
-#| msgid ""
-#| "<span class=\"highlight\">If you're looking for a whole system to "
-#| "install, see our <a href=\"/distros/free-distros.html\">list of GNU/Linux "
-#| "distributions which are entirely free software</a>.</span>"
 msgid ""
 "If you're looking for a whole system to install, see our <a href=\"/distros/"
 "free-distros.html\">list of GNU/Linux distributions which are entirely free "
 "software</a>."
 msgstr ""
-"Если вы хотите установить полную систему, "
-"обратитесь к нашему <a 
href=\"/distros/free-distros.html\">списку "
-"дистрибутивов GNU/Linux, полностью состоящих 
из свободных программ</a>."
+"Если вы хотите установить полную систему, 
обратитесь к нашему <a href=\"/"
+"distros/free-distros.html\">списку дистрибутивов 
GNU/Linux, полностью "
+"состоящих из свободных программ</a>."
 
 # type: Content of: <ul><li>
 #. type: Content of: <ul><li>

Index: po/home.ru-en.html
===================================================================
RCS file: /web/www/www/po/home.ru-en.html,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- po/home.ru-en.html  21 Mar 2014 04:58:15 -0000      1.111
+++ po/home.ru-en.html  29 Mar 2014 09:58:52 -0000      1.112
@@ -7,15 +7,16 @@
 <meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
 <link rel="alternate" title="Planet GNU" 
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
 
+<!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/po/home.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
 <p class="netscape4">Richard Stallman announced in September 1983 the plan to 
develop a free software Unix-like operating system called GNU. GNU is the only 
operating system developed specifically for the sake of users' freedom.</p>
 
-<div class="yui-g home">
-    <div class="yui-u first">
+<div id="home">
+<div class="first-column">
 
-      <h2>What is GNU?</h2>
+<h2>What is GNU?</h2>
 
 <p>GNU is a Unix-like operating system that
 is <a href="/philosophy/free-sw.html">free software</a>&mdash;it
@@ -24,7 +25,7 @@
 versions of GNU</a> (more precisely, GNU/Linux systems) which are
 entirely free software. <a href="/provide.html">What we provide</a>.</p>
 
-<p class="c" style="margin: 0em"><a href="/distros/screenshot.html"><img
+<p class="c"><a href="/distros/screenshot.html"><img
    src="/graphics/t-desktop-4-small.jpg" alt="Screenshot of GNU"
    /></a></p>
 
@@ -48,37 +49,6 @@
 many <a href="/gnu/gnu-linux-faq.html">call it &ldquo;Linux&rdquo; by
 mistake</a>.</p>
 
-
-</div><!-- class="yui-u first" -->
-
-      <div class="yui-u">
-
-      <p class="button c large"><a
-      href="/distros/free-distros.html">Download GNU now</a></p>
-
-      <div class="emph-box">
-
-<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a 
href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" alt="RSS 
Feed" /></a></h4>
-
-<!--#include virtual="/planetfeeds.html" -->
-
-<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>
-and the list of <a href="/software/recent-releases.html">recent GNU
-releases</a>.</p>
-
-<!--#include virtual="/server/home-pkgselect.html" -->
-<!--#include virtual="/server/home-pkgblurbs.html" -->
-
-<p><small><a href="/manual/blurbs.html">Short descriptions for all GNU
-packages.</a></small></p>
-
-</div><!-- class="emph-box" -->
-</div><!-- class="yui-u" -->
-</div><!-- class="yui-g home" -->
-
-<div class="yui-gc">
-    <div class="yui-u first">
-
 <h2>What is Free Software?</h2>
 
 <p>&ldquo;<a href="/philosophy/free-sw.html">Free software</a>&rdquo;
@@ -102,12 +72,37 @@
     (freedom 3).   Access to the source code is a precondition for this.</li>
 </ul>
 
-</div><!-- class="yui-u first" -->
 
-<div class="yui-u">
+</div><!-- /first-column -->
+
+<div class="second-column">
+
+<p class="button c large"><a
+      href="/distros/free-distros.html">Download GNU now</a></p>
+
+<div class="emph-box">
+
+<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a 
href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" alt="RSS 
Feed" /></a></h4>
+
+<!--#include virtual="/planetfeeds.html" -->
+
+<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>
+and the list of <a href="/software/recent-releases.html">recent GNU
+releases</a>.</p>
+
+<!--#include virtual="/server/home-pkgselect.html" -->
+<!--#include virtual="/server/home-pkgblurbs.html" -->
+
+<p><small><a href="/manual/blurbs.html">Short descriptions for all GNU
+packages.</a></small></p>
+
+</div><!-- class="emph-box" -->
+
+<div id="Action">
+
 <!-- BEGIN TakeAction -->
+<h2>Take Action</h2>
 
-<h2 id="Action">Take Action</h2>
 <ul>
 <li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
 campaigns</a></strong>.</li>
@@ -147,10 +142,11 @@
 </ul>
 
 <!-- END TakeAction -->
-</div><!-- class="yui-u" -->
-</div><!-- class="yui-gc" -->
+</div><!-- /Action -->
+</div><!-- /second-column -->
+</div><!-- /home -->
 
-<div class="yui-g highlight-para">
+<div class="highlight-para">
 
 <p><strong>Can you contribute to any of
 these <a href="http://www.fsf.org/campaigns/priority-projects/";>High
@@ -183,10 +179,23 @@
   <a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
 See the package web pages for more information.</p>
 
-</div><!-- class="yui-g highlight-para" -->
+</div><!-- /highlight-para -->
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+
+<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
+organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
+href="http://www.fsfla.org/";>Latin America</a> and <a
+href="http://fsf.org.in/";>India</a>.</p>
+
+<div id="fs-gang">
+<div class="img-container">
+<a href="http://www.fsf.org/working-together/gang";>meet the free software
+gang<img src="/graphics/fs-gang.png" alt=" [FS gang] "/></a>
+</div> <!-- /img-container -->
+</div> <!-- /fs-gang -->
+
 <div id="footer">
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -210,11 +219,6 @@
 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
-<p>The <a href="http://www.fsf.org/";>FSF</a> also has sister
-organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
-href="http://www.fsfla.org/";>Latin America</a> and <a
-href="http://fsf.org.in/";>India</a>.</p>
-
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
 Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
@@ -223,7 +227,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/21 04:58:15 $
+$Date: 2014/03/29 09:58:52 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.ru.po
===================================================================
RCS file: /web/www/www/po/home.ru.po,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -b -r1.432 -r1.433
--- po/home.ru.po       29 Mar 2014 09:38:00 -0000      1.432
+++ po/home.ru.po       29 Mar 2014 09:58:52 -0000      1.433
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-29 08:27+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -414,8 +413,8 @@
 "<a href=\"http://www.fsf.org/working-together/gang\";>meet the free software "
 "gang"
 msgstr ""
-"<a href=\"http://www.fsf.org/working-together/gang\";>пообщайтесь 
со свободными "
-"программами"
+"<a href=\"http://www.fsf.org/working-together/gang\";>пообщайтесь 
со "
+"свободными программами"
 
 #. type: Attribute 'alt' of: <div><div><a><img>
 msgid "[FS gang]"

Index: server/body-include-1.ru.html
===================================================================
RCS file: /web/www/www/server/body-include-1.ru.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/body-include-1.ru.html       29 Mar 2014 06:49:51 -0000      1.13
+++ server/body-include-1.ru.html       29 Mar 2014 09:58:52 -0000      1.14
@@ -3,8 +3,8 @@
 <!-- start of server/body-include-1.html -->
 <!--#set var="HTML_BODY" value="yes" -->
 <div id="toplinks">
- <a href="#content">Skip to main text</a>&nbsp;&nbsp; <a
-href="/accessibility/">Accessibility</a>
+ <a href="#content">Перейти к тексту</a>&nbsp;&nbsp; <a
+href="/accessibility/">Доступность</a>
 </div> 
 
 <!-- /toplinks -->
@@ -12,8 +12,8 @@
  <form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
   <div>
   <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
-value="Why GNU/Linux?" onfocus="this.value=''" /> <input type="submit"
-value="Search" />
+value="Почему GNU/Linux?" onfocus="this.value=''" /> <input type="submit"
+value="Поиск" />
   </div>
  </form>
 </div>

Index: server/footer-text.ru.html
===================================================================
RCS file: /web/www/www/server/footer-text.ru.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/footer-text.ru.html  29 Mar 2014 06:50:20 -0000      1.32
+++ server/footer-text.ru.html  29 Mar 2014 09:58:52 -0000      1.33
@@ -16,21 +16,22 @@
 <div id="mission-statement">
 
 <blockquote>
-<p><a href="http://www.fsf.org";><img id="fsfbanner"
-src="/graphics/fsf-logo-notext.png" alt="[FSF logo]"/></a><strong>&ldquo;Our 
mission is to preserve, protect and promote the
-freedom to use, study, copy, modify, and redistribute computer software, and
-to defend the rights of Free Software users.&rdquo;</strong></p>
+<p><a href="http://www.fsf.org/";><img id="fsfbanner"
+src="/graphics/fsf-logo-notext.png" alt="[Эмблема 
ФСПО]"/></a><strong>&ldquo;Наша задача&nbsp;&mdash; сох
ранение, защита и поддержка
+свободы использования, изучения, 
модификации, копирования и распространения
+компьютерных программ, а также защита прав 
пользователей свободных
+программ&rdquo;.</strong></p>
 </blockquote>
 
-<p>The <a href="http://www.fsf.org";>Free Software Foundation</a> is the
-principal organizational sponsor of the GNU Operating System.
-<strong>Support GNU and the FSF</strong> by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="https://my.fsf.org/associate/support_freedom?referrer=4052";>
-<strong>joining the FSF</strong></a> as an associate member, or making a
-<strong>donation</strong>, either <a href="http://donate.fsf.org/";>directly
-to the FSF</a> or <a
-href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via Flattr</a>.</p>
+<p><a href="http://www.fsf.org";>Фонд свободного 
программного
+обеспечения</a>&nbsp;&mdash; ведущая организация, 
ответственная за
+разработку <a href="http://www.gnu.org/";>операционной 
системы
+GNU</a>. <strong>Поддержите GNU и ФСПО</strong> <a
+href="http://shop.fsf.org/";>покупкой руководств и 
других товаров</a>, <a
+href="http://www.fsf.org/join";><strong>присоединением к 
ФСПО</strong></a> в
+качестве члена-партнера или 
<strong>пожертвованиями</strong>, <a
+href="http://donate.fsf.org/";>прямо в фонд</a> или <a
+href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>по Flattr</a>.</p>
 
 <p id="backtotop"><a href="#header">к началу</a></p>
 

Index: server/po/body-include-1.ru.po
===================================================================
RCS file: /web/www/www/server/po/body-include-1.ru.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/po/body-include-1.ru.po      29 Mar 2014 09:38:01 -0000      1.19
+++ server/po/body-include-1.ru.po      29 Mar 2014 09:58:52 -0000      1.20
@@ -15,22 +15,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-29 05:40+0000\n"
 
 #. type: Content of: <div>
-# | <a href=\"#content\">Skip to main [-text</a> | <span class=\"netscape4\">
-# | <a href=\"#navigation\">Skip to navigation</a> |</span>-]
-# | {+text</a>&nbsp;&nbsp;+} <a href=\"/accessibility/\">Accessibility</a>
-#| msgid ""
-#| "<a href=\"#content\">Skip to main text</a> | <span class=\"netscape4\"> "
-#| "<a href=\"#navigation\">Skip to navigation</a> |</span> <a href=\"/"
-#| "accessibility/\">Accessibility</a>"
 msgid ""
 "<a href=\"#content\">Skip to main text</a>&nbsp;&nbsp; <a href=\"/"
 "accessibility/\">Accessibility</a>"
 msgstr ""
-"<a href=\"#content\">Перейти к тексту</a>&nbsp;&nbsp; "
-"<a href=\"/accessibility/\">Доступность</a>"
+"<a href=\"#content\">Перейти к тексту</a>&nbsp;&nbsp; <a 
href=\"/"
+"accessibility/\">Доступность</a>"
 
 #. type: Content of: <div><form><div>
 msgid ""
@@ -39,5 +31,5 @@
 "\" value=\"Search\" />"
 msgstr ""
 "<input name=\"phrase\" id=\"phrase\" type=\"text\" size=\"18\" accesskey=\"s"
-"\" value=\"Почему GNU/Linux?\" onfocus=\"this.value=''\" /> <input 
type=\"submit"
-"\" value=\"Поиск\" />"
+"\" value=\"Почему GNU/Linux?\" onfocus=\"this.value=''\" /> <input 
type="
+"\"submit\" value=\"Поиск\" />"

Index: server/po/footer-text.ru.po
===================================================================
RCS file: /web/www/www/server/po/footer-text.ru.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/po/footer-text.ru.po 29 Mar 2014 09:38:01 -0000      1.28
+++ server/po/footer-text.ru.po 29 Mar 2014 09:58:52 -0000      1.29
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-29 05:38+0000\n"
 
 # type: Content of: <div><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
@@ -56,9 +55,6 @@
 
 # type: Content of: <div><div><div><div><ul><li><ul><li>
 #. type: Content of: <div><blockquote><p><a>
-# | <a [-href=\"http://www.fsf.org/\";>FSF&nbsp;home&nbsp;page</a>-]
-# | {+href=\"http://www.fsf.org\";>+}
-#| msgid "<a href=\"http://www.fsf.org/\";>FSF&nbsp;home&nbsp;page</a>"
 msgid "<a href=\"http://www.fsf.org\";>"
 msgstr "<a href=\"http://www.fsf.org/\";>"
 
@@ -72,41 +68,13 @@
 "freedom to use, study, copy, modify, and redistribute computer software, and "
 "to defend the rights of Free Software users.&rdquo;</strong>"
 msgstr ""
-"</a><strong>&ldquo;Наша задача&nbsp;&mdash; сохранение, 
защита и поддержка свободы "
-"использования, изучения, модификации, 
копирования и распространения "
+"</a><strong>&ldquo;Наша задача&nbsp;&mdash; сохранение, 
защита и поддержка "
+"свободы использования, изучения, 
модификации, копирования и 
распространения "
 "компьютерных программ, а также защита 
прав пользователей свободных "
 "программ&rdquo;.</strong>"
 
 # type: Content of: <div><div><p>
 #. type: Content of: <div><p>
-# | [-<small>The-]{+The+} <a href=\"http://www.fsf.org\";>Free Software
-# | Foundation</a> is the principal organizational sponsor of the [-<a
-# | href=\"http://www.gnu.org/\";>GNU-] {+GNU+} Operating [-System</a>.
-# | <strong>Our mission is to preserve, protect and promote the freedom to
-# | use, study, copy, modify, and redistribute computer software, and to
-# | defend the rights of Free Software users.</strong> Support-] {+System. 
-# | <strong>Support+} GNU and the [-FSF-] {+FSF</strong>+} by <a
-# | href=\"http://shop.fsf.org/\";>buying manuals and gear</a>, <a
-# | [-href=\"http://www.fsf.org/join\";>joining-]
-# | {+href=\"https://my.fsf.org/associate/support_freedom?referrer=4052\";>
-# | <strong>joining+} the [-FSF-] {+FSF</strong></a>+} as an associate
-# | [-member</a>-] {+member,+} or [-by-] making a [-donation,-]
-# | {+<strong>donation</strong>,+} either <a
-# | href=\"http://donate.fsf.org/\";>directly to the FSF</a> or <a
-# | href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>via
-# | [-Flattr</a>.</small>-] {+Flattr</a>.+}
-#| msgid ""
-#| "<small>The <a href=\"http://www.fsf.org\";>Free Software Foundation</a> is "
-#| "the principal organizational sponsor of the <a href=\"http://www.gnu.org/";
-#| "\">GNU Operating System</a>. <strong>Our mission is to preserve, protect "
-#| "and promote the freedom to use, study, copy, modify, and redistribute "
-#| "computer software, and to defend the rights of Free Software users.</"
-#| "strong> Support GNU and the FSF by <a href=\"http://shop.fsf.org/";
-#| "\">buying manuals and gear</a>, <a href=\"http://www.fsf.org/join";
-#| "\">joining the FSF as an associate member</a> or by making a donation, "
-#| "either <a href=\"http://donate.fsf.org/\";>directly to the FSF</a> or <a "
-#| "href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>via Flattr</"
-#| "a>.</small>"
 msgid ""
 "The <a href=\"http://www.fsf.org\";>Free Software Foundation</a> is the "
 "principal organizational sponsor of the GNU Operating System.  "
@@ -117,15 +85,15 @@
 "\"http://donate.fsf.org/\";>directly to the FSF</a> or <a href=\"http://";
 "flattr.com/thing/313733/gnuproject-on-Flattr\">via Flattr</a>."
 msgstr ""
-"<a href=\"http://www.fsf.org\";>Фонд свободного 
программного "
-"обеспечения</a>&nbsp;&mdash; ведущая 
организация, ответственная за "
-"разработку <a href=\"http://www.gnu.org/\";>операционной 
системы GNU</a>. "
-"<strong>"
-"Поддержите GNU и ФСПО</strong> <a 
href=\"http://shop.fsf.org/\";>покупкой руководств и "
-"других товаров</a>, <a 
href=\"http://www.fsf.org/join\";><strong>присоединением к "
-"ФСПО</strong></a> в качестве члена-партнера или 
<strong>пожертвованиями</strong>, <a href=\"http://";
-"donate.fsf.org/\">прямо в фонд</a> или <a 
href=\"http://flattr.com/";
-"thing/313733/gnuproject-on-Flattr\">по Flattr</a>."
+"<a href=\"http://www.fsf.org\";>Фонд свободного 
программного обеспечения</"
+"a>&nbsp;&mdash; ведущая организация, 
ответственная за разработку <a href="
+"\"http://www.gnu.org/\";>операционной системы GNU</a>. 
<strong>Поддержите GNU "
+"и ФСПО</strong> <a href=\"http://shop.fsf.org/\";>покупкой 
руководств и "
+"других товаров</a>, <a href=\"http://www.fsf.org/join";
+"\"><strong>присоединением к ФСПО</strong></a> в 
качестве члена-партнера или "
+"<strong>пожертвованиями</strong>, <a 
href=\"http://donate.fsf.org/\";>прямо в "
+"фонд</a> или <a 
href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr";
+"\">по Flattr</a>."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: software/software.ru.html
===================================================================
RCS file: /web/www/www/software/software.ru.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- software/software.ru.html   24 Mar 2014 04:59:08 -0000      1.34
+++ software/software.ru.html   29 Mar 2014 09:58:53 -0000      1.35
@@ -9,16 +9,26 @@
 <title>Программы - Проект GNU - Фонд свободного 
программного обеспечения</title>
 
 <!--#include virtual="/software/po/software.translist" -->
+<style type="text/css" media="print,screen">
+#dynamic-duo { float: right; width: 24em; font-style: normal; text-align:
+center; padding: .8em; margin: .3em 1em 1em 1em; border: .5em solid #acc890;
+} #dynamic-duo p strong { font-size: 1.3em; } #dynamic-duo img { width:
+100%; } #dynamic-duo p.highlight-para { text-align: left; padding: .5em .8em
+.7em .8em; margin: .5em; border-width: 1px; }
+</style>
+
+<!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Программы GNU</h2>
 
-<div style="width: 300px; padding: 15px; margin: 15px; float: right; border: 
6px solid #bd0;">
-<h4 class="center">Дистрибутивы</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU и Linux" /></a></p>
-<p><span class="highlight">Если вы хотите установить 
полную систему, обратитесь
-к нашему <a href="/distros/free-distros.html">списку 
дистрибутивов
-GNU/Linux, полностью состоящих из свободных 
программ</a>.</span></p>
-</div>
+<blockquote id="dynamic-duo">
+<p><strong>Дистрибутивы</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU и Linux" 
/></a></p>
+<p class="highlight-para">Если вы хотите установить 
полную систему, обратитесь к нашему <a
+href="/distros/free-distros.html">списку дистрибутивов 
GNU/Linux, полностью
+состоящих из свободных программ</a>.</p>
+</blockquote>
 
 <p><a href="/gnu/about-gnu.html">GNU</a>&nbsp;&mdash; операционная 
система,
 на&nbsp;100% состоящая из свободных программ. Р
аботы над ней были начаты
@@ -193,7 +203,17 @@
 href="xmhtml/">xmhtml</a>, <a href="zebra/">zebra</a>.
 </p>
 
+</div>
 
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.ru.html" -->
+<div id="fs-gang">
+<div class="img-container">
+<a href="http://www.fsf.org/working-together/gang";>пообщайтесь со 
свободными
+программами<img src="/graphics/fs-gang.png" alt="[Ватага 
свободных программ]"/></a>
+</div> 
+
+<!-- /img-container -->
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -205,8 +225,7 @@
 </ol></div>
 </div>
 
-<!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.ru.html" -->
+<!-- /fs-gang -->
 <div id="footer">
 <div class="unprintable">
 
@@ -273,7 +292,7 @@
  <p></p><p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/03/24 04:59:08 $
+$Date: 2014/03/29 09:58:53 $
 
 <!-- timestamp end -->
 </p>

Index: software/po/software.ru-en.html
===================================================================
RCS file: /web/www/www/software/po/software.ru-en.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- software/po/software.ru-en.html     24 Mar 2014 04:59:08 -0000      1.32
+++ software/po/software.ru-en.html     29 Mar 2014 09:58:53 -0000      1.33
@@ -1,20 +1,44 @@
 <!--#include virtual="/server/header.html" -->
 <!-- Parent-Version: 1.76 -->
-<title>Software - GNU Project - Free Software Foundation</title>
-
+<title>Software
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/software/po/software.translist" -->
+
+<style type="text/css" media="print,screen">
+#dynamic-duo {
+   float: right;
+   width: 24em;
+   font-style: normal;
+   text-align: center;
+   padding: .8em;
+   margin: .3em 1em 1em 1em;
+   border: .5em solid #acc890;
+}
+#dynamic-duo p strong {
+   font-size: 1.3em;
+}
+#dynamic-duo img { width: 100%; }
+#dynamic-duo p.highlight-para {
+   text-align: left;
+   padding: .5em .8em .7em .8em;
+   margin: .5em;
+   border-width: 1px;
+}
+</style>
+
+<!--#include virtual="/server/fs-gang-definitions.html" -->
 <!--#include virtual="/server/banner.html" -->
 
 <h2>GNU Software</h2>
 
-<div style="width: 300px; padding: 15px; margin: 15px; float: right; border: 
6px solid #bd0;">
-<h4 class="center">Download distributions</h4>
-<p><a href="/distros/free-distros.html"><img 
src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" /></a></p>
-<p><span class="highlight">If you're looking for a whole system to
-install, see
-our <a href="/distros/free-distros.html">list of
-GNU/Linux distributions which are entirely free software</a>.</span></p>
-</div>
+<blockquote id="dynamic-duo">
+<p><strong>Download distributions</strong></p>
+<p><a href="/distros/free-distros.html">
+<img src="/graphics/gnu-and-penguin-color-300x276.jpg" alt="GNU and Linux" 
/></a></p>
+<p class="highlight-para">If you're looking for a whole system to
+install, see our <a href="/distros/free-distros.html">list of
+GNU/Linux distributions which are entirely free software</a>.</p>
+</blockquote>
 
 <p><a href="/gnu/about-gnu.html">GNU</a> is an operating system which is
 100% free software.  It was launched in 1983 by Richard Stallman (rms)
@@ -231,6 +255,14 @@
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
+
+<div id="fs-gang">
+<div class="img-container">
+<a href="http://www.fsf.org/working-together/gang";>meet the free software
+gang<img src="/graphics/fs-gang.png" alt=" [FS gang] "/></a>
+</div> <!-- /img-container -->
+</div> <!-- /fs-gang -->
+
 <div id="footer">
 <div class="unprintable">
 
@@ -286,7 +318,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/24 04:59:08 $
+$Date: 2014/03/29 09:58:53 $
 <!-- timestamp end -->
 </p>
 </div>

Index: software/po/software.ru.po
===================================================================
RCS file: /web/www/www/software/po/software.ru.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- software/po/software.ru.po  29 Mar 2014 09:38:00 -0000      1.65
+++ software/po/software.ru.po  29 Mar 2014 09:58:54 -0000      1.66
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-03-29 07:43+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -41,8 +40,6 @@
 msgstr "Программы GNU"
 
 #. type: Content of: <blockquote><p>
-# | [-Download distributions-]{+<strong>Download distributions</strong>+}
-#| msgid "Download distributions"
 msgid "<strong>Download distributions</strong>"
 msgstr "<strong>Дистрибутивы</strong>"
 
@@ -408,8 +405,8 @@
 "<a href=\"http://www.fsf.org/working-together/gang\";>meet the free software "
 "gang"
 msgstr ""
-"<a href=\"http://www.fsf.org/working-together/gang\";>пообщайтесь 
со свободными "
-"программами"
+"<a href=\"http://www.fsf.org/working-together/gang\";>пообщайтесь 
со "
+"свободными программами"
 
 #. type: Attribute 'alt' of: <div><div><a><img>
 msgid "[FS gang]"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]