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: Wed, 13 Jan 2016 18:01:29 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/01/13 18:01:29

Modified files:
        licenses       : license-list.ru.html 
        licenses/po    : license-list.ru-en.html license-list.ru.po 
        server         : body-include-2.ru.html 
        server/po      : body-include-2.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.92&r2=1.93
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.85&r2=1.86
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.226&r2=1.227
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.ru.html?cvsroot=www&r1=1.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-2.ru.po?cvsroot=www&r1=1.108&r2=1.109

Patches:
Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- licenses/license-list.ru.html       21 Dec 2015 08:30:54 -0000      1.92
+++ licenses/license-list.ru.html       13 Jan 2016 18:01:27 -0000      1.93
@@ -2361,11 +2361,12 @@
 <dd>
 
 <p>Это свободная лицензия с авторским 
левом, которая хороша для художественных,
-развлекательных и образовательных 
произведений. Она совместима в одну
-сторону с GNU GPL версии&nbsp;3.0, это означает, 
что вы можете лицензировать
-свои вклады и доработки в материалы под 
CC&nbsp;BY-SA&nbsp;4.0 на условиях
-GNU GPL версии&nbsp;3.0, но вы не можете 
лицензировать свои работы под GNU
-GPL версии&nbsp;3.0 на условиях CC&nbsp;BY-SA&nbsp;4.0. </p>
+развлекательных и образовательных 
произведений. CC&nbsp;BY-SA&nbsp;4.0
+совместима в одну сторону с GNU GPL 
версии&nbsp;3.0: это означает, что вы
+можете выпускать свои измененные версии 
материалов под
+CC&nbsp;BY-SA&nbsp;4.0 на условиях GNU GPL версии&nbsp;3.0, 
но вы не можете
+перелицензировать свои работы под GNU GPL 
версии&nbsp;3.0 на условиях
+CC&nbsp;BY-SA&nbsp;4.0. </p>
 
 <p>Поскольку Creative Commons указывает только 
версию&nbsp;3.0 GNU GPL в своем
 <a href="http://creativecommons.org/compatiblelicenses";>списке 
совместимых
@@ -2626,7 +2627,7 @@
 переводам&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -2646,7 +2647,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2015/12/21 08:30:54 $
+$Date: 2016/01/13 18:01:27 $
 
 <!-- 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.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- licenses/po/license-list.ru-en.html 21 Dec 2015 08:30:55 -0000      1.85
+++ licenses/po/license-list.ru-en.html 13 Jan 2016 18:01:27 -0000      1.86
@@ -2372,11 +2372,11 @@
 <dd>
 
 <p>This is a copyleft free license that is good for artistic and
-entertainment works, and educational works. It is one-way compatible
-with the GNU GPL version 3.0, which means you may license your
-contributions to adaptations of CC BY-SA 4.0 materials under the terms
-of the GNU GPL version 3.0, but you may not license your GNU GPL
-version 3.0 licensed works under the terms of CC BY-SA 4.0. </p>
+entertainment works, and educational works. CC BY-SA 4.0 is one-way
+compatible with the GNU GPL version 3.0: this means you may license
+your modified versions of CC BY-SA 4.0 materials under GNU GPL version
+3.0, but you may not relicense GNU GPL version 3.0 licensed works
+under CC BY-SA 4.0. </p>
 
 <p>Because Creative Commons lists only version 3.0 of the GNU GPL on
 its <a href="http://creativecommons.org/compatiblelicenses";>compatible
@@ -2628,7 +2628,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -2638,7 +2638,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/12/21 08:30:55 $
+$Date: 2016/01/13 18:01:27 $
 <!-- 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.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- licenses/po/license-list.ru.po      13 Jan 2016 17:33:29 -0000      1.226
+++ licenses/po/license-list.ru.po      13 Jan 2016 18:01:28 -0000      1.227
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2016-01-13 14:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -4733,20 +4732,6 @@
 "href=\"#ccbysa\">#ccbysa</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-# | This is a copyleft free license that is good for artistic and
