www philosophy/nonsoftware-copyleft.ru.html phi...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/06/10 13:59:31

Modified files:
        philosophy     : nonsoftware-copyleft.ru.html 
        philosophy/po  : nonsoftware-copyleft.ru-en.html 
                         nonsoftware-copyleft.ru.po 
        server/gnun/compendia: compendium.ca.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/nonsoftware-copyleft.ru.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonsoftware-copyleft.ru-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonsoftware-copyleft.ru.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ca.po?cvsroot=www&r1=1.109&r2=1.110

Patches:
Index: philosophy/nonsoftware-copyleft.ru.html
===================================================================
RCS file: /web/www/www/philosophy/nonsoftware-copyleft.ru.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/nonsoftware-copyleft.ru.html     4 Jun 2020 10:01:12 -0000       
1.13
+++ philosophy/nonsoftware-copyleft.ru.html     10 Jun 2020 17:59:30 -0000      
1.14
@@ -1,7 +1,8 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/nonsoftware-copyleft.en.html" 
-->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Авторское лево для непрограммной 
информации - Проект GNU - Фонд свободного
@@ -191,8 +192,8 @@
 применительно к непрограммной 
информации:</p>
 
 <p><a href="/home.html"> Остальная часть этого 
сайта</a>&nbsp;&mdash; сайт
-проекта GNU и канонический источник 
программ под авторским левом и свободно
-распространяемых программ.</p>
+проекта GNU и канонический источник 
программ под авторским левом и свободных
+программ<a href="#f1">(1)</a>.</p>
 
 <p><a href="http://www.ram.org/";>Рам Самудрала</a> написал 
<a
 href="http://www.ram.org/ramblings/philosophy/fmp.html";> Философию 
свободной
@@ -203,6 +204,13 @@
 входят тексты (литературные, критические, <a
 href="http://dsl.org/cookbook/cookbook_toc.html";> технические</a>) 
и музыка.</p>
 
+<h3 id="fn">Примечание</h3>
+
+<ol>
+<li id="f1">До 2020 года вместо &ldquo;свободные&rdquo; 
в статье говорилось
+&ldquo;свободно распространяемые&rdquo;. Это 
могло быть неверно понято.</li>
+</ol>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -246,7 +254,7 @@
 
 <!-- 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
+     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
@@ -260,8 +268,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1997 Michael Stutz <br />Copyright &copy; 2014 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 1997, 2020 Michael Stutz <br />Copyright &copy; 2014, 2020
+Free Software Foundation, Inc. (translation)</p>
 
 <p>
 Verbatim copying and distribution of this entire article are permitted in
@@ -283,11 +291,12 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2020/06/04 10:01:12 $
+$Date: 2020/06/10 17:59:30 $
 
 <!-- timestamp end -->
 </p>
 </div>
 </div>
+<!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/nonsoftware-copyleft.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/nonsoftware-copyleft.ru-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/nonsoftware-copyleft.ru-en.html       12 Apr 2014 13:59:21 
-0000      1.7
+++ philosophy/po/nonsoftware-copyleft.ru-en.html       10 Jun 2020 17:59:31 
-0000      1.8
@@ -1,5 +1,6 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
 <title>Applying Copyleft To Non-Software Information
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/nonsoftware-copyleft.translist" -->
@@ -168,7 +169,7 @@
 
 <p>The <a href="/home.html">rest of this web site</a> is the home of
 the GNU Project and is the canonical source for copyleft and
-freely-redistributable software.</p>
+free software<a href="#f1">(1)</a>.</p>
 
 <p><a href="http://www.ram.org/";>Ram Samudrala</a> wrote
 the <a href="http://www.ram.org/ramblings/philosophy/fmp.html";>Free
@@ -179,6 +180,13 @@
 (literature, reviews, <a 
href="http://dsl.org/cookbook/cookbook_toc.html";>technical</a>)
 and music.</p>
 
