www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy opposing-drm.ru.html po/opposing...


From: GNUN
Subject: www/philosophy opposing-drm.ru.html po/opposing...
Date: Tue, 28 Nov 2017 20:59:15 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     17/11/28 20:59:15

Modified files:
        philosophy     : opposing-drm.ru.html 
        philosophy/po  : opposing-drm.ru-en.html opposing-drm.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/opposing-drm.ru.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/opposing-drm.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/opposing-drm.ru.po?cvsroot=www&r1=1.11&r2=1.12

Patches:
Index: opposing-drm.ru.html
===================================================================
RCS file: /web/www/www/philosophy/opposing-drm.ru.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- opposing-drm.ru.html        16 Dec 2014 08:56:56 -0000      1.10
+++ opposing-drm.ru.html        29 Nov 2017 01:59:14 -0000      1.11
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/opposing-drm.en.html" -->
 
 <!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.84 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Борьба с цифровым управлением правами 
- Проект GNU - Фонд свободного
@@ -9,11 +9,18 @@
 
 <!--#include virtual="/philosophy/po/opposing-drm.translist" -->
 <!--#include virtual="/server/banner.ru.html" -->
-<h2>Борьба с цифровым управлением правами</h2>
-<h3>(Или, как мы теперь это называем, с 
цифровым управлением ограничениями)</h3>
+<h2>Борьба с цифровым управлением правами<br 
/>
+<span style="font-size: .7em">(или цифровым управлением 
ограничениями, как
+мы теперь это называем)</span></h2>
 
 <p><a href="http://www.stallman.org/";><strong>Ричард 
Столмен</strong></a>
 </p>
+<p><em>Впервые опубликовано в &ldquo;Бизнесуик 
онлайн&rdquo;.</em></p>
+
+<blockquote class="announcement"><p>
+<a href="http://defectivebydesign.org";>Подключайтесь к 
нашей кампании против
+цифрового управления ограничениями</a>.
+</p></blockquote>
 
 <p>В 1989&nbsp;году, когда мир был совсем не 
такой, как сейчас, я написал
 первую версию Стандартной общественной 
лицензии GNU, лицензию, которая дает
@@ -138,8 +145,6 @@
 не может оправдать отказ общественности в 
контроле над ее техникой. Защищать
 свободу значит блокировать цифровое 
управление ограничениями.
 </p>
-<p> Впервые опубликовано в &ldquo;Бизнесуик 
онлайн&rdquo;.</p>
-<p>Ричард Столмен&nbsp;&mdash; основатель <a 
href="/gnu/">проекта GNU</a>.</p>
 
 <div class="translators-notes">
 
@@ -188,7 +193,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
@@ -202,13 +207,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2006 Richard M. Stallman<br />Copyright &copy; 2013 Free
-Software Foundation, Inc. (translation)</p>
+<p>Copyright &copy; 2006, 2017 Richard M. Stallman<br />Copyright &copy; 2013,
+2017 Free Software Foundation, Inc. (translation)</p>
 
 <p>Это произведение доступно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лицензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
 Creative Commons Attribution-NoDerivs (<em>Атрибуция&nbsp;&mdash; 
Без
-производных произведений</em>) 3.0 США</a>.</p>
+производных произведений</em>) 4.0 
Всемирная</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
 <div class="translators-credits">
@@ -223,7 +228,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/12/16 08:56:56 $
+$Date: 2017/11/29 01:59:14 $
 
 <!-- timestamp end -->
 </p>

Index: po/opposing-drm.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/opposing-drm.ru-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/opposing-drm.ru-en.html  18 Nov 2014 11:27:41 -0000      1.6
+++ po/opposing-drm.ru-en.html  29 Nov 2017 01:59:15 -0000      1.7
@@ -1,15 +1,20 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.84 -->
 <title>Opposing Digital Rights Mismanagement
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/opposing-drm.translist" -->
 <!--#include virtual="/server/banner.html" -->
    