-# | entertainment works, and educational works. [-It-] {+CC BY-SA 4.0+} is
-# | one-way compatible with the GNU GPL version [-3.0, which-] {+3.0: this+}
-# | means you may license your [-contributions to adaptations-] {+modified
-# | versions+} of CC BY-SA 4.0 materials under [-the terms of the-] GNU GPL
-# | version 3.0, but you may not [-license your-] {+relicense+} GNU GPL
-# | version 3.0 licensed works under [-the terms of-] CC BY-SA 4.0.
-#| msgid ""
-#| "This is a copyleft free license that is good for artistic and "
-#| "entertainment works, and educational works. It is one-way compatible with "
-#| "the GNU GPL version 3.0, which means you may license your contributions "
-#| "to adaptations of CC BY-SA 4.0 materials under the terms of the GNU GPL "
-#| "version 3.0, but you may not license your GNU GPL version 3.0 licensed "
-#| "works under the terms of CC BY-SA 4.0."
 msgid ""
 "This is a copyleft free license that is good for artistic and entertainment "
 "works, and educational works. CC BY-SA 4.0 is one-way compatible with the "
@@ -4755,11 +4740,12 @@
 "GPL version 3.0 licensed works under CC BY-SA 4.0."
 msgstr ""
 "Это свободная лицензия с авторским левом, 
которая хороша для художественных, "
-"развлекательных и образовательных 
произведений. CC&nbsp;BY-SA&nbsp;4.0 совместима в 
одну "
-"сторону с GNU GPL версии&nbsp;3.0: это означает, 
что вы можете выпускать "
-"свои измененные версии материалов под 
CC&nbsp;BY-SA&nbsp;4.0 на условиях "
-"GNU GPL версии&nbsp;3.0, но вы не можете 
перелицензировать свои работы под GNU "
-"GPL версии&nbsp;3.0 на условиях CC&nbsp;BY-SA&nbsp;4.0."
+"развлекательных и образовательных 
произведений. CC&nbsp;BY-SA&nbsp;4.0 "
+"совместима в одну сторону с GNU GPL 
версии&nbsp;3.0: это означает, что вы "
+"можете выпускать свои измененные версии 
материалов под CC&nbsp;BY-"
+"SA&nbsp;4.0 на условиях GNU GPL версии&nbsp;3.0, но вы 
не можете "
+"перелицензировать свои работы под GNU GPL 
версии&nbsp;3.0 на условиях "
+"CC&nbsp;BY-SA&nbsp;4.0."
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -5228,9 +5214,6 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2014, [-2015-] {+2015, 2016+} Free Software Foundation,
-# | Inc.
-#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 

Index: server/body-include-2.ru.html
===================================================================
RCS file: /web/www/www/server/body-include-2.ru.html,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/body-include-2.ru.html       13 Jan 2016 15:00:49 -0000      1.96
+++ server/body-include-2.ru.html       13 Jan 2016 18:01:28 -0000      1.97
@@ -4,16 +4,16 @@
 <div class="donate_btn">
   <p><a
 
href="https://donate.fsf.org/?pk_campaign=2015-2016-fundraiser-banner-gnu&amp;pk_kwd=donate";>
-Donate Now</a></p>
+Внести пожертвование</a></p>
 </div>
 
 <p><strong>Тридцать лет Фонд свободного 
программного обеспечения был светочем
 движения за свободные программы, сражаясь 
за свободу пользователей.</strong></p>
 
 <p><a
-href="//www.fsf.org/appeal?pk_campaign=2015-2016-fundraiser-banner-gnu&amp;pk_kwd=appeal">
-Help keep our light burning brightly</a> by donating to push us towards our
-goal of raising $450,000 by <i>January 31st</i>.</p>
+href="//www.fsf.org/appeal/?pk_campaign=2015-2016-fundraiser-banner-gnu&amp;pk_kwd=appeal">Помогите
+поддержать наш яркий огонь</a> 
пожертвованием, которое продвинет нас к 
цели
+собрать 450&nbsp;000$ к <i>31 января</i>.</p>
 
 <div class="crm-amount-bar"><div class="crm-amount-high">450к</div>
 <div class="crm-amount-fill"><div

Index: server/po/body-include-2.ru.po
===================================================================
RCS file: /web/www/www/server/po/body-include-2.ru.po,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/po/body-include-2.ru.po      13 Jan 2016 17:33:30 -0000      1.108
+++ server/po/body-include-2.ru.po      13 Jan 2016 18:01:28 -0000      1.109
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2016-01-13 14:55+0000\n"
 
 #. type: Content of: <div><div><p>
 msgid ""



reply via email to

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