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

www licenses/license-list.ru.html licenses/po/l...

From: GNUN
Subject: www licenses/license-list.ru.html licenses/po/l...
Date: Tue, 28 Jan 2014 12:00:18 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/01/28 12:00:18

Modified files:
        licenses       : license-list.ru.html 
        licenses/po    : license-list.ru-en.html license-list.ru.po 
        philosophy     : microsoft-new-monopoly.ru.html 
                         software-literary-patents.ru.html 
        philosophy/po  : microsoft-new-monopoly.ru-en.html 
                         microsoft-new-monopoly.ru.po 
                         software-literary-patents.ru-en.html 
                         software-literary-patents.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-new-monopoly.ru.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/software-literary-patents.ru.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-new-monopoly.ru-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-new-monopoly.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/software-literary-patents.ru-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/software-literary-patents.ru.po?cvsroot=www&r1=1.9&r2=1.10

Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- licenses/license-list.ru.html       9 Jan 2014 05:58:31 -0000       1.51
+++ licenses/license-list.ru.html       28 Jan 2014 12:00:17 -0000      1.52
@@ -487,6 +487,31 @@
 также будут удовлетворять подобному 
требованию из этой лицензии.</p></dd>
 
 
+<dt><a id="informal"> Неформальная лицензия</a> <span
+class="anchor-reference-id">(<a href="#informal">#informal</a>)</span></dt>
+<dd>
+<p>&ldquo;Неформальная лицензия&rdquo; означает 
заявление вроде &ldquo;делайте
+с этим все, что хотите&rdquo; или &ldquo;вы можете 
перераспространять эту
+программу и изменять ее&rdquo;.</p>
+
+<p>В Соединенных Штатах эти лицензии 
предполагается толковать на основании
+того, что автор, по-видимому, 
подразумевает. Так что они, вероятно, 
означают
+то, что они означают с первого взгляда. Это 
делало бы их лицензиями
+свободных программ без авторского лева, 
совместимыми с GNU GPL. Однако
+неудачный выбор формулировки мог бы 
придать этому другой смысл.</p>
+
+<p>Однако во многих других странах принят 
более жесткий подход к лицензиям
+авторского права. Неизвестно, что могли бы 
решить суды в этих странах о том,
+как толковать неформальные заявления. 
Суды могли бы даже решить, что это
+вообще не лицензия.</p>
+
+<p>Если вы хотите, чтобы ваша программа была 
свободной, не навлекайте на своих
+пользователей излишних неприятностей. 
Выберите и воспользуйтесь, пожалуйста,
+какой-нибудь известной лицензией 
свободных программ. Мы предлагаем <a
+href="/licenses/license-recommendations.html"> рекомендации</a>, 
которым
+советуем вам следовать.</p></dd>
+
+
 <dt><a id="intel" href="http://directory.fsf.org/wiki/License:IntelACPI";>
 Лицензия открытого исходного текста Intel 
(Intel Open Source License)</a>
 <span class="anchor-reference-id">(<a href="#intel">#intel</a>)</span></dt>
@@ -2285,7 +2310,7 @@
  <p><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/01/09 05:58:31 $
+$Date: 2014/01/28 12:00:17 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- licenses/po/license-list.ru-en.html 9 Jan 2014 05:58:31 -0000       1.44
+++ licenses/po/license-list.ru-en.html 28 Jan 2014 12:00:17 -0000      1.45
@@ -507,6 +507,31 @@
 this license.</p></dd>
 
 
+<dt><a id="informal">
+    Informal license</a>
+    <span class="anchor-reference-id">(<a 
href="#informal">#informal</a>)</span></dt>
+<dd>
+<p>An &ldquo;informal license&rdquo; means a statement such as
+&ldquo;do whatever you like with this&rdquo; or &ldquo;you can
+redistribute this code and change it.&rdquo;</p>
+
+<p>In the United States, these licenses are supposed to be interpreted
+based on what the author seems to intend.  So they probably mean what
+they appear to mean.  That would make them non-copyleft free software
+licenses and compatible with the GNU GPL.  However, an unlucky choice
+of wording could give it a different meaning.</p>
+
+<p>However, many other countries have a more rigid approach to
+copyright licenses.  There is no telling what courts in those
+countries might decide an informal statement means.  Courts might
+even decide that it is not a license at all.</p>
+
+<p>If you want your code to be free, don't invite gratuitous trouble
+for your users.  Please choose and apply an established free software
+license.  We offer <a href="/licenses/license-recommendations.html">
+recommendations</a> that we suggest you follow.</p></dd>
+
+
 <dt><a id="intel"
       href="http://directory.fsf.org/wiki/License:IntelACPI";>
     Intel Open Source License</a>
@@ -2283,7 +2308,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/01/09 05:58:31 $
+$Date: 2014/01/28 12:00:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- licenses/po/license-list.ru.po      28 Jan 2014 11:51:05 -0000      1.102
+++ licenses/po/license-list.ru.po      28 Jan 2014 12:00:17 -0000      1.103
@@ -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-01-28 10:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1011,19 +1010,12 @@
 "также будут удовлетворять подобному 
требованию из этой лицензии."
 
 #. type: Content of: <dl><dt>
-# | <a [-id=\"YaST\"> YaST License</a>-] {+id=\"informal\"> Informal
-# | license</a>+} <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#YaST\">#YaST</a>)</span>-]
-# | {+href=\"#informal\">#informal</a>)</span>+}
-#| msgid ""
-#| "<a id=\"YaST\"> YaST License</a> <span class=\"anchor-reference-id\">(<a "
-#| "href=\"#YaST\">#YaST</a>)</span>"
 msgid ""
 "<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id\">"
 "(<a href=\"#informal\">#informal</a>)</span>"
 msgstr ""
-"<a id=\"informal\"> Неформальная лицензия</a> <span 
class=\"anchor-reference-id\">"
-"(<a href=\"#informal\">#informal</a>)</span>"
+"<a id=\"informal\"> Неформальная лицензия</a> <span 
class=\"anchor-reference-"
+"id\">(<a href=\"#informal\">#informal</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1031,8 +1023,8 @@
 "whatever you like with this&rdquo; or &ldquo;you can redistribute this code "
 "and change it.&rdquo;"
 msgstr ""
-"&ldquo;Неформальная лицензия&rdquo; означает 
заявление вроде &ldquo;делайте с "
-"этим все, что хотите&rdquo; или &ldquo;вы можете 
перераспространять эту "
+"&ldquo;Неформальная лицензия&rdquo; означает 
заявление вроде &ldquo;делайте "
+"с этим все, что хотите&rdquo; или &ldquo;вы 
можете перераспространять эту "
 "программу и изменять ее&rdquo;."
 
 #. type: Content of: <dl><dd><p>
@@ -1043,11 +1035,11 @@
 "compatible with the GNU GPL.  However, an unlucky choice of wording could "
 "give it a different meaning."
 msgstr ""
-"В Соединенных Штатах эти лицензии 
предполагается толковать на основании 
того, "
-"что автор, по-видимому, подразумевает. Так 
что они, вероятно, означают то, "
-"что они означают с первого взгляда. Это 
делало бы их лицензиями свободных "
-"программ без авторского лева, 
совместимыми с GNU GPL. Однако неудачный выбор 
"
-"формулировки мог бы придать этому другой 
смысл."
+"В Соединенных Штатах эти лицензии 
предполагается толковать на основании "
+"того, что автор, по-видимому, 
подразумевает. Так что они, вероятно, 
означают "
+"то, что они означают с первого взгляда. Это 
делало бы их лицензиями "
+"свободных программ без авторского лева, 
совместимыми с GNU GPL. Однако "
+"неудачный выбор формулировки мог бы 
придать этому другой смысл."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1068,11 +1060,11 @@
 "offer <a href=\"/licenses/license-recommendations.html\"> recommendations</"
 "a> that we suggest you follow."
 msgstr ""
-"Если вы хотите, чтобы ваша программа была 
свободной, не навлекайте "
-"на своих пользователей излишних 
неприятностей. Выберите и воспользуйтесь, "
-"пожалуйста, какой-нибудь известной 
лицензией свободных программ. Мы "
-"предлагаем <a href=\"/licenses/license-recommendations.html\"> "
-"рекомендации</a>, которым советуем вам 
следовать."
+"Если вы хотите, чтобы ваша программа была 
свободной, не навлекайте на своих "
+"пользователей излишних неприятностей. 
Выберите и воспользуйтесь, пожалуйста, "
+"какой-нибудь известной лицензией 
свободных программ. Мы предлагаем <a href="
+"\"/licenses/license-recommendations.html\"> рекомендации</a>, 
которым "
+"советуем вам следовать."
 
 #. type: Content of: <dl><dt>
 msgid ""

Index: philosophy/microsoft-new-monopoly.ru.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-new-monopoly.ru.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/microsoft-new-monopoly.ru.html   31 Aug 2013 20:12:14 -0000      
1.14
+++ philosophy/microsoft-new-monopoly.ru.html   28 Jan 2014 12:00:17 -0000      
1.15
@@ -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="/philosophy/microsoft-new-monopoly.en.html" -->
@@ -14,13 +15,16 @@
 
 <p><a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a></p>
 
-<em>Эта статья написана в&nbsp;июле 2005&nbsp;года. 
В&nbsp;2006&nbsp;году
+<blockquote>
+<p>Эта статья написана в&nbsp;июле 2005&nbsp;года. 
В&nbsp;2006&nbsp;году
 компания Microsoft приняла новые правила, так 
что конкретные правила,
 описанные ниже, и&nbsp;конкретная их критика 
имеет только историческое
 значение. Однако проблема в&nbsp;целом 
остается: <a
 
href="http://www.grokdoc.net/index.php/EOOXML_objections#Patent_rights_to_implement_the_Ecma_376_specification_have_not_been_granted";>
 Хитроумно сформулированные новые правила 
Microsoft никому не&nbsp;дают
-ясного разрешения реализовывать OOXML</a>.</em>
+ясного разрешения реализовывать OOXML</a>.
+</p>
+</blockquote>
 
 <p>Европейские законодатели, которые 
одобряют патенты на&nbsp;программы, часто
 заявляют, что они не&nbsp;сказались&nbsp;бы 
на&nbsp;свободных программах
@@ -160,37 +164,62 @@
  </div>
 </div>
 
+<!-- for id="content", starts in the include above -->
 <!--#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>
 
-<p>
-Copyright &copy; 2005, 2009 Richard Stallman</p><p>Copyright &copy; 2012
-Free Software Foundation, Inc. (translation)
-<br />
-Это произведение доступно по <a rel="license"
+<!-- 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; 2005, 2009 Richard Stallman<br />Copyright &copy; 2014 Free
+Software Foundation, Inc. (translation)</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">
@@ -206,17 +235,11 @@
  <p><!-- timestamp start -->
 Обновлено:
 
-$Date: 2013/08/31 20:12:14 $
+$Date: 2014/01/28 12:00:17 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </div>
 </body>
 </html>

Index: philosophy/software-literary-patents.ru.html
===================================================================
RCS file: /web/www/www/philosophy/software-literary-patents.ru.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/software-literary-patents.ru.html        31 Aug 2013 20:12:39 
-0000      1.18
+++ philosophy/software-literary-patents.ru.html        28 Jan 2014 12:00:18 
-0000      1.19
@@ -1,5 +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="/philosophy/software-literary-patents.en.html" -->
@@ -11,12 +13,6 @@
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Патенты на программы и литературные 
патенты</h2>
 
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
 <p><strong><a href="http://stallman.org/";>Ричард 
Столмен</a></strong></p>
 
 <p>
@@ -233,12 +229,7 @@
 программ окажутся в опасности.
 </p>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. -->
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -249,35 +240,58 @@
 <!--#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; 2005, 2007, 2008 Richard Stallman<br />Copyright &copy;
+2014 Free Software Foundation, Inc. (translation)</p>
 
-<p>
-Copyright &copy; 2005, 2007, 2008 Richard Stallman</p><p>Copyright &copy;
-2011, 2012 Free Software Foundation, Inc. (translation)
-</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">
@@ -293,12 +307,11 @@
  <p><!-- timestamp start -->
 Обновлено:
 
-$Date: 2013/08/31 20:12:39 $
+$Date: 2014/01/28 12:00:18 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/po/microsoft-new-monopoly.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-new-monopoly.ru-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/microsoft-new-monopoly.ru-en.html     18 May 2013 06:43:43 
-0000      1.11
+++ philosophy/po/microsoft-new-monopoly.ru-en.html     28 Jan 2014 12:00:18 
-0000      1.12
@@ -1,22 +1,23 @@
 <!--#include virtual="/server/header.html" -->
-
-<title>Microsoft's New Monopoly - GNU Project - Free Software Foundation 
(FSF)</title>
-
+<!-- Parent-Version: 1.75 -->
+<title>Microsoft's New Monopoly
+- GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/microsoft-new-monopoly.translist" -->
 <!--#include virtual="/server/banner.html" -->
-   
 <h2>Microsoft's New Monopoly</h2>
 
 <p>by <a href="http://www.stallman.org/";><strong>Richard 
Stallman</strong></a></p>
 
-<i>This article was written in July 2005.  Microsoft adopted a
+<blockquote>
+<p>This article was written in July 2005.  Microsoft adopted a
 different policy in 2006, so the specific policies described below and
 the specific criticisms of them are only of historical significance.
 The overall problem remains, however:
 <a 
href="http://www.grokdoc.net/index.php/EOOXML_objections#Patent_rights_to_implement_the_Ecma_376_specification_have_not_been_granted";>
 Microsoft's cunningly worded new policy does not give anyone clear
 permission to implement OOXML.</a>
-</i>
+</p>
+</blockquote>
 
 <p>European legislators who endorse software patents frequently claim
 that those wouldn't affect free software (or &ldquo;open
@@ -134,50 +135,65 @@
 to participate in the campaign against software patents in Europe.
 </p>
 
-</div>
-
+</div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
-
 <div id="footer">
-<p>
-Please send FSF &amp; GNU inquiries to 
-<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+
+<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";><em>address@hidden</em></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:
 
-<p>
-Copyright &copy; 2005, 2009 Richard Stallman
-<br />
-This page is licensed under a <a rel="license"
+        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; 2005, 2009 Richard Stallman</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/05/18 06:43:43 $
+$Date: 2014/01/28 12:00:18 $
 <!-- timestamp end -->
 </p>
 </div>
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
 </div>
 </body>
 </html>

Index: philosophy/po/microsoft-new-monopoly.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-new-monopoly.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/po/microsoft-new-monopoly.ru.po  28 Jan 2014 11:51:05 -0000      
1.4
+++ philosophy/po/microsoft-new-monopoly.ru.po  28 Jan 2014 12:00:18 -0000      
1.5
@@ -16,12 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-01-28 10:25+0000\n"
 
 #. type: Content of: <title>
-# | Microsoft's New Monopoly - GNU Project - Free Software Foundation [-(FSF)-]
-#| msgid ""
-#| "Microsoft's New Monopoly - GNU Project - Free Software Foundation (FSF)"
 msgid "Microsoft's New Monopoly - GNU Project - Free Software Foundation"
 msgstr ""
 "Новая монополия Microsoft - Проект GNU - Фонд 
свободного программного "
@@ -39,21 +35,6 @@
 "<a href=\"http://www.stallman.org/\";><strong>Ричард 
Столмен</strong></a>"
 
 #. type: Content of: <blockquote><p>
-# | [-<i>This-]{+This+} article was written in July 2005.  Microsoft adopted a
-# | different policy in 2006, so the specific policies described below and the
-# | specific criticisms of them are only of historical significance.  The
-# | overall problem remains, however: <a
-# | 
href=\"http://www.grokdoc.net/index.php/EOOXML_objections#Patent_rights_to_implement_the_Ecma_376_specification_have_not_been_granted\";>
-# | Microsoft's cunningly worded new policy does not give anyone clear
-# | permission to implement OOXML.</a> [-</i>-]
-#| msgid ""
-#| "<i>This article was written in July 2005.  Microsoft adopted a different "
-#| "policy in 2006, so the specific policies described below and the specific "
-#| "criticisms of them are only of historical significance.  The overall "
-#| "problem remains, however: <a href=\"http://www.grokdoc.net/index.php/";
-#| 
"EOOXML_objections#Patent_rights_to_implement_the_Ecma_376_specification_have_not_been_granted"
-#| "\"> Microsoft's cunningly worded new policy does not give anyone clear "
-#| "permission to implement OOXML.</a> </i>"
 msgid ""
 "This article was written in July 2005.  Microsoft adopted a different policy "
 "in 2006, so the specific policies described below and the specific "
@@ -379,8 +360,8 @@
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2005, 2009 Richard Stallman"
 msgstr ""
-"Copyright &copy; 2005, 2009 Richard Stallman<br />Copyright &copy; 2014 "
-"Free Software Foundation, Inc. (translation)"
+"Copyright &copy; 2005, 2009 Richard Stallman<br />Copyright &copy; 2014 Free "
+"Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/software-literary-patents.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/software-literary-patents.ru-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/software-literary-patents.ru-en.html  18 May 2013 06:43:55 
-0000      1.15
+++ philosophy/po/software-literary-patents.ru-en.html  28 Jan 2014 12:00:18 
-0000      1.16
@@ -1,18 +1,11 @@
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.75 -->
 <title>Software Patents and Literary Patents - GNU Project - 
-Free Software Foundation (FSF)</title>
+Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/software-literary-patents.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Software Patents and Literary Patents</h2>
 
-<!-- This document uses XHTML 1.0 Strict, but may be served as -->
-<!-- text/html.  Please ensure that markup style considers -->
-<!-- appendex C of the XHTML 1.0 standard. See validator.w3.org. -->
-
-<!-- Please ensure links are consistent with Apache's MultiView. -->
-<!-- Change include statements to be consistent with the relevant -->
-<!-- language, where necessary. -->
-
 <p>by <strong><a href="http://stallman.org/";>Richard Stallman</a></strong></p>
 
 <p>
@@ -219,50 +212,65 @@
 blocked, the result will be to put all software developers in danger.
 </p>
 
-<!-- If needed, change the copyright block at the bottom. In general, -->
-<!-- all pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
 </div><!-- for id="content", starts in the include above -->
 <!--#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; 2005, 2007, 2008 Richard Stallman</p>
 
-<p>
-Copyright &copy; 2005, 2007, 2008 Richard Stallman
-</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/05/18 06:43:55 $
+$Date: 2014/01/28 12:00:18 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: philosophy/po/software-literary-patents.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/software-literary-patents.ru.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/software-literary-patents.ru.po       28 Jan 2014 11:51:05 
-0000      1.9
+++ philosophy/po/software-literary-patents.ru.po       28 Jan 2014 12:00:18 
-0000      1.10
@@ -16,14 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-01-28 10:25+0000\n"
 
 #. type: Content of: <title>
-# | Software Patents and Literary Patents - GNU Project - Free Software
-# | Foundation [-(FSF)-]
-#| msgid ""
-#| "Software Patents and Literary Patents - GNU Project - Free Software "
-#| "Foundation (FSF)"
 msgid ""
 "Software Patents and Literary Patents - GNU Project - Free Software "
 "Foundation"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]