diff options
author | Christian Grothoff <christian@grothoff.org> | 2022-09-24 17:04:26 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2022-09-24 17:04:26 +0200 |
commit | 22c3bfee9148e1836817ef00b4829a8385570c69 (patch) | |
tree | 13f2dff7d9745b270f4cbbe108bdb1785b1adce9 /talermerchantdemos/blog/articles/ru/free-open-overlap.html | |
parent | 29f0ad890a423179fd5fd6131f94b0be8f808940 (diff) | |
download | taler-merchant-demos-22c3bfee9148e1836817ef00b4829a8385570c69.tar.gz taler-merchant-demos-22c3bfee9148e1836817ef00b4829a8385570c69.tar.bz2 taler-merchant-demos-22c3bfee9148e1836817ef00b4829a8385570c69.zip |
update RMS articles
Diffstat (limited to 'talermerchantdemos/blog/articles/ru/free-open-overlap.html')
-rw-r--r-- | talermerchantdemos/blog/articles/ru/free-open-overlap.html | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/talermerchantdemos/blog/articles/ru/free-open-overlap.html b/talermerchantdemos/blog/articles/ru/free-open-overlap.html index c9cb165..b7017af 100644 --- a/talermerchantdemos/blog/articles/ru/free-open-overlap.html +++ b/talermerchantdemos/blog/articles/ru/free-open-overlap.html @@ -1,7 +1,10 @@ <!--#set var="ENGLISH_PAGE" value="/philosophy/free-open-overlap.en.html" --> <!--#include virtual="/server/header.ru.html" --> -<!-- Parent-Version: 1.77 --> +<!-- Parent-Version: 1.96 --> +<!-- This page is derived from /server/standards/boilerplate.html --> +<!--#set var="TAGS" value="essays aboutfs free-open" --> +<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" --> <!-- This file is automatically generated by GNUnited Nations! --> <title>Свободные программы и открытый исходный текст - Проект GNU - Фонд свободного @@ -9,14 +12,18 @@ <!--#include virtual="/philosophy/po/free-open-overlap.translist" --> <!--#include virtual="/server/banner.ru.html" --> +<!--#include virtual="/philosophy/ph-breadcrumb.ru.html" --> +<!--GNUN: OUT-OF-DATE NOTICE--> +<!--#include virtual="/server/top-addendum.ru.html" --> +<div class="reduced-width"> <h2>Соотношение свободных программ и открытого исходного текста </h2> <p>Вот как соотносятся друг с другом множества <a href="/philosophy/open-source-misses-the-point.html">свободных программ и открытого исходного текста</a>:</p> +<div style="max-width:max-content; padding:1em 1.5em; background:#f3f3f3"> <pre> -<code> ------------------------------------- / | | \ | | | | @@ -34,8 +41,8 @@ href="/philosophy/open-source-misses-the-point.html">свободных прог ------------------------------------- | | тивоизованные устройства | прочие | / ------------------------------------- -</code> </pre> +</div> <p>Программы, представляющие открытый исходный текст, но не свободные, составляют небольшую часть по отношению к тем, что свободны. Если изображать @@ -60,6 +67,7 @@ That gives the wrong idea, since most of those are not open source either. --> <p>Большинство лицензий несвободных программ не являются и лицензиями программ с открытым исходным текстом.</p> +</div> <div class="translators-notes"> @@ -69,7 +77,7 @@ That gives the wrong idea, since most of those are not open source either. --> <!-- for id="content", starts in the include above --> <!--#include virtual="/server/footer.ru.html" --> -<div id="footer"> +<div id="footer" role="contentinfo"> <div class="unprintable"> <p>Пожалуйста, присылайте общие запросы фонду и GNU по адресу <a @@ -89,7 +97,7 @@ href="/contact/">другие способы связаться</a> с фонд <web-translators@gnu.org></a>.</p> - <p>For information on coordinating and submitting translations of + <p>For information on coordinating and contributing translations of our web pages, see <a href="/server/standards/README.translations.html">Translations README</a>. --> @@ -102,12 +110,28 @@ href="mailto:web-translators@gnu.org"><web-translators@gnu.org></a>. переводам”</a>.</p> </div> -<p>Copyright © 2015 Free Software Foundation, Inc.</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 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 © 2015, 2021 Free Software Foundation, Inc.</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>Атрибуция — Без -производных произведений</em>) 3.0 США</a>.</p> +производных произведений</em>) 4.0 Всемирная</a>.</p> <!--#include virtual="/server/bottom-notes.ru.html" --> <div class="translators-credits"> @@ -122,11 +146,12 @@ gnu.org</a>.</em></div> <p class="unprintable"><!-- timestamp start --> Обновлено: -$Date: 2017/07/14 16:28:42 $ +$Date: 2021/10/01 17:39:48 $ <!-- timestamp end --> </p> </div> </div> +<!-- for class="inner", starts in the banner include --> </body> </html> |