www/philosophy gpl-american-way.ru.html po/gpl-...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/13 08:33:45

Modified files:
        philosophy     : gpl-american-way.ru.html 
        philosophy/po  : gpl-american-way.ru-en.html 
                         gpl-american-way.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gpl-american-way.ru.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gpl-american-way.ru-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gpl-american-way.ru.po?cvsroot=www&r1=1.9&r2=1.10

Patches:
Index: gpl-american-way.ru.html
===================================================================
RCS file: /web/www/www/philosophy/gpl-american-way.ru.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gpl-american-way.ru.html    19 Aug 2021 08:13:19 -0000      1.3
+++ gpl-american-way.ru.html    13 Sep 2021 12:33:43 -0000      1.4
@@ -15,12 +15,11 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.ru.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.ru.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>GNU GPL и американский путь</h2>
 
 <address class="byline">Ричард Столмен</address>
 
-<div class="article">
 <p>
 Microsoft описывает Стандартную общественную 
лицензию GNU (GNU GPL) как
 лицензию &ldquo;открытого текста&rdquo; и 
говорит, что она идет вразрез с
@@ -150,7 +149,6 @@
 повышать благосостояние людей, а не для 
того, чтобы оправдывать
 пренебрежение им.</p>
 </div>
-</div>
 
 <div class="translators-notes">
 
@@ -193,6 +191,22 @@
 переводам&rdquo;</a>.</p>
 </div>
 
+<!-- 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 4.0.  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; 2001, 2021 Richard Stallman<br />Copyright &copy; 2015,
 2021 Free Software Foundation, Inc. (translation)</p>
 
@@ -214,7 +228,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2021/08/19 08:13:19 $
+$Date: 2021/09/13 12:33:43 $
 
 <!-- timestamp end -->
 </p>

Index: po/gpl-american-way.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/gpl-american-way.ru-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/gpl-american-way.ru-en.html      19 Aug 2021 08:13:26 -0000      1.3
+++ po/gpl-american-way.ru-en.html      13 Sep 2021 12:33:45 -0000      1.4
@@ -10,12 +10,11 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>The GNU GPL and the American Way</h2>
 
 <address class="byline">by Richard M. Stallman</address>
 
-<div class="article">
 <p>
 Microsoft describes the GNU General Public License (GNU GPL) as an
 &ldquo;open source&rdquo; license, and says it is against the American
@@ -36,7 +35,7 @@
 cooperation.  This is what leads to free enterprise, to free speech,
 and to free software.</p>
 <p>
-As in &ldquo;free enterprise&rdquo; and &ldquo;free speech&rdquo;, the
+As in &ldquo;free enterprise&rdquo; and &ldquo;free speech,&rdquo; the
 &ldquo;free&rdquo; in &ldquo;free software&rdquo; refers to freedom,
 not price; specifically, it means that you have the freedom to study,
 change, and redistribute the software you use.  These freedoms permit
@@ -96,7 +95,7 @@
 to close off alternatives for them.</p>
 <p>
 Microsoft uses an anticompetitive strategy called &ldquo;embrace and
-extend&rdquo;.  This means they start with the technology others are
+extend.&rdquo;  This means they start with the technology others are
 using, add a minor wrinkle which is secret so that nobody else can
 imitate it, then use that secret wrinkle so that only Microsoft
 software can communicate with other Microsoft software.  In some
@@ -132,7 +131,7 @@
 once is surely simplistic.  To think intelligently about copyrights,
 patents or trademarks, you must think about them separately.  The
 first step is declining to lump them together as &ldquo;intellectual
-property&rdquo;.</p>
+property.&rdquo;</p>
 <p>
 My views about copyright take an hour to expound, but one general
 principle applies: it cannot justify denying the public important
@@ -141,7 +140,6 @@
 prevail.&rdquo; Property rights are meant to advance human well-being,
 not as an excuse to disregard it.</p>
 </div>
-</div>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -172,6 +170,23 @@
 information on coordinating and contributing translations of this article.</p>
 </div>
 
+<!-- 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 4.0.  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; 2001, 2021 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -182,7 +197,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 08:13:26 $
+$Date: 2021/09/13 12:33:45 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/gpl-american-way.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/gpl-american-way.ru.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/gpl-american-way.ru.po   13 Sep 2021 12:12:31 -0000      1.9
+++ po/gpl-american-way.ru.po   13 Sep 2021 12:33:45 -0000      1.10
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-09-12 08:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -76,29 +75,6 @@
 "программам."
 
 #. type: Content of: <div><p>