-<h2>Opposing Digital Rights Mismanagement</h2>
-<h3>(Or Digital Restrictions Management, as we now call it)</h3>
+<h2>Opposing Digital Rights Mismanagement<br />
+<span style="font-size: .7em">(Or Digital Restrictions Management, as we now 
call it)</span></h2>
 
 <p>by <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a>
 </p>
+<p><em>First published by BusinessWeek Online.</em></p>
+
+<blockquote class="announcement"><p>
+<a href="http://defectivebydesign.org";>Join our campaign against DRM</a>.
+</p></blockquote>
 
 <p>In 1989, in a very different world, I wrote the first version of the GNU
 General Public License, a license that gives computer users freedom. The
@@ -121,9 +126,6 @@
 itself, cannot justify denying the public control over its technology.
 Defending freedom means thwarting DRM.
 </p>
-<p> First published by BusinessWeek Online.</p>
-<p>Dr. Richard M. Stallman is the founder of the
-<a href="/gnu/">GNU Project</a></p>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -157,7 +159,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
@@ -172,17 +174,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2006 Richard M. Stallman</p>
+<p>Copyright &copy; 2006, 2017 Richard M. 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/11/18 11:27:41 $
+$Date: 2017/11/29 01:59:15 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/opposing-drm.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/opposing-drm.ru.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/opposing-drm.ru.po       29 Nov 2017 01:54:41 -0000      1.11
+++ po/opposing-drm.ru.po       29 Nov 2017 01:59:15 -0000      1.12
@@ -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: 2017-11-28 19:57+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -31,15 +30,12 @@
 msgstr "Борьба с цифровым управлением правами"
 
 #. type: Content of: <h2>
-# | [-(Or-]{+<span style=\"font-size: .7em\">(Or+} Digital Restrictions
-# | Management, as we now call [-it)-] {+it)</span>+}
-#| msgid "(Or Digital Restrictions Management, as we now call it)"
 msgid ""
 "<span style=\"font-size: .7em\">(Or Digital Restrictions Management, as we "
 "now call it)</span>"
 msgstr ""
-"<span style=\"font-size: .7em\">(или цифровым 
управлением ограничениями, как мы теперь "
-"это называем)</span>"
+"<span style=\"font-size: .7em\">(или цифровым 
управлением ограничениями, как "
+"мы теперь это называем)</span>"
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -49,9 +45,6 @@
 "<a href=\"http://www.stallman.org/\";><strong>Ричард 
Столмен</strong></a>"
 
 #. type: Content of: <p>
-# | [-First-]{+<em>First+} published by BusinessWeek [-Online.-]
-# | {+Online.</em>+}
-#| msgid "First published by BusinessWeek Online."
 msgid "<em>First published by BusinessWeek Online.</em>"
 msgstr "<em>Впервые опубликовано в 
&ldquo;Бизнесуик онлайн&rdquo;.</em>"
 
@@ -59,8 +52,8 @@
 msgid ""
 "<a href=\"http://defectivebydesign.org\";>Join our campaign against DRM</a>."
 msgstr ""
-"<a href=\"http://defectivebydesign.org\";>Подключайтесь к 
нашей кампании против "
-"цифрового управления ограничениями</a>."
+"<a href=\"http://defectivebydesign.org\";>Подключайтесь к 
нашей кампании "
+"против цифрового управления 
ограничениями</a>."
 
 #. type: Content of: <p>
 msgid ""
@@ -343,19 +336,12 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; [-2006-] {+2006, 2017+} Richard M. Stallman
-#| msgid "Copyright &copy; 2006 Richard M. Stallman"
 msgid "Copyright &copy; 2006, 2017 Richard M. Stallman"
 msgstr ""
-"Copyright &copy; 2006, 2017 Richard M. Stallman<br />Copyright &copy; 2013, 
2017 Free "
-"Software Foundation, Inc. (translation)"
+"Copyright &copy; 2006, 2017 Richard M. Stallman<br />Copyright &copy; 2013, "
+"2017 Free Software Foundation, Inc. (translation)"
 
 #. type: Content of: <div><p>
-# || No change detected.  The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
 msgid ""
 "This page is licensed under a <a rel=\"license\" href=\"http://";
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]