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

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     13/06/17 05:58:59

Modified files:
        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/software/software.ru.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ru-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ru.po?cvsroot=www&r1=1.52&r2=1.53

Patches:
Index: software.ru.html
===================================================================
RCS file: /web/www/www/software/software.ru.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- software.ru.html    1 Jun 2013 05:58:14 -0000       1.27
+++ software.ru.html    17 Jun 2013 05:58:59 -0000      1.28
@@ -1,6 +1,7 @@
 
 
 <!--#include virtual="/server/header.ru.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/software/software.en.html" -->
@@ -196,32 +197,57 @@
 <!--#include virtual="/server/footer.ru.html" -->
 <div id="footer">
 
-<p>
-Пожалуйста, присылайте запросы фонду и GNU 
по адресу <a
+<p>Пожалуйста, присылайте общие запросы 
фонду и GNU по адресу <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Есть также <a
-href="/contact/">другие способы связаться</a> с 
фондом.
-<br />
-Пожалуйста, присылайте отчеты о 
неработающих ссылках и другие поправки или
-предложения по адресу <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+href="/contact/">другие способы связаться</a> с 
фондом. Отчеты о
+неработающих ссылках и другие поправки 
или предложения можно присылать по
+адресу <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
 <p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
 Мы старались сделать этот перевод точным и 
качественным, но исключить
 возможность ошибки мы не можем. 
Присылайте, пожалуйста, свои замечания и
 предложения по переводу по адресу <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 </p><p>Сведения по координации и 
предложениям переводов наших статей см. в
 <a href="/server/standards/README.translations.html">&ldquo;Ð 
уководстве по
-переводам&rdquo;</a>.
-</p>
+переводам&rdquo;</a>.</p>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 2013 Free Software Foundation, Inc.</p>
+
 <p>Это произведение доступно по <a rel="license"
 
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.
-</p>
+производных произведений</em>) 3.0 США</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -233,12 +259,11 @@
  <p><!-- timestamp start -->
 Обновлено:
 
-$Date: 2013/06/01 05:58:14 $
+$Date: 2013/06/17 05:58:59 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/software.ru-en.html
===================================================================
RCS file: /web/www/www/software/po/software.ru-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/software.ru-en.html      1 Jun 2013 05:58:14 -0000       1.27
+++ po/software.ru-en.html      17 Jun 2013 05:58:59 -0000      1.28
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-
+<!-- Parent-Version: 1.75 -->
 <title>Software - GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/software/po/software.translist" -->
@@ -58,7 +58,7 @@
 <li>Get a copy from a friend.</li>
 
 <li>Buy a computer with a wholly free GNU/Linux system preinstalled
-From <a href="/links/companies.html">one of the companies</a> that
+from <a href="/links/companies.html">one of the companies</a> that
 offers this.</li>
 
 <li><a href="/order/ftp.html">Download individual packages from the web
@@ -223,39 +223,61 @@
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
 
-<p>
-Please send FSF &amp; GNU inquiries to
+<p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 2013 Free Software Foundation, Inc.</p>
 
-<p>Copyright &copy; 2013 Free Software Foundation,
-Inc.</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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/06/01 05:58:14 $
+$Date: 2013/06/17 05:58:59 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/software.ru.po
===================================================================
RCS file: /web/www/www/software/po/software.ru.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- po/software.ru.po   17 Jun 2013 05:33:14 -0000      1.52
+++ po/software.ru.po   17 Jun 2013 05:58:59 -0000      1.53
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-06-17 04:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"
@@ -140,12 +139,6 @@
 msgstr "Взять копию у знакомого."
 
 #. type: Content of: <ul><li>
-# | Buy a computer with a wholly free GNU/Linux system preinstalled
-# | [-F-]{+f+}rom <a href=\"/links/companies.html\">one of the companies</a>
-# | that offers this.
-#| msgid ""
-#| "Buy a computer with a wholly free GNU/Linux system preinstalled From <a "
-#| "href=\"/links/companies.html\">one of the companies</a> that offers this."
 msgid ""
 "Buy a computer with a wholly free GNU/Linux system preinstalled from <a href="
 "\"/links/companies.html\">one of the companies</a> that offers this."