+<h3 id="fn">Footnote</h3>
+
+<ol>
+<li id="f1">Before 2020, &ldquo;free software&rdquo; was confusingly
+referred to as &ldquo;freely-redistributable&rdquo;.</li>
+</ol>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -205,13 +213,13 @@
         README</a>. -->
 Please see the <a
 href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for 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 3.0 US.  Please do NOT change or remove this
+     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
@@ -226,7 +234,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1997 Michael Stutz</p>
+<p>Copyright &copy; 1997, 2020 Michael Stutz</p>
 
 <p>
 Verbatim copying and distribution of this entire article is
@@ -237,10 +245,10 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:59:21 $
+$Date: 2020/06/10 17:59:31 $
 <!-- timestamp end -->
 </p>
 </div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
 </body>
 </html>

Index: philosophy/po/nonsoftware-copyleft.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonsoftware-copyleft.ru.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/nonsoftware-copyleft.ru.po    10 Jun 2020 17:39:55 -0000      
1.19
+++ philosophy/po/nonsoftware-copyleft.ru.po    10 Jun 2020 17:59:31 -0000      
1.20
@@ -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: 2020-06-10 17:25+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -367,14 +366,6 @@
 "применительно к непрограммной 
информации:"
 
 #. type: Content of: <p>
-# | The <a href=\"/home.html\">rest of this web site</a> is the home of the
-# | GNU Project and is the canonical source for copyleft and
-# | [-freely-redistributable software.-] {+free software<a
-# | href=\"#f1\">(1)</a>.+}
-#| msgid ""
-#| "The <a href=\"/home.html\">rest of this web site</a> is the home of the "
-#| "GNU Project and is the canonical source for copyleft and freely-"
-#| "redistributable software."
 msgid ""
 "The <a href=\"/home.html\">rest of this web site</a> is the home of the GNU "
 "Project and is the canonical source for copyleft and free software<a href="
@@ -407,8 +398,6 @@
 
 # type: Content of: <h4>
 #. type: Content of: <h3>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid "Footnote"
 msgid "Footnote"
 msgstr "Примечание"
 
@@ -417,8 +406,8 @@
 "Before 2020, &ldquo;free software&rdquo; was confusingly referred to as "
 "&ldquo;freely-redistributable&rdquo;."
 msgstr ""
-"До 2020 года вместо &ldquo;свободные&rdquo; в 
статье говорилось "
-"&ldquo;свободно распространяемые&rdquo;. Это 
могло быть неверно понято."
+"До 2020 года вместо &ldquo;свободные&rdquo; в 
статье говорилось &ldquo;"
+"свободно распространяемые&rdquo;. Это могло 
быть неверно понято."
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -452,11 +441,6 @@
 #.         href="/server/standards/README.translations.html">Translations
 #.         README</a>. 
 #. type: Content of: <div><div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please see the <a href=\"/server/standards/README.translations.html"
-#| "\">Translations README</a> for information on coordinating and "
-#| "contributing translations of this article."
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and contributing "
@@ -471,12 +455,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997-] {+1997, 2020+} Michael Stutz
-#| msgid "Copyright &copy; 1997 Michael Stutz"
 msgid "Copyright &copy; 1997, 2020 Michael Stutz"
 msgstr ""
-"Copyright &copy; 1997, 2020 Michael Stutz <br />Copyright &copy; 2014, 2020 
Free "
-"Software Foundation, Inc. (translation)"
+"Copyright &copy; 1997, 2020 Michael Stutz <br />Copyright &copy; 2014, 2020 "
+"Free Software Foundation, Inc. (translation)"
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: server/gnun/compendia/compendium.ca.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ca.po,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- server/gnun/compendia/compendium.ca.po      7 Jun 2020 00:28:54 -0000       
1.109
+++ server/gnun/compendia/compendium.ca.po      10 Jun 2020 17:59:31 -0000      
1.110
@@ -175,9 +175,13 @@
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "per <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
+# type: Content of: <h4>
+# | Footnote[-s-]
 #. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Footnotes"
 msgid "Footnote"
-msgstr ""
+msgstr "Notes"
 
 # type: Content of: <p>
 #. type: Content of: <p>