-# | As in &ldquo;free enterprise&rdquo; and &ldquo;free [-speech&rdquo;,-]
-# | {+speech,&rdquo;+} the &ldquo;free&rdquo; in &ldquo;free software&rdquo;
-# | refers to freedom, not price; specifically, it means that you have the
-# | freedom to study, change, and redistribute the software you use.  These
-# | freedoms permit citizens to help themselves and help each other, and thus
-# | participate in a community.  This contrasts with the more common
-# | proprietary software, which keeps users helpless and divided: the inner
-# | workings are secret, and you are prohibited from sharing the program with
-# | your neighbor.  Powerful, reliable software and improved technology are
-# | useful byproducts of freedom, but the freedom to have a community is
-# | important in its own right.
-#| msgid ""
-#| "As in &ldquo;free enterprise&rdquo; and &ldquo;free speech&rdquo;, the "
-#| "&ldquo;free&rdquo; in &ldquo;free software&rdquo; refers to freedom, not "
-#| "price; specifically, it means that you have the freedom to study, change, "
-#| "and redistribute the software you use.  These freedoms permit citizens to "
-#| "help themselves and help each other, and thus participate in a "
-#| "community.  This contrasts with the more common proprietary software, "
-#| "which keeps users helpless and divided: the inner workings are secret, "
-#| "and you are prohibited from sharing the program with your neighbor.  "
-#| "Powerful, reliable software and improved technology are useful byproducts "
-#| "of freedom, but the freedom to have a community is important in its own "
-#| "right."
 msgid ""
 "As in &ldquo;free enterprise&rdquo; and &ldquo;free speech,&rdquo; the "
 "&ldquo;free&rdquo; in &ldquo;free software&rdquo; refers to freedom, not "
@@ -229,27 +205,6 @@
 "технику для пользователей, а закрыть от 
них альтернативы."
 
 #. type: Content of: <div><p>
-# | Microsoft uses an anticompetitive strategy called &ldquo;embrace and
-# | [-extend&rdquo;.-] {+extend.&rdquo;+} This means they start with the
-# | technology others are using, add a minor wrinkle which is secret so that
-# | nobody else can imitate it, then use that secret wrinkle so that only
-# | Microsoft software can communicate with other Microsoft software.  In some
-# | cases, this makes it hard for you to use a non-Microsoft program when
-# | others you work with use a Microsoft program.  In other cases, this makes
-# | it hard for you to use a non-Microsoft program for job A if you use a
-# | Microsoft program for job B.  Either way, &ldquo;embrace and extend&rdquo;
-# | magnifies the effect of Microsoft's market power.
-#| msgid ""
-#| "Microsoft uses an anticompetitive strategy called &ldquo;embrace and "
-#| "extend&rdquo;.  This means they start with the technology others are "
-#| "using, add a minor wrinkle which is secret so that nobody else can "
-#| "imitate it, then use that secret wrinkle so that only Microsoft software "
-#| "can communicate with other Microsoft software.  In some cases, this makes "
-#| "it hard for you to use a non-Microsoft program when others you work with "
-#| "use a Microsoft program.  In other cases, this makes it hard for you to "
-#| "use a non-Microsoft program for job A if you use a Microsoft program for "
-#| "job B.  Either way, &ldquo;embrace and extend&rdquo; magnifies the effect "
-#| "of Microsoft's market power."
 msgid ""
 "Microsoft uses an anticompetitive strategy called &ldquo;embrace and extend."
 "&rdquo; This means they start with the technology others are using, add a "
@@ -309,26 +264,6 @@
 msgstr "Дополнение:"
 
 #. type: Content of: <div><p>
-# | Microsoft says that the GPL is against &ldquo;intellectual property
-# | rights.&rdquo; I have no opinion on &ldquo;intellectual property
-# | rights,&rdquo; because the term is too broad to have a sensible opinion
-# | about.  It is a catch-all, covering copyrights, patents, trademarks, and
-# | other disparate areas of law; areas so different, in the laws and in their
-# | effects, that any statement about all of them at once is surely
-# | simplistic.  To think intelligently about copyrights, patents or
-# | trademarks, you must think about them separately.  The first step is
-# | declining to lump them together as &ldquo;intellectual
-# | [-property&rdquo;.-] {+property.&rdquo;+}
-#| msgid ""
-#| "Microsoft says that the GPL is against &ldquo;intellectual property "
-#| "rights.&rdquo; I have no opinion on &ldquo;intellectual property rights,"
-#| "&rdquo; because the term is too broad to have a sensible opinion about.  "
-#| "It is a catch-all, covering copyrights, patents, trademarks, and other "
-#| "disparate areas of law; areas so different, in the laws and in their "
-#| "effects, that any statement about all of them at once is surely "
-#| "simplistic.  To think intelligently about copyrights, patents or "
-#| "trademarks, you must think about them separately.  The first step is "
-#| "declining to lump them together as &ldquo;intellectual property&rdquo;."
 msgid ""
 "Microsoft says that the GPL is against &ldquo;intellectual property rights."
 "&rdquo; I have no opinion on &ldquo;intellectual property rights,&rdquo